From b4769c14ed83e03325ab724f32c14f98df120fa5 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 21 Apr 2023 12:30:27 +0200 Subject: [PATCH] fix #5399 @0.5 --- app/Console/Commands/FluidbookCompile.php | 4 ++-- app/Console/Commands/FluidbookDocumentProcess.php | 2 -- app/Console/Commands/FluidbookPreprocessImages.php | 2 -- .../Compiler.php} | 14 +++++++------- app/Fluidbook/Link/Custom/InpesPopinLink.php | 6 +++--- app/Fluidbook/Packager/Packager.php | 6 +++--- app/Fluidbook/SEO/Document.php | 10 ++++------ app/Fluidbook/SearchIndex.php | 6 ++---- .../FluidbookCollection/PreviewOperation.php | 1 - .../FluidbookPublication/PreviewOperation.php | 4 ++-- app/Jobs/FluidbookImagesPreprocess.php | 3 ++- app/SubForms/Link/Base.php | 9 ++++----- 12 files changed, 29 insertions(+), 38 deletions(-) rename app/{Jobs/FluidbookCompiler.php => Fluidbook/Compiler.php} (99%) diff --git a/app/Console/Commands/FluidbookCompile.php b/app/Console/Commands/FluidbookCompile.php index 18d161227..6339d4914 100644 --- a/app/Console/Commands/FluidbookCompile.php +++ b/app/Console/Commands/FluidbookCompile.php @@ -2,7 +2,7 @@ namespace App\Console\Commands; -use App\Jobs\FluidbookCompiler; +use App\Fluidbook\Compiler; use App\Models\FluidbookPublication; use Cubist\Backpack\Console\Commands\CubistCommand; use Cubist\Util\PHP; @@ -19,7 +19,7 @@ class FluidbookCompile extends CubistCommand { PHP::neverStop(true); $fluidbook = FluidbookPublication::find($this->argument('id')); - $compiler = new FluidbookCompiler($fluidbook, command: $this); + $compiler = new Compiler($fluidbook, command: $this); $compiler->handle(); } } diff --git a/app/Console/Commands/FluidbookDocumentProcess.php b/app/Console/Commands/FluidbookDocumentProcess.php index 0de115376..009457e7a 100644 --- a/app/Console/Commands/FluidbookDocumentProcess.php +++ b/app/Console/Commands/FluidbookDocumentProcess.php @@ -2,10 +2,8 @@ namespace App\Console\Commands; -use App\Jobs\FluidbookCompiler; use App\Jobs\FluidbookDocumentUpload; use App\Models\FluidbookDocument; -use App\Models\FluidbookPublication; use App\Models\User; use Cubist\Backpack\Console\Commands\CubistCommand; use Cubist\Util\PHP; diff --git a/app/Console/Commands/FluidbookPreprocessImages.php b/app/Console/Commands/FluidbookPreprocessImages.php index 45287da36..6edb950da 100644 --- a/app/Console/Commands/FluidbookPreprocessImages.php +++ b/app/Console/Commands/FluidbookPreprocessImages.php @@ -2,9 +2,7 @@ namespace App\Console\Commands; -use App\Jobs\FluidbookCompiler; use App\Jobs\FluidbookImagesPreprocess; -use App\Models\FluidbookPublication; use Cubist\Backpack\Console\Commands\CubistCommand; use Cubist\Util\PHP; diff --git a/app/Jobs/FluidbookCompiler.php b/app/Fluidbook/Compiler.php similarity index 99% rename from app/Jobs/FluidbookCompiler.php rename to app/Fluidbook/Compiler.php index 046001503..f20137c75 100644 --- a/app/Jobs/FluidbookCompiler.php +++ b/app/Fluidbook/Compiler.php @@ -1,15 +1,17 @@ if ($this->fluidbookSettings->highlightResults && !file_exists($hightlightsFile)) { file_put_contents($hightlightsFile, 'var HIGHLIGHTS=' . json_encode(SearchIndex::makeHighlightIndex($this)) . ";\r"); } - - $this->vdir->copy($cacheDir . '/search.index.js', 'data/search.index.js'); if ($this->fluidbookSettings->highlightResults) { $this->vdir->copy($cacheDir . '/search.highlight.js', 'data/search.highlight.js'); diff --git a/app/Fluidbook/Link/Custom/InpesPopinLink.php b/app/Fluidbook/Link/Custom/InpesPopinLink.php index 9af1605e5..2f2a6806d 100644 --- a/app/Fluidbook/Link/Custom/InpesPopinLink.php +++ b/app/Fluidbook/Link/Custom/InpesPopinLink.php @@ -2,7 +2,7 @@ namespace App\Fluidbook\Link\Custom; -use App\Jobs\FluidbookCompiler; +use App\Fluidbook\Compiler; use Fluidbook\Tools\Links\HTMLMultimediaLink; class InpesPopinLink extends HTMLMultimediaLink @@ -36,8 +36,8 @@ class InpesPopinLink extends HTMLMultimediaLink $css .= 'width:' . $this->width * $this->getCssScale() . 'px;height:' . $this->height * $this->getCssScale() . 'px;'; $css .= $this->getCSSZIndex(); if ($this->rot) { - $css .= FluidbookCompiler::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); - $css .= FluidbookCompiler::writeCSSUA('transform-origin', '0% 0%'); + $css .= Compiler::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); + $css .= Compiler::writeCSSUA('transform-origin', '0% 0%'); } $css .= $this->getCSS(); $css .= '}'; diff --git a/app/Fluidbook/Packager/Packager.php b/app/Fluidbook/Packager/Packager.php index 06ae359c3..e095c533b 100644 --- a/app/Fluidbook/Packager/Packager.php +++ b/app/Fluidbook/Packager/Packager.php @@ -2,7 +2,7 @@ namespace App\Fluidbook\Packager; -use App\Jobs\FluidbookCompiler; +use App\Fluidbook\Compiler; use App\Models\FluidbookPublication; use App\Models\FluidbookTheme; use Cubist\Util\CommandLine; @@ -170,7 +170,7 @@ class Packager extends \App\Jobs\Base */ protected function compile($forceCompile = false) { - $compiler = new FluidbookCompiler($this->book, $this->scormVariant); + $compiler = new Compiler($this->book, $this->scormVariant); $compiler->handle(); } @@ -301,7 +301,7 @@ class Packager extends \App\Jobs\Base $dest = $this->vdir; } - $compiler = new FluidbookCompiler($book, $this->scormVariant, false, "latest", null, false, false, false, null, $hybrid); + $compiler = new Compiler($book, $this->scormVariant, false, "latest", null, false, false, false, null, $hybrid); $compiler->handle(); $rsync = new CommandLine\Rsync(rtrim($compiler->getFinalPath(), '/'), $dest, true); diff --git a/app/Fluidbook/SEO/Document.php b/app/Fluidbook/SEO/Document.php index 4ac319a2e..73e7da2e8 100644 --- a/app/Fluidbook/SEO/Document.php +++ b/app/Fluidbook/SEO/Document.php @@ -2,19 +2,17 @@ namespace App\Fluidbook\SEO; -use App\Http\Controllers\Admin\Operations\Tools\Excel2JSON; -use App\Jobs\FluidbookCompiler; +use App\Fluidbook\Compiler; use App\Models\FluidbookDocument; - - use Cubist\Excel\ExcelToArray; use Cubist\Util\Text; + class Document { /** - * @var FluidbookCompiler + * @var Compiler */ public $compiler; /** @@ -26,7 +24,7 @@ class Document /** - * @param $compiler FluidbookCompiler + * @param $compiler Compiler */ public function __construct($compiler) { diff --git a/app/Fluidbook/SearchIndex.php b/app/Fluidbook/SearchIndex.php index 2745aaedd..d82296f55 100644 --- a/app/Fluidbook/SearchIndex.php +++ b/app/Fluidbook/SearchIndex.php @@ -2,15 +2,13 @@ namespace App\Fluidbook; -use App\Jobs\FluidbookCompiler; use App\Models\FluidbookDocument; -use Cubist\PDF\CommandLine\FWSTK; use Cubist\Util\Gzip; class SearchIndex { /** - * @param $compiler FluidbookCompiler + * @param $compiler Compiler * @param $pages * @param $index * @param $textes @@ -55,7 +53,7 @@ class SearchIndex } /** - * @param $compiler FluidbookCompiler + * @param $compiler Compiler * @return array */ public static function makeHighlightIndex($compiler): array diff --git a/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php index 17a255d59..dfc0ee599 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookCollection/PreviewOperation.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Operations\FluidbookCollection; use App\Http\Controllers\Admin\Operations\FluidbookPreviewOperation; use App\Jobs\FluidbookCollectionDownload; -use App\Jobs\FluidbookCompiler; use App\Models\FluidbookCollection; use App\Models\FluidbookPublication; use App\Models\FluidbookTheme; diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php index e762e0317..bf8f7af1b 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Admin\Operations\FluidbookPublication; +use App\Fluidbook\Compiler; use App\Http\Controllers\Admin\Operations\FluidbookPreviewOperation; use App\Http\Middleware\CheckIfAdmin; -use App\Jobs\FluidbookCompiler; use App\Models\FluidbookPublication; use App\Models\FluidbookTheme; use Cubist\Backpack\Http\Controllers\Base\XSendFileController; @@ -115,7 +115,7 @@ trait PreviewOperation $dest = $fluidbook->getFinalPath($theme, $isScorm); if ($path === 'index.html') { $fluidbook->incrementPreviewVisit(); - $compiler = new FluidbookCompiler($fluidbook, $isScorm, theme: $theme); + $compiler = new Compiler($fluidbook, $isScorm, theme: $theme); $compiler->handle(); } diff --git a/app/Jobs/FluidbookImagesPreprocess.php b/app/Jobs/FluidbookImagesPreprocess.php index f598a7732..cbddf5267 100644 --- a/app/Jobs/FluidbookImagesPreprocess.php +++ b/app/Jobs/FluidbookImagesPreprocess.php @@ -2,6 +2,7 @@ namespace App\Jobs; +use App\Fluidbook\Compiler; use App\Models\FluidbookPublication; use Cubist\Util\ArrayUtil; @@ -28,7 +29,7 @@ class FluidbookImagesPreprocess extends Base { $this->book = FluidbookPublication::find($this->book_id); $settings = $this->book->getSettings(); - $resolutions = FluidbookCompiler::getBookResolutions($this->book); + $resolutions = Compiler::getBookResolutions($this->book); $rasterizePages = ArrayUtil::parseRange($settings->rasterizePages); $vectorPages = array_diff(ArrayUtil::parseRange($settings->vectorPages), $rasterizePages); diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php index 00f82fcf9..f01ecface 100644 --- a/app/SubForms/Link/Base.php +++ b/app/SubForms/Link/Base.php @@ -6,10 +6,11 @@ use App\Fields\FluidbookLinkEditor\Depth; use App\Fields\FluidbookLinkEditor\LinkType; use App\Fields\FluidbookLinkEditor\MultimediaIntegration; use App\Fields\FluidbookLinkEditor\RolloverAnimation; -use App\Jobs\FluidbookCompiler; +use App\Fluidbook\Compiler; +use App\Fluidbook\Link\Link; use App\Models\FluidbookPublication; -use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\FieldGroupEnd; use Cubist\Backpack\Magic\Fields\FieldGroupStart; use Cubist\Backpack\Magic\Fields\FilesOrURL; @@ -20,8 +21,6 @@ use Cubist\Backpack\Magic\Fields\SelectFromArray; use Cubist\Backpack\Magic\Fields\Text; use Cubist\Backpack\Magic\Fields\Textarea; use Cubist\Backpack\Magic\Form; -use Fluidbook\Tools\Compiler\DummyCompiler; -use App\Fluidbook\Link\Link; // __('!! Editeur de liens') class Base extends Form @@ -356,7 +355,7 @@ class Base extends Form $id = 1; $base = ['top' => 1, 'left' => 1, 'width' => 1, 'height' => 1, 'to' => '', 'inline' => 'inline', 'page' => 2, 'target' => '_blank', 'extra' => '', 'interactive' => false]; - $compiler = new FluidbookCompiler($fluidbook); + $compiler = new Compiler($fluidbook); /** @var Link $instances */ $instances = []; -- 2.39.5