Changed name to folder permissions, added more loggin

silverstripe · May 2, 2019 · b0992a7 · b0992a7
1 parent 76ad99e
commit b0992a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/docs/en/02_Developer_Guides/14_Files/05_File_Migration.md b/docs/en/02_Developer_Guides/14_Files/05_File_Migration.md
@@ -29,6 +29,8 @@ This task will perform a number of subtasks:
  - `generate-cms-thumbnails`: The new CMS UI needs different thumbnail sizes, which can be pregenerated.
    This can be a CPU and memory intensive task for large asset stores.
    See [Migrating substantial number of files](#performance)
+ - `fix-folder-permissions`: Fixes folder permissions which might have been broken by
+   previously using the [silverstripe/secureassets](https://github.com/silverstripe/silverstripe-secureassets)
 
 One or more subtasks can be run individually through the `only` argument.
 Example: `only=move-files,move-thumbnails`

diff --git a/src/Dev/Tasks/MigrateFileTask.php b/src/Dev/Tasks/MigrateFileTask.php
@@ -27,7 +27,7 @@ class MigrateFileTask extends BuildTask
         'move-files',
         'move-thumbnails',
         'generate-cms-thumbnails',
-        'fix-file-permissions'
+        'fix-folder-permissions'
     ];
 
     private static $dependencies = [
@@ -94,17 +94,21 @@ public function run($request)
             ImageThumbnailHelper::singleton()->run();
         }
 
-        if (in_array('fix-file-permissions', $subtasks)) {
-            if (!class_exists(FixFilePermissionsHelper::class)) {
-                $this->logger->error("FixFilePermissionsHelper not found");
+        if (in_array('fix-folder-permissions', $subtasks)) {
+            if (!class_exists(FixFolderPermissionsHelper::class)) {
+                $this->logger->error("FixFolderPermissionsHelper not found");
                 return;
             }
 
-            $this->logger->info('### Fixing file permissions (fix-file-permissions)');
+            $this->logger->info('### Fixing folder permissions (fix-folder-permissions)');
 
-            $updated = FixFilePermissionsHelper::singleton()->run();
+            $updated = FixFolderPermissionsHelper::singleton()->run();
 
-            $this->logger->info("Repaired $updated folders with broken CanViewType settings");
+            if ($updated > 0) {
+                $this->logger->info("Repaired {$updated} folders with broken CanViewType settings");
+            } else {
+                $this->logger->info("No folders required fixes");
+            }
         }
     }