refactored code

Kaishiyoku · Mar 10, 2020 · 64574c8 · 64574c8
1 parent 279a2af
commit 64574c8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/app/Console/Commands/CrawlImages.php b/app/Console/Commands/CrawlImages.php
@@ -3,12 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Console\BaseCommand;
-use App\Models\Image;
-use App\Models\Tag;
 use App\Models\UpdateLog;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Storage;
 use Symfony\Component\DomCrawler\Crawler;
 
 class CrawlImages extends BaseCommand

diff --git a/app/helpers.php b/app/helpers.php
@@ -149,16 +149,15 @@ function getImageForUri($uri, $verbose = false)
             if ($image) {
                 $image->fill($values);
 
+                createImageFileIfNotExists($image);
+
                 if ($verbose) {
                     logInfoWithPrintout('  #' . $externalId . ' - updated');
                 }
             } else {
                 $image = new Image($values);
 
-                $fileExtension = File::extension($image->url);
-                $fileName = $image->external_id . '.' . $fileExtension;
-
-                Storage::disk('local')->put(env('CRAWLER_FILESYSTEM_PATH'). '/' . $fileName, getExternalContent($image->url));
+                createImageFile($image);
 
                 if ($verbose) {
                     logInfoWithPrintout('  #' . $externalId . ' - created');
@@ -175,6 +174,34 @@ function getImageForUri($uri, $verbose = false)
     }
 }
 
+if (!function_exists('createImageFileIfNotExists')) {
+    function createImageFileIfNotExists($image)
+    {
+        try {
+            $imageFile = Storage::disk('local')->get(getImageFilePathFor($image));
+        } catch (\Illuminate\Contracts\Filesystem\FileNotFoundException $e) {
+            createImageFile($image);
+        }
+    }
+}
+
+if (!function_exists('createImageFile')) {
+    function createImageFile($image)
+    {
+        Storage::disk('local')->put(getImageFilePathFor($image), getExternalContent($image->url));
+    }
+}
+
+if (!function_exists('getImageFilePathFor')) {
+    function getImageFilePathFor($image)
+    {
+        $fileExtension = File::extension($image->url);
+        $fileName = $image->external_id . '.' . $fileExtension;
+
+        return env('CRAWLER_FILESYSTEM_PATH') . '/' . $fileName;
+    }
+}
+
 if (!function_exists('logInfoWithPrintout')) {
     function logInfoWithPrintout($line)
     {