ZIP Exports: Reorganised files, added page md parsing

diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 01611fd2121db42c533b4b7058db88de2e0efead..34e67ffcf7075ede6b30a2842789ef8fa204c7f0 100644 (file)
--- 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\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;
 
 use BookStack\Http\Controller;
 use Throwable;
 

diff --git a/app/Exports/ZipExportModels/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
similarity index 90%
rename from app/Exports/ZipExportModels/ZipExportAttachment.php
rename to app/Exports/ZipExports/Models/ZipExportAttachment.php
index d79a16cc10905f44fd1313e4338dbfabbfa832e6..8c89ae11f145bf03621d6e0316a2d5e8a785417f 100644 (file)
--- a/app/Exports/ZipExportModels/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -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;
 
 class ZipExportAttachment extends ZipExportModel
 use BookStack\Uploads\Attachment;
 
 class ZipExportAttachment extends ZipExportModel

diff --git a/app/Exports/ZipExportModels/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
similarity index 84%
rename from app/Exports/ZipExportModels/ZipExportImage.php
rename to app/Exports/ZipExports/Models/ZipExportImage.php
index 39f1d10129821d61ededab6fd6beab394e29bf78..05d828734a01f08254b9bed9d2b1f3aabbe00fb6 100644 (file)
--- a/app/Exports/ZipExportModels/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -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;
 
 class ZipExportImage extends ZipExportModel
 use BookStack\Uploads\Image;
 
 class ZipExportImage extends ZipExportModel

diff --git a/app/Exports/ZipExportModels/ZipExportModel.php b/app/Exports/ZipExports/Models/ZipExportModel.php
similarity index 92%
rename from app/Exports/ZipExportModels/ZipExportModel.php
rename to app/Exports/ZipExports/Models/ZipExportModel.php
index 26b994c018ef7e37e3f8f1bc7e0edc22c6b794a0..8d0c0a4370b4f6adc8bbcf6c1c4c16319e8d2557 100644 (file)
--- a/app/Exports/ZipExportModels/ZipExportModel.php
+++ b/app/Exports/ZipExports/Models/ZipExportModel.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;

 
 use JsonSerializable;
 
 
 use JsonSerializable;
 

diff --git a/app/Exports/ZipExportModels/ZipExportPage.php b/app/Exports/ZipExports/Models/ZipExportPage.php
similarity index 91%
rename from app/Exports/ZipExportModels/ZipExportPage.php
rename to app/Exports/ZipExports/Models/ZipExportPage.php
index c7a9503546f5db33952c7f99ac2e3ae5d2238e15..bae46ca8225c96dd4b362f75d1961dd5ce19551d 100644 (file)
--- a/app/Exports/ZipExportModels/ZipExportPage.php
+++ b/app/Exports/ZipExports/Models/ZipExportPage.php
@@ -1,10 +1,10 @@
 <?php
 
 <?php
 

-namespace BookStack\Exports\ZipExportModels;
+namespace BookStack\Exports\ZipExports\Models;

 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;

-use BookStack\Exports\ZipExportFiles;
+use BookStack\Exports\ZipExports\ZipExportFiles;

 
 class ZipExportPage extends ZipExportModel
 {
 
 class ZipExportPage extends ZipExportModel
 {

diff --git a/app/Exports/ZipExportModels/ZipExportTag.php b/app/Exports/ZipExports/Models/ZipExportTag.php
similarity index 92%
rename from app/Exports/ZipExportModels/ZipExportTag.php
rename to app/Exports/ZipExports/Models/ZipExportTag.php
index 09ae9f06cbe8a23f1a370b0d45a51cba2b38c8d9..d4e3c4290b33007150482aa6ce96b58c8ce33bd1 100644 (file)
--- a/app/Exports/ZipExportModels/ZipExportTag.php
+++ b/app/Exports/ZipExports/Models/ZipExportTag.php
@@ -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;
 

diff --git a/app/Exports/ZipExportBuilder.php b/app/Exports/ZipExports/ZipExportBuilder.php
similarity index 94%
rename from app/Exports/ZipExportBuilder.php
rename to app/Exports/ZipExports/ZipExportBuilder.php
index 5c56e531b40a679720246ff70709d1bf0fe99be5..15edebea574fb344f3440e3e6cb6951fdab51b03 100644 (file)
--- a/app/Exports/ZipExportBuilder.php
+++ b/app/Exports/ZipExports/ZipExportBuilder.php
@@ -1,10 +1,10 @@
 <?php
 
 <?php
 

-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;

 
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ZipExportException;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ZipExportException;

-use BookStack\Exports\ZipExportModels\ZipExportPage;
+use BookStack\Exports\ZipExports\Models\ZipExportPage;

 use ZipArchive;
 
 class ZipExportBuilder
 use ZipArchive;
 
 class ZipExportBuilder

diff --git a/app/Exports/ZipExportFiles.php b/app/Exports/ZipExports/ZipExportFiles.php
similarity index 98%
rename from app/Exports/ZipExportFiles.php
rename to app/Exports/ZipExports/ZipExportFiles.php
index 27b6f937a385c3772ff51acaf30ac2da12531424..8f0a6bd40310915fec8db92286d5f0d349cb0305 100644 (file)
--- a/app/Exports/ZipExportFiles.php
+++ b/app/Exports/ZipExports/ZipExportFiles.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;

 
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;

diff --git a/app/Exports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
similarity index 83%
rename from app/Exports/ZipExportReferences.php
rename to app/Exports/ZipExports/ZipExportReferences.php
index 19672db0a0ebe1dff1058e68b9d1e45cadc6146a..c3565aaa38347e9a53e363b3cff90df699cb639f 100644 (file)
--- a/app/Exports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -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\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;
 
 use BookStack\Uploads\Attachment;
 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');

diff --git a/app/Exports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.php
similarity index 98%
rename from app/Exports/ZipReferenceParser.php
rename to app/Exports/ZipExports/ZipReferenceParser.php
index 820920da28d89433463aa09bb8635b09828efd35..4d16dbc6110f0db34fecf237d322c5ec55e2b9a1 100644 (file)
--- a/app/Exports/ZipReferenceParser.php
+++ b/app/Exports/ZipExports/ZipReferenceParser.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-namespace BookStack\Exports;
+namespace BookStack\Exports\ZipExports;

 
 use BookStack\App\Model;
 use BookStack\Entities\Queries\EntityQueries;
 
 use BookStack\App\Model;
 use BookStack\Entities\Queries\EntityQueries;