NOW MANAGED ON CODEBERG
ZIP Exports: Reorganised files, added page md parsing
Dan Brownf732ef05d5b6
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.phpindex 01611fd21..34e67ffcf 100644--- a/app/Exports/Controllers/PageExportController.php+++ b/app/Exports/Controllers/PageExportController.php@@ -6,7 +6,7 @@ use BookStack\Entities\Queries\PageQueries;use BookStack\Entities\Tools\PageContent;use BookStack\Exceptions\NotFoundException;use BookStack\Exports\ExportFormatter;-use BookStack\Exports\ZipExportBuilder;+use BookStack\Exports\ZipExports\ZipExportBuilder;use BookStack\Http\Controller;use Throwable;diff --git a/app/Exports/ZipExportModels/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.phpsimilarity index 90%rename from app/Exports/ZipExportModels/ZipExportAttachment.phprename to app/Exports/ZipExports/Models/ZipExportAttachment.phpindex d79a16cc1..8c89ae11f 100644--- a/app/Exports/ZipExportModels/ZipExportAttachment.php+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php@@ -1,8 +1,8 @@<?php-namespace BookStack\Exports\ZipExportModels;+namespace BookStack\Exports\ZipExports\Models;-use BookStack\Exports\ZipExportFiles;+use BookStack\Exports\ZipExports\ZipExportFiles;use BookStack\Uploads\Attachment;class ZipExportAttachment extends ZipExportModeldiff --git a/app/Exports/ZipExportModels/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.phpsimilarity index 84%rename from app/Exports/ZipExportModels/ZipExportImage.phprename to app/Exports/ZipExports/Models/ZipExportImage.phpindex 39f1d1012..05d828734 100644--- a/app/Exports/ZipExportModels/ZipExportImage.php+++ b/app/Exports/ZipExports/Models/ZipExportImage.php@@ -1,8 +1,8 @@<?php-namespace BookStack\Exports\ZipExportModels;+namespace BookStack\Exports\ZipExports\Models;-use BookStack\Exports\ZipExportFiles;+use BookStack\Exports\ZipExports\ZipExportFiles;use BookStack\Uploads\Image;class ZipExportImage extends ZipExportModeldiff --git a/app/Exports/ZipExportModels/ZipExportModel.php b/app/Exports/ZipExports/Models/ZipExportModel.phpsimilarity index 92%rename from app/Exports/ZipExportModels/ZipExportModel.phprename to app/Exports/ZipExports/Models/ZipExportModel.phpindex 26b994c01..8d0c0a437 100644--- a/app/Exports/ZipExportModels/ZipExportModel.php+++ b/app/Exports/ZipExports/Models/ZipExportModel.php@@ -1,6 +1,6 @@<?php-namespace BookStack\Exports\ZipExportModels;+namespace BookStack\Exports\ZipExports\Models;use JsonSerializable;diff --git a/app/Exports/ZipExportModels/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.phpsimilarity index 91%rename from app/Exports/ZipExportModels/ZipExportPage.phprename to app/Exports/ZipExports/Models/ZipExportPage.phpindex c7a950354..bae46ca82 100644--- a/app/Exports/ZipExportModels/ZipExportPage.php+++ b/app/Exports/ZipExports/Models/ZipExportPage.php@@ -1,10 +1,10 @@<?php-namespace BookStack\Exports\ZipExportModels;+namespace BookStack\Exports\ZipExports\Models;use BookStack\Entities\Models\Page;use BookStack\Entities\Tools\PageContent;-use BookStack\Exports\ZipExportFiles;+use BookStack\Exports\ZipExports\ZipExportFiles;class ZipExportPage extends ZipExportModel{diff --git a/app/Exports/ZipExportModels/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.phpsimilarity index 92%rename from app/Exports/ZipExportModels/ZipExportTag.phprename to app/Exports/ZipExports/Models/ZipExportTag.phpindex 09ae9f06c..d4e3c4290 100644--- a/app/Exports/ZipExportModels/ZipExportTag.php+++ b/app/Exports/ZipExports/Models/ZipExportTag.php@@ -1,6 +1,6 @@<?php-namespace BookStack\Exports\ZipExportModels;+namespace BookStack\Exports\ZipExports\Models;use BookStack\Activity\Models\Tag;diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.phpsimilarity index 94%rename from app/Exports/ZipExportBuilder.phprename to app/Exports/ZipExports/ZipExportBuilder.phpindex 5c56e531b..15edebea5 100644--- a/app/Exports/ZipExportBuilder.php+++ b/app/Exports/ZipExports/ZipExportBuilder.php@@ -1,10 +1,10 @@<?php-namespace BookStack\Exports;+namespace BookStack\Exports\ZipExports;use BookStack\Entities\Models\Page;use BookStack\Exceptions\ZipExportException;-use BookStack\Exports\ZipExportModels\ZipExportPage;+use BookStack\Exports\ZipExports\Models\ZipExportPage;use ZipArchive;class ZipExportBuilderdiff --git a/app/Exports/ZipExportFiles.php b/app/Exports/ZipExports/ZipExportFiles.phpsimilarity index 98%rename from app/Exports/ZipExportFiles.phprename to app/Exports/ZipExports/ZipExportFiles.phpindex 27b6f937a..8f0a6bd40 100644--- a/app/Exports/ZipExportFiles.php+++ b/app/Exports/ZipExports/ZipExportFiles.php@@ -1,6 +1,6 @@<?php-namespace BookStack\Exports;+namespace BookStack\Exports\ZipExports;use BookStack\Uploads\Attachment;use BookStack\Uploads\AttachmentService;diff --git a/app/Exports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.phpsimilarity index 83%rename from app/Exports/ZipExportReferences.phprename to app/Exports/ZipExports/ZipExportReferences.phpindex 19672db0a..c3565aaa3 100644--- a/app/Exports/ZipExportReferences.php+++ b/app/Exports/ZipExports/ZipExportReferences.php@@ -1,13 +1,12 @@<?php-namespace BookStack\Exports;+namespace BookStack\Exports\ZipExports;use BookStack\App\Model;-use BookStack\Entities\Models\Page;-use BookStack\Exports\ZipExportModels\ZipExportAttachment;-use BookStack\Exports\ZipExportModels\ZipExportImage;-use BookStack\Exports\ZipExportModels\ZipExportModel;-use BookStack\Exports\ZipExportModels\ZipExportPage;+use BookStack\Exports\ZipExports\Models\ZipExportAttachment;+use BookStack\Exports\ZipExports\Models\ZipExportImage;+use BookStack\Exports\ZipExports\Models\ZipExportModel;+use BookStack\Exports\ZipExports\Models\ZipExportPage;use BookStack\Uploads\Attachment;use BookStack\Uploads\Image;@@ -44,12 +43,16 @@ class ZipExportReferencespublic function buildReferences(ZipExportFiles $files): void{- // TODO - Parse page MD & HTML+ // Parse page content firstforeach ($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);- });- // TODO - markdown+ };++ $page->html = $this->parser->parse($page->html ?? '', $handler);+ if ($page->markdown) {+ $page->markdown = $this->parser->parse($page->markdown, $handler);+ }}// dd('end');diff --git a/app/Exports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.phpsimilarity index 98%rename from app/Exports/ZipReferenceParser.phprename to app/Exports/ZipExports/ZipReferenceParser.phpindex 820920da2..4d16dbc61 100644--- a/app/Exports/ZipReferenceParser.php+++ b/app/Exports/ZipExports/ZipReferenceParser.php@@ -1,6 +1,6 @@<?php-namespace BookStack\Exports;+namespace BookStack\Exports\ZipExports;use BookStack\App\Model;use BookStack\Entities\Queries\EntityQueries;