From a356e9ea71a0de42b0006332bd13887800301fa1 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 2 Jan 2024 17:43:21 +0100 Subject: [PATCH] wip #6575 @1.5 --- .../FluidbookPublicationCrudController.php | 1 + .../CompositionOperation.php | 1 - .../Services/GetPageFromWebsiteOperation.php | 26 +++++++++++++++++++ app/Models/FluidbookPublication.php | 2 ++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/GetPageFromWebsiteOperation.php diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php index 185f4b976..c33f41cf5 100644 --- a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php +++ b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php @@ -21,6 +21,7 @@ class FluidbookPublicationCrudController extends \Cubist\Backpack\Magic\Controll use \App\Http\Controllers\Admin\Operations\InvoiceOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\SocialImageOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\ExportPdfOperation; + use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\GetPageFromWebsiteOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\BastideOperation; use \App\Http\Controllers\Admin\Operations\FluidbookPublication\YSLOperation; diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php index 400f01b19..cd36a77a1 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php @@ -75,7 +75,6 @@ trait CompositionOperation protected function getThumb($doc_id, $doc_page) { - /** @var FluidbookDocument $doc */ $doc = FluidbookDocument::withoutGlobalScopes()->find($doc_id); $path = $doc->getFile($doc_page, 'jpg', 'thumb', true, true, ''); diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/GetPageFromWebsiteOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/GetPageFromWebsiteOperation.php new file mode 100644 index 000000000..1c3c98774 --- /dev/null +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/GetPageFromWebsiteOperation.php @@ -0,0 +1,26 @@ +withoutMiddleware([CheckIfAdmin::class]); + } + } + + protected function getPageFromWebsite($fluidbook, $page) + { + /** @var FluidbookPublication $publication */ + $publication = FluidbookPublication::withoutGlobalScopes()->find($fluidbook); + $path = $publication->getFile($page, 'jpg', 150, true, true, ''); + return XSendFileController::sendfile($path); + } +} diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 56e73d663..63319174c 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -29,6 +29,7 @@ use App\Http\Controllers\Admin\Operations\FluidbookPublication\LinksOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\PreviewOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\BastideOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\ExportPdfOperation; +use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\GetPageFromWebsiteOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\SocialImageOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\StatsOperation; use App\Http\Controllers\Admin\Operations\FluidbookPublication\UpgradeOperation; @@ -106,6 +107,7 @@ class FluidbookPublication extends ToolboxStatusModel // Services SocialImageOperation::class, ExportPdfOperation::class, + GetPageFromWebsiteOperation::class, // Carts BastideOperation::class, // YSL -- 2.39.5