wait #6539 @0.5

diff --git a/app/Console/Commands/FluidbookCollection.php b/app/Console/Commands/FluidbookCollection.php
index c4713f1aef095310924ca1ba45e558986f4942a1..d45ae24f0861b3b3eb1b3ed17660afa86d3bd4d1 100644 (file)
--- a/app/Console/Commands/FluidbookCollection.php
+++ b/app/Console/Commands/FluidbookCollection.php
@@ -10,7 +10,7 @@ use Cubist\Util\PHP;
 
 class FluidbookCollection extends CubistCommand
 {
-    protected $signature = 'fluidbook:collection {id} {action}';
+    protected $signature = 'fluidbook:collection {id} {action=export}';
     protected $description = 'Compile a fluidbook';
 
     /**

diff --git a/app/Jobs/Base.php b/app/Jobs/Base.php
index 8000a997080a7c66f254eb58b55123d956ba2e0a..bf9a3b14898d2dc0dfce6bae9274ddbb178473c8 100644 (file)
--- a/app/Jobs/Base.php
+++ b/app/Jobs/Base.php
@@ -3,8 +3,8 @@
 namespace App\Jobs;
 
 use App\Models\User;
-use Cubist\Backpack\Facades\App;
 use Illuminate\Support\Facades\Cache;
+use Throwable;
 
 class Base extends \Cubist\Backpack\Jobs\Base
 {
@@ -15,6 +15,9 @@ class Base extends \Cubist\Backpack\Jobs\Base
     protected $user;
     protected string $_cacheKey;
 
+    public $failOnTimeout = false;
+    public $timeout = 120000;
+
     public function __construct()
     {
         $this->generateCacheKey();
@@ -51,5 +54,9 @@ class Base extends \Cubist\Backpack\Jobs\Base
         return Cache::put($this->_cacheKey . '_' . $key, $value);
     }
 
+    public function failed(Throwable $exception)
+    {
+
+    }
 
 }

diff --git a/app/Jobs/FluidbookCollectionDownload.php b/app/Jobs/FluidbookCollectionDownload.php
index 1c982762dda62ca6dd4ef8386158b396de5ea518..d11006e25cd408fac265050b167d6a2bcae71a46 100644 (file)
--- a/app/Jobs/FluidbookCollectionDownload.php
+++ b/app/Jobs/FluidbookCollectionDownload.php
@@ -126,7 +126,7 @@ class FluidbookCollectionDownload extends DownloadBase
         $data = $this->entry->getPageData();
         $optionsFluidbooks = [];
         if (null === $version) {
-            $version = $version ?? $data->version_multilang;
+            $version = $version ?? $data->version_multilang ?? 'online';
         }
         $basePath = Files::mkdir($this->entry->getFinalPath() . $data->type . '/' . $version);
 
@@ -420,7 +420,7 @@ class FluidbookCollectionDownload extends DownloadBase
         $paths = $this->getPublicationsPaths($data);
         foreach ($paths as $fbid => $path) {
             $dest = $basePath . $path;
-            $jobs[] = $this->_jobDownloadFluidbook($fbid, $data->version, $dest, $options);
+            $jobs[] = $this->_jobDownloadFluidbook($fbid, $data->version ?? 'online', $dest, $options);
         }
 
         $this->_waitJobs($jobs);