Increase robustness of the refresh method

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

diff --git a/app/Http/Controllers/ChapterExportController.php b/app/Http/Controllers/ChapterExportController.php
index 15d67d53927b1c41afa5e3e7c876315d67a90e3d..0c86f854828b70dad5418a9b475c7262aef16612 100644 (file)
--- a/app/Http/Controllers/ChapterExportController.php
+++ b/app/Http/Controllers/ChapterExportController.php
@@ -1,77 +1,57 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use BookStack\Entities\ExportService;
 
 use BookStack\Entities\ExportService;

-use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\Repos\ChapterRepo;

 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;

-use Illuminate\Http\Response;

 use Throwable;
 
 class ChapterExportController extends Controller
 {
 use Throwable;
 
 class ChapterExportController extends Controller
 {

-    /**
-     * @var EntityRepo
-     */
-    protected $entityRepo;

 
 

-    /**
-     * @var ExportService
-     */
+    protected $chapterRepo;

     protected $exportService;
 
     /**
      * ChapterExportController constructor.
     protected $exportService;
 
     /**
      * ChapterExportController constructor.

-     * @param EntityRepo $entityRepo
-     * @param ExportService $exportService

      */
      */

-    public function __construct(EntityRepo $entityRepo, ExportService $exportService)
+    public function __construct(ChapterRepo $chapterRepo, ExportService $exportService)

     {
     {

-        $this->entityRepo = $entityRepo;
+        $this->chapterRepo = $chapterRepo;

         $this->exportService = $exportService;
         parent::__construct();
     }
 
     /**
         $this->exportService = $exportService;
         parent::__construct();
     }
 
     /**

-     * Exports a chapter to pdf .
-     * @param string $bookSlug
-     * @param string $chapterSlug
-     * @return Response
+     * Exports a chapter to pdf.

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

-        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

         $pdfContent = $this->exportService->chapterToPdf($chapter);
         return $this->downloadResponse($pdfContent, $chapterSlug . '.pdf');
     }
 
     /**
      * Export a chapter to a self-contained HTML file.
         $pdfContent = $this->exportService->chapterToPdf($chapter);
         return $this->downloadResponse($pdfContent, $chapterSlug . '.pdf');
     }
 
     /**
      * Export a chapter to a self-contained HTML file.

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

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

-        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

         $containedHtml = $this->exportService->chapterToContainedHtml($chapter);
         return $this->downloadResponse($containedHtml, $chapterSlug . '.html');
     }
 
     /**
      * Export a chapter to a simple plaintext .txt file.
         $containedHtml = $this->exportService->chapterToContainedHtml($chapter);
         return $this->downloadResponse($containedHtml, $chapterSlug . '.html');
     }
 
     /**
      * Export a chapter to a simple plaintext .txt file.

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

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

-        $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
+        $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

         $chapterText = $this->exportService->chapterToPlainText($chapter);
         return $this->downloadResponse($chapterText, $chapterSlug . '.txt');
     }
         $chapterText = $this->exportService->chapterToPlainText($chapter);
         return $this->downloadResponse($chapterText, $chapterSlug . '.txt');
     }