Merge pull request #882 from SlovakNationalGallery/feature/WEBUMENIA-…

…1994 [import] skip unmodified jpg images
SlovakNationalGallery · Aug 16, 2023 · b34e867 · b34e867
2 parents 93042f5 + f233bac
commit b34e867
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/app/ImportRecord.php b/app/ImportRecord.php
@@ -2,6 +2,7 @@
 
 namespace App;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
@@ -56,4 +57,14 @@ public function readStream(SplFileInfo $file)
     {
         return $this->import->readStream($file);
     }
+
+    public function lastModified(SplFileInfo $file)
+    {
+        return $this->import->lastModified($file);
+    }
+
+    public function scopeCompleted(Builder $query)
+    {
+        $query->where('status', self::STATUS_COMPLETED);
+    }
 }
diff --git a/app/Importers/AbstractImporter.php b/app/Importers/AbstractImporter.php
@@ -7,6 +7,7 @@
 use App\Item;
 use App\Matchers\AuthorityMatcher;
 use App\Repositories\IFileRepository;
+use Carbon\Carbon;
 use DateTime;
 use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Support\Collection;
@@ -138,9 +139,17 @@ protected function importSingle(array $record, ImportRecord $import_record): ?It
 
         $jpgFile = $this->getJpgFile($import_record, $image_filename_format);
         if ($jpgFile) {
-            $stream = $import_record->readStream($jpgFile);
-            $item->saveImage($stream);
-            $import_record->imported_images++;
+            $lastModified = $import_record->lastModified($jpgFile);
+            $lastStartedAt = $import_record->import
+                ->records()
+                ->completed()
+                ->max('started_at');
+
+            if (Carbon::createFromTimestamp($lastModified) > Carbon::make($lastStartedAt)) {
+                $stream = $import_record->readStream($jpgFile);
+                $item->saveImage($stream);
+                $import_record->imported_images++;
+            }
         }
 
         $this->getJp2Files($import_record, $image_filename_format)