Merge image name cleaning functions

[bookstack] / app / Http / Controllers / PageExportController.php

diff --git a/app/Http/Controllers/PageExportController.php b/app/Http/Controllers/PageExportController.php
index addcc55132c218078ab903bc85777bf8805ba330..e5e027fe72cd2f5cec19418d9ea81901238e2eb7 100644 (file)
--- a/app/Http/Controllers/PageExportController.php
+++ b/app/Http/Controllers/PageExportController.php
@@ -2,80 +2,62 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

-use BookStack\Entities\ExportService;
+use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Entities\Tools\PageContent;

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\NotFoundException;

-use Illuminate\Http\Response;

 use Throwable;
 
 class PageExportController extends Controller
 {
 use Throwable;
 
 class PageExportController extends Controller
 {

-    /**
-     * @var PageRepo
-     */
-    protected $pageRepo;

 
 

-    /**
-     * @var ExportService
-     */
-    protected $exportService;
+    protected $pageRepo;
+    protected $exportFormatter;

 
     /**
      * PageExportController constructor.
 
     /**
      * PageExportController constructor.

-     * @param PageRepo $pageRepo
-     * @param ExportService $exportService

      */
      */

-    public function __construct(PageRepo $pageRepo, ExportService $exportService)
+    public function __construct(PageRepo $pageRepo, ExportFormatter $exportFormatter)

     {
         $this->pageRepo = $pageRepo;
     {
         $this->pageRepo = $pageRepo;

-        $this->exportService = $exportService;
-        parent::__construct();
+        $this->exportFormatter = $exportFormatter;

     }
 
     /**
      * Exports a page to a PDF.
      * https://github.com/barryvdh/laravel-dompdf
     }
 
     /**
      * Exports a page to a PDF.
      * https://github.com/barryvdh/laravel-dompdf

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Response

      * @throws NotFoundException
      * @throws Throwable
      */
     public function pdf(string $bookSlug, string $pageSlug)
     {
      * @throws NotFoundException
      * @throws Throwable
      */
     public function pdf(string $bookSlug, string $pageSlug)
     {

-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $page->html = $this->pageRepo->renderPage($page);
-        $pdfContent = $this->exportService->pageToPdf($page);
+        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page->html = (new PageContent($page))->render();
+        $pdfContent = $this->exportFormatter->pageToPdf($page);

         return $this->downloadResponse($pdfContent, $pageSlug . '.pdf');
     }
 
     /**
      * Export a page to a self-contained HTML file.
         return $this->downloadResponse($pdfContent, $pageSlug . '.pdf');
     }
 
     /**
      * Export a page to a self-contained HTML file.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Response

      * @throws NotFoundException
      * @throws Throwable
      */
     public function html(string $bookSlug, string $pageSlug)
     {
      * @throws NotFoundException
      * @throws Throwable
      */
     public function html(string $bookSlug, string $pageSlug)
     {

-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $page->html = $this->pageRepo->renderPage($page);
-        $containedHtml = $this->exportService->pageToContainedHtml($page);
+        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $page->html = (new PageContent($page))->render();
+        $containedHtml = $this->exportFormatter->pageToContainedHtml($page);

         return $this->downloadResponse($containedHtml, $pageSlug . '.html');
     }
 
     /**
      * Export a page to a simple plaintext .txt file.
         return $this->downloadResponse($containedHtml, $pageSlug . '.html');
     }
 
     /**
      * Export a page to a simple plaintext .txt file.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Response

      * @throws NotFoundException
      */
     public function plainText(string $bookSlug, string $pageSlug)
     {
      * @throws NotFoundException
      */
     public function plainText(string $bookSlug, string $pageSlug)
     {

-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $pageText = $this->exportService->pageToPlainText($page);
+        $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
+        $pageText = $this->exportFormatter->pageToPlainText($page);

         return $this->downloadResponse($pageText, $pageSlug . '.txt');
     }
 }
         return $this->downloadResponse($pageText, $pageSlug . '.txt');
     }
 }