wait #7476 @0.5

diff --git a/app/Jobs/FluidbookCollectionDownload.php b/app/Jobs/FluidbookCollectionDownload.php
index dd93a38cb675cb90ff3b243822624546ea7c435b..b5c9f52975526d01b214823bd5550e156a3122ed 100644 (file)
--- a/app/Jobs/FluidbookCollectionDownload.php
+++ b/app/Jobs/FluidbookCollectionDownload.php
@@ -202,7 +202,7 @@ class FluidbookCollectionDownload extends DownloadBase
 
             $jobs[] = $this->_jobDownloadFluidbook($fbid, $version, $basePath . $this->dirs[$fbid], $fbOptions, true);
         }
-        //$this->_waitJobs($jobs);
+        $this->_waitJobs($jobs);
 
         if (in_array('en', $this->langs)) {
             $default = 'en';
@@ -389,13 +389,18 @@ class FluidbookCollectionDownload extends DownloadBase
     {
         $nbjobs = count($jobs);
         $done = 0;
+        $ids = [];
+        $idstodo=[];
         foreach ($jobs as $job) {
             if ($job->isDone()) {
+                $ids[] = $job->getBookId();
                 $done++;
+            } else {
+                $idstodo[] = $job->getBookId();
             }
         }
         if (rand(1, 10) == 5) {
-            echo $done . '/' . $nbjobs . "\n";
+            echo $done . ' (' . implode(',', $ids) . ')/' . $nbjobs . " (" . implode(',', $idstodo) . ")\n";
         }
         return $done === $nbjobs;
     }

diff --git a/app/Jobs/FluidbookPackage.php b/app/Jobs/FluidbookPackage.php
index e1e620d1f372f03ed51b51eb5c732ef019a365ca..22b40813ca1fd28856cd5034810d97ad5370d686 100644 (file)
--- a/app/Jobs/FluidbookPackage.php
+++ b/app/Jobs/FluidbookPackage.php
@@ -22,12 +22,13 @@ class FluidbookPackage extends Base
         try {
             $packager = Packager::package($this->getBookId(), $this->getVersion(), false, true, $this->getOptions());
             $packager->handle();
-            (new Rsync($packager->getFinalPath(),$this->getDestination()))->execute();
+            (new Rsync($packager->getFinalPath(), $this->getDestination()))->execute();
             $this->setResult(true);
         } catch (\Exception $e) {
             $this->setException($e);
+        } finally {
+            $this->setDone(true);
         }
-        $this->setDone(true);
     }
 
     /**