wip #5451 @1

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 90f366aa15b81cf43f0db78767bdf5e680fa340c..55853417a9ad87b7920cbf34c57920f19ac7692c 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -41,6 +41,7 @@ services:
       - '/data1/extranet/toolbox/.docker/config/sudoers:/etc/sudoers.d/toolbox'
       - '/data1/extranet/toolbox/.docker/config/monit/id:/var/lib/monit/id'
       - '/data1/extranet:/data1/extranet'
+      - '/data1/extranet/tmp:/data1/extranet/tmp'
       - '/home/extranet:/home/extranet'
       - '/mnt:/mnt'
       - '/data1/extranet/toolbox:/application'

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 86dc5e35a7bd7755cfdca1f6363a1cb712402782..9cb6e682a2884739df8c4062ece130796f384c11 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -79,11 +79,11 @@ RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3
 RUN apt-get -y --no-install-recommends install nodejs google-chrome-stable
 RUN apt-get -y --no-install-recommends install sudo
 RUN apt-get -y --no-install-recommends install supervisor ssh rsync
-RUN apt-get -y --no-install-recommends install default-jre pdftk poppler-utils ghostscript imagemagick netpbm libjpeg-turbo8 libjpeg-turbo-progs
+RUN apt-get -y --no-install-recommends install default-jre pdftk poppler-utils inkscape mupdf-tools ghostscript imagemagick netpbm libjpeg-turbo8 libjpeg-turbo-progs
 RUN apt-get -y --no-install-recommends install zip unzip gzip 7zip
 RUN apt-get -y --no-install-recommends install icoutils fontforge
 RUN apt-get -y --no-install-recommends install ffmpeg python3 lame
-RUN apt-get -y --no-install-recommends install inkscape mupdf-tools
+RUN apt-get -y --no-install-recommends install inkscape mupdf-tools librsvg2-bin
 RUN apt-get -y --no-install-recommends install cron monit locate
 
 RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp

diff --git a/app/Http/Controllers/API/FluidbookThemeAPIController.php b/app/Http/Controllers/API/FluidbookThemeAPIController.php
index fe818501dce4314bf9836c07d6536f2ebb6648ea..3506997d348e290e650174fbc6ae2dfd39b66acd 100644 (file)
--- a/app/Http/Controllers/API/FluidbookThemeAPIController.php
+++ b/app/Http/Controllers/API/FluidbookThemeAPIController.php
@@ -162,7 +162,7 @@ class FluidbookThemeAPIController extends Controller
         FluidbookTheme::$updateWS2SyncViewOnChange = true;
         /** @var FluidbookTheme $theme */
         $theme = FluidbookTheme::find($id);
-        $theme->addMediaToField($fieldname, $request->get('path'), true);
+        $theme->replaceMediaInField($fieldname, $request->get('path'), true);
         $theme->save();
     }
 }

diff --git a/app/Jobs/FluidbookCompiler.php b/app/Jobs/FluidbookCompiler.php
index 8280deaa9845540f7b079b7e0cf706644c277e8d..e562b4b723001cd3fe61649973396b172537dc84 100644 (file)
--- a/app/Jobs/FluidbookCompiler.php
+++ b/app/Jobs/FluidbookCompiler.php
@@ -2102,8 +2102,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
     protected function writeExtras()
     {
+        //dd($this->themeAsset('afterSearch'));
         if ($afterSearch = $this->themeAsset('afterSearch')) {
-            $this->vdir->copy($afterSearch->getPathname(), $afterSearch->getFilename());
+            $this->vdir->copy($afterSearch->getPathname(), 'data/images/' . $afterSearch->getFilename());
         }
         if ($this->fluidbookSettings->externalArchives != '') {
             $this->addFilesInfos('archives', $this->wdir . '/' . $this->fluidbookSettings->externalArchives);

diff --git a/app/Jobs/UpdateWS2ThemeTable.php b/app/Jobs/UpdateWS2ThemeTable.php
index 7745705b820f48ceaad93665a0848571e57becf8..5f57d300c76b4e1c724978451107a66af97b9747 100644 (file)
--- a/app/Jobs/UpdateWS2ThemeTable.php
+++ b/app/Jobs/UpdateWS2ThemeTable.php
@@ -7,6 +7,9 @@ namespace App\Jobs;
 use App\Models\FluidbookTheme;
 use Cubist\Backpack\Magic\Fields\Color;
 use Cubist\Backpack\Magic\Fields\Files;
+use Cubist\Util\CommandLine\Imagemagick;
+use Cubist\Util\Graphics\Image;
+use Fluidbook\Tools\SVG\SVGTools;
 use Illuminate\Support\Facades\DB;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
@@ -115,6 +118,16 @@ class UpdateWS2ThemeTable extends Base
                         if (!$exists || realpath($dest) !== realpath($path)) {
                             `rm -f $dest;ln -sf $path $dest`;
                         }
+                        if (stristr($v, '.svg')) {
+                            $png = str_replace('.svg', '.png', $dest);
+                            if (!file_exists($png) || filemtime($png) < filemtime($path)) {
+                                $im = new Imagemagick();
+                                $im->setDest($png);
+                                $im->setSrc($dest);
+                                $im->setManualArg('-background none');
+                                $im->execute();
+                            }
+                        }
                     } else {
                         $v = '';
                     }

diff --git a/scripts/restartworkers b/scripts/restartworkers
index 0ccd6113eb31b3a52faa754703bde0947348a2ef..fcf8b9b613fcb8a97a43b5473d8e4fd7f7b26e46 100644 (file)
--- a/scripts/restartworkers
+++ b/scripts/restartworkers
@@ -1,4 +1,4 @@
 #!/bin/sh
-/usr/sbin/service supervisor stop
-pkill -9 -f queue:work
-/usr/sbin/service supervisor start
+sudo /usr/sbin/service supervisor stop
+sudo pkill -9 -f queue:work
+sudo /usr/sbin/service supervisor start