Add default_template as Book setting

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

diff --git a/app/Http/Controllers/BookExportController.php b/app/Http/Controllers/BookExportController.php
index 40eec69fe9e90e01b1e5029d0fc8c09b76ec6a16..cc8d48a35511e5c6504c69b33512c9164fd22793 100644 (file)
--- a/app/Http/Controllers/BookExportController.php
+++ b/app/Http/Controllers/BookExportController.php
@@ -2,46 +2,49 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

-use BookStack\Entities\ExportService;

 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookRepo;

+use BookStack\Entities\Tools\ExportFormatter;

 use Throwable;
 
 class BookExportController extends Controller
 {
 use Throwable;
 
 class BookExportController extends Controller
 {

-

     protected $bookRepo;
     protected $bookRepo;

-    protected $exportService;
+    protected $exportFormatter;

 
     /**
      * BookExportController constructor.
      */
 
     /**
      * BookExportController constructor.
      */

-    public function __construct(BookRepo $bookRepo, ExportService $exportService)
+    public function __construct(BookRepo $bookRepo, ExportFormatter $exportFormatter)

     {
         $this->bookRepo = $bookRepo;
     {
         $this->bookRepo = $bookRepo;

-        $this->exportService = $exportService;
-        parent::__construct();
+        $this->exportFormatter = $exportFormatter;
+        $this->middleware('can:content-export');

     }
 
     /**
      * Export a book as a PDF file.
     }
 
     /**
      * Export a book as a PDF file.

+     *

      * @throws Throwable
      */
     public function pdf(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
      * @throws Throwable
      */
     public function pdf(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $pdfContent = $this->exportService->bookToPdf($book);
-        return $this->downloadResponse($pdfContent, $bookSlug . '.pdf');
+        $pdfContent = $this->exportFormatter->bookToPdf($book);
+
+        return $this->download()->directly($pdfContent, $bookSlug . '.pdf');

     }
 
     /**
      * Export a book as a contained HTML file.
     }
 
     /**
      * Export a book as a contained HTML file.

+     *

      * @throws Throwable
      */
     public function html(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
      * @throws Throwable
      */
     public function html(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $htmlContent = $this->exportService->bookToContainedHtml($book);
-        return $this->downloadResponse($htmlContent, $bookSlug . '.html');
+        $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
+
+        return $this->download()->directly($htmlContent, $bookSlug . '.html');

     }
 
     /**
     }
 
     /**


@@ -50,8 +53,9 @@ class BookExportController extends Controller
     public function plainText(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
     public function plainText(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $textContent = $this->exportService->bookToPlainText($book);
-        return $this->downloadResponse($textContent, $bookSlug . '.txt');
+        $textContent = $this->exportFormatter->bookToPlainText($book);
+
+        return $this->download()->directly($textContent, $bookSlug . '.txt');

     }
 
     /**
     }
 
     /**


@@ -59,9 +63,9 @@ class BookExportController extends Controller
      */
     public function markdown(string $bookSlug)
     {
      */
     public function markdown(string $bookSlug)
     {

-        // TODO: This should probably export to a zip file.

         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $textContent = $this->exportService->bookToMarkdown($book);
-        return $this->downloadResponse($textContent, $bookSlug . '.md');
+        $textContent = $this->exportFormatter->bookToMarkdown($book);
+
+        return $this->download()->directly($textContent, $bookSlug . '.md');

     }
 }
     }
 }