wait #7634 @0:20

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 954cd1f47f9a2636abecefe08dedab4c7336b469..b17b91263fe1ad94a527146876e1d9fce7d9ceb5 100644 (file)
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -217,6 +217,7 @@ class Farm
         while (file_exists($lockFile) && filemtime($lockFile) > (time() - 300)) {
             sleep(30);
         }
+
         touch($lockFile);
         $res = $callback();
         if (file_exists($lockFile)) {

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php
index cd1c090c028bdc1fd9cc8ae247e04faa355ee5e3..bb23fe7ed5a8d9c519a2746adc9d297e1e84414e 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/MarkdownOperation.php
@@ -69,7 +69,7 @@ trait MarkdownOperation
         $base = self::getMarkdownsDir($fluidbook_id) . '/' . time();
         $latestMarkdown = self::getMarkdownsDir($fluidbook_id) . '/latest.markdown3.gz';
         $latestMeta = self::getMarkdownsDir($fluidbook_id) . '/latest.meta3.gz';
-        file_put_contents($base . '.markdown3.gz', gzencode(json_encode($markdowns)));
+        file_put_contents($base . '.markdown3.gz', gzencode(json_encode($markdowns, JSON_UNESCAPED_SLASHES )));
         file_put_contents($base . '.meta3.gz', gzencode(json_encode($meta)));
         copy($base . '.markdown3.gz', $latestMarkdown);
         copy($base . '.meta3.gz', $latestMeta);
@@ -81,7 +81,7 @@ trait MarkdownOperation
 
     public static function getMarkdownsDir($fluidbook_id)
     {
-        return Files::mkdir(protected_path('fluidbookpublication/markdowns/' . $fluidbook_id));
+        return Files::mkdir(protected_path('fluidbookpublication/accessible/' . $fluidbook_id));
     }
 
     public static function getMarkdownsVersions($book_id)
@@ -147,6 +147,7 @@ trait MarkdownOperation
         $dir = self::getMarkdownsDir($fluidbook_id);
         $markdowns = Files::firstThatExists($dir . '/' . $version . '.markdown3.gz', $dir . '/' . $version . '.markdown.gz');
         $markdowns = gzdecode(file_get_contents($markdowns));
+        $markdowns = json_decode($markdowns, true);
         $this->saveMarkdown($fluidbook_id, __('Restaurer la sauvegarde du markdown :date', ['date' => date('Y-m-d H:i:s', $version)]), $markdowns);
 
         return response()->json(['success' => 'ok']);