Add migration to remove the old cached directory if no longer used

Author: Bradie Tilley

classes/Resizer.php

@@ -886,11 +886,14 @@ public function render(): void
      * Delete all cached images.
      *
      * @param Carbon|null $minAge Optional minimum age (delete before this date), `null` for all files.
+     * @param string|null $directory Optional directory to delete from
      * @return int Number of files deleted
      */
-    public static function clearFiles(Carbon $minAge = null): int
+    public static function clearFiles(Carbon $minAge = null, string $directory = null): int
     {
-        $files = collect(File::allFiles(Settings::getBasePath()))
+        $directory = $directory ?? Settings::getBasePath();
+
+        $files = collect(File::allFiles($directory))
             ->transform(function ($file) use ($minAge) {
                 $delete = true;
 
@@ -905,6 +908,17 @@ public static function clearFiles(Carbon $minAge = null): int
             ->filter()
             ->toArray();
 
+        // Iterate each directory and delete it if it's empty
+        collect(File::directories($directory))
+            ->each(function ($dir) {
+                $files = File::allFiles($dir);
+
+                if (empty($files)) {
+                    File::deleteDirectory($dir);
+                    @unlink($dir);
+                }
+            });
+
         // Fire event to hook into and modify $files before deleting
         Event::fire('abweb.imageresize.clearFiles', [&$files, $minAge]);
 

updates/clear_old_cache_dir.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace ABWebDevelopers\Portfolio\Updates;
+
+use ABWebDevelopers\ImageResize\Classes\Resizer;
+use Schema;
+use October\Rain\Database\Updates\Migration;
+use ABWebDevelopers\ImageResize\Models\Settings;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+
+class ClearOldCacheDir extends Migration
+{
+    public function up()
+    {
+        $oldpath = base_path('storage/app/media/imageresizecache');
+
+        if (Settings::instance()->cache_directory !== $oldpath) {
+            if (is_dir($oldpath)) {
+                Resizer::clearFiles(null, $oldpath);
+
+                File::deleteDirectory($oldpath);
+                @unlink($oldpath);
+            }
+        }
+    }
+
+    public function down()
+    {
+    }
+}

updates/version.yaml

@@ -1,14 +1,31 @@
-1.0.0: Initial version of Image Resize
-1.1.0: Add settings, filters, image not found placeholder, and various other improvements
-1.1.1: Enable image caching
-1.1.2: Minor tweaks and improvements, ship plugin with 2 filters
-1.1.3: Fix PHP 7.0 incompatibility issue, support all relative URL images
-1.1.4: Register access permissions
-1.1.5: Fix issue with spaces in filenames
-1.1.6: Fix return type errors
-1.1.7: Remove debug routes file
-2.0.0: Optimise image resizing on initial pageload by offloading to separate thread (by resizing when requesting images)
-2.0.1: Fix bug (since 2.0.0) where the 'default 404 image' does not utilise the configured background/mode/quality
-2.0.2: Implement ability to add watermarks to images
-2.1.0: Move default imageresizecache directory (out of app/media) and store+serve images with file extension (change default imagresize cache clear to 1 week)
-2.1.1: Fix double slash issue in resized image URLs
+1.0.0:
+  - Initial version of Image Resize
+1.1.0:
+  - Add settings, filters, image not found placeholder, and various other improvements
+1.1.1:
+  - Enable image caching
+1.1.2:
+  - Minor tweaks and improvements, ship plugin with 2 filters
+1.1.3:
+  - Fix PHP 7.0 incompatibility issue, support all relative URL images
+1.1.4:
+  - Register access permissions
+1.1.5:
+  - Fix issue with spaces in filenames
+1.1.6:
+  - Fix return type errors
+1.1.7:
+  - Remove debug routes file
+2.0.0:
+  - Optimise image resizing on initial pageload by offloading to separate thread (by resizing when requesting images)
+2.0.1:
+  - Fix bug (since 2.0.0) where the 'default 404 image' does not utilise the configured background/mode/quality
+2.0.2:
+  - Implement ability to add watermarks to images
+2.1.0:
+  - Move default imageresizecache directory (out of app/media) and store+serve images with file extension (change default imagresize cache clear to 1 week)
+2.1.1:
+  - Fix double slash issue in resized image URLs
+2.1.2:
+  - Clear old images (for the v2.1.0 directory change)
+  - clear_old_cache_dir.php