wait #6223 @0.5

diff --git a/app/Jobs/FluidbookCollectionDownload.php b/app/Jobs/FluidbookCollectionDownload.php
index 78396315446b8c3390c0f6eb2adad7b18a0d98ec..99dea9cbf9d0406ec12cb4c0ea7c21009147b6da 100644 (file)
--- a/app/Jobs/FluidbookCollectionDownload.php
+++ b/app/Jobs/FluidbookCollectionDownload.php
@@ -12,6 +12,7 @@ use Cubist\Util\CommandLine\Rsync;
 use Cubist\Util\Files\Files;
 use Cubist\Util\PHP;
 use Cubist\Util\Str;
+use Illuminate\Support\Facades\Artisan;
 
 class FluidbookCollectionDownload extends DownloadBase
 {
@@ -133,7 +134,7 @@ class FluidbookCollectionDownload extends DownloadBase
 
         foreach ($data->publications as $publication) {
             $fbid = $publication['fluidbook'];
-            $fluidbooks[$fbid] = FluidbookPublication::find($fbid);
+            $fluidbooks[$fbid] = FluidbookPublication::syncPublicationFromWorkshop($fbid);
             $langs[$fbid] = $fluidbooks[$fbid]->locale;
             $countries[$fbid] = $fluidbooks[$fbid]->country;
         }

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 16caf49600a7369bdf8defebb5e58197e6559860..45e710b17408bf7ee290d4001d3dcdb2696e9c09 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -792,6 +792,19 @@ class FluidbookPublication extends ToolboxSettingsModel
         return true;
     }
 
+    /**
+     * @param $id
+     * @return FluidbookPublication
+     */
+    public static function syncPublicationFromWorkshop($id)
+    {
+        /** @var FluidbookPublication $fb */
+        $fb = FluidbookPublication::withoutGlobalScopes()->find($id);
+        $fb?->syncFromWorkshop();
+
+        return FluidbookPublication::find($id);
+    }
+
 
     protected function _replicateMedia($newId)
     {
@@ -976,7 +989,6 @@ class FluidbookPublication extends ToolboxSettingsModel
     }
 
 
-
     public function generateThumbnailsPreview($sync = false)
     {
         $mobilefirstFluidbookId = $this->mobilefirstFluidbookId;