webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

ZIP Exports: Reorganised files, added page md parsing

Browse Source
This commit is contained in:
Dan Brown
2024-10-23 10:48:26 +01:00
parent 4fb4fe0931
commit f732ef05d5
10 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/Controllers/PageExportController.php
View File

@@ -6,7 +6,7 @@ use BookStack\Entities\Queries\PageQueries;
use BookStack\Entities\Tools\PageContent; use BookStack\Entities\Tools\PageContent;
use BookStack\Exceptions\NotFoundException; use BookStack\Exceptions\NotFoundException;
use BookStack\Exports\ExportFormatter; use BookStack\Exports\ExportFormatter;
use BookStack\Exports\ZipExportBuilder; use BookStack\Exports\ZipExports\ZipExportBuilder;
use BookStack\Http\Controller; use BookStack\Http\Controller;
use Throwable; use Throwable;

4
app/Exports/ZipExportModels/ZipExportAttachment.php → app/Exports/ZipExports/Models/ZipExportAttachment.php
View File

@@ -1,8 +1,8 @@
<?php <?php
namespace BookStack\Exports\ZipExportModels; namespace BookStack\Exports\ZipExports\Models;
use BookStack\Exports\ZipExportFiles; use BookStack\Exports\ZipExports\ZipExportFiles;
use BookStack\Uploads\Attachment; use BookStack\Uploads\Attachment;
class ZipExportAttachment extends ZipExportModel class ZipExportAttachment extends ZipExportModel

4
app/Exports/ZipExportModels/ZipExportImage.php → app/Exports/ZipExports/Models/ZipExportImage.php
View File

@@ -1,8 +1,8 @@
<?php <?php
namespace BookStack\Exports\ZipExportModels; namespace BookStack\Exports\ZipExports\Models;
use BookStack\Exports\ZipExportFiles; use BookStack\Exports\ZipExports\ZipExportFiles;
use BookStack\Uploads\Image; use BookStack\Uploads\Image;
class ZipExportImage extends ZipExportModel class ZipExportImage extends ZipExportModel

2
app/Exports/ZipExportModels/ZipExportModel.php → app/Exports/ZipExports/Models/ZipExportModel.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace BookStack\Exports\ZipExportModels; namespace BookStack\Exports\ZipExports\Models;
use JsonSerializable; use JsonSerializable;

4
app/Exports/ZipExportModels/ZipExportPage.php → app/Exports/ZipExports/Models/ZipExportPage.php
View File

@@ -1,10 +1,10 @@
<?php <?php
namespace BookStack\Exports\ZipExportModels; namespace BookStack\Exports\ZipExports\Models;
use BookStack\Entities\Models\Page; use BookStack\Entities\Models\Page;
use BookStack\Entities\Tools\PageContent; use BookStack\Entities\Tools\PageContent;
use BookStack\Exports\ZipExportFiles; use BookStack\Exports\ZipExports\ZipExportFiles;
class ZipExportPage extends ZipExportModel class ZipExportPage extends ZipExportModel
{ {

2
app/Exports/ZipExportModels/ZipExportTag.php → app/Exports/ZipExports/Models/ZipExportTag.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace BookStack\Exports\ZipExportModels; namespace BookStack\Exports\ZipExports\Models;
use BookStack\Activity\Models\Tag; use BookStack\Activity\Models\Tag;

4
app/Exports/ZipExportBuilder.php → app/Exports/ZipExports/ZipExportBuilder.php
View File

@@ -1,10 +1,10 @@
<?php <?php
namespace BookStack\Exports; namespace BookStack\Exports\ZipExports;
use BookStack\Entities\Models\Page; use BookStack\Entities\Models\Page;
use BookStack\Exceptions\ZipExportException; use BookStack\Exceptions\ZipExportException;
use BookStack\Exports\ZipExportModels\ZipExportPage; use BookStack\Exports\ZipExports\Models\ZipExportPage;
use ZipArchive; use ZipArchive;
class ZipExportBuilder class ZipExportBuilder

2
app/Exports/ZipExportFiles.php → app/Exports/ZipExports/ZipExportFiles.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace BookStack\Exports; namespace BookStack\Exports\ZipExports;
use BookStack\Uploads\Attachment; use BookStack\Uploads\Attachment;
use BookStack\Uploads\AttachmentService; use BookStack\Uploads\AttachmentService;

23
app/Exports/ZipExportReferences.php → app/Exports/ZipExports/ZipExportReferences.php
View File

@@ -1,13 +1,12 @@
<?php <?php
namespace BookStack\Exports; namespace BookStack\Exports\ZipExports;
use BookStack\App\Model; use BookStack\App\Model;
use BookStack\Entities\Models\Page; use BookStack\Exports\ZipExports\Models\ZipExportAttachment;
use BookStack\Exports\ZipExportModels\ZipExportAttachment; use BookStack\Exports\ZipExports\Models\ZipExportImage;
use BookStack\Exports\ZipExportModels\ZipExportImage; use BookStack\Exports\ZipExports\Models\ZipExportModel;
use BookStack\Exports\ZipExportModels\ZipExportModel; use BookStack\Exports\ZipExports\Models\ZipExportPage;
use BookStack\Exports\ZipExportModels\ZipExportPage;
use BookStack\Uploads\Attachment; use BookStack\Uploads\Attachment;
use BookStack\Uploads\Image; use BookStack\Uploads\Image;
@@ -44,12 +43,16 @@ class ZipExportReferences
public function buildReferences(ZipExportFiles $files): void public function buildReferences(ZipExportFiles $files): void
{ {
// TODO - Parse page MD & HTML // Parse page content first
foreach ($this->pages as $page) { foreach ($this->pages as $page) {
$page->html = $this->parser->parse($page->html ?? '', function (Model $model) use ($files, $page) { $handler = function (Model $model) use ($files, $page) {
return $this->handleModelReference($model, $page, $files); return $this->handleModelReference($model, $page, $files);
}); };
// TODO - markdown
$page->html = $this->parser->parse($page->html ?? '', $handler);
if ($page->markdown) {
$page->markdown = $this->parser->parse($page->markdown, $handler);
}
} }
// dd('end'); // dd('end');

2
app/Exports/ZipReferenceParser.php → app/Exports/ZipExports/ZipReferenceParser.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace BookStack\Exports; namespace BookStack\Exports\ZipExports;
use BookStack\App\Model; use BookStack\App\Model;
use BookStack\Entities\Queries\EntityQueries; use BookStack\Entities\Queries\EntityQueries;