NEW Legacy thumbnail migration task

See silverstripe/silverstripe-assets#235
Makes a start at silverstripe/silverstripe-assets#219 as well

docs/en/02_Developer_Guides/14_Files/04_File_Storage.md

@@ -68,7 +68,7 @@ assets/
 The URL for this file will match the physical location on disk:
 `http://www.example.com/assets/my-public-folder/my-public-file.jpg`.
 
-## Variant file paths (e.g. resized images)
+## Variant file paths (e.g. resized images) {#variant-file-paths}
 
 Each file can have variants, most commonly resized versions of an image.
 These can be generated by resizing an image in the CMS rich text editor,

docs/en/02_Developer_Guides/14_Files/05_File_Migration.md

@@ -19,10 +19,26 @@ $ ./vendor/bin/sake dev/tasks/MigrateFileTask
 This task will also support migration of existing File objects to file versioning. Any
 pre-existing File objects will be automatically published to the live stage, to ensure
 that previously visible assets remain visible to the public site.
-
 If additional security or visibility rules should be applied to File dataobjects, then
 make sure to correctly extend `canView` via extensions.
 
+Imports all files referenced by File dataobjects into the new Asset Persistence Layer introduced in 4.0.
+Moves existing thumbnails, and generates new thumbnail sizes for the CMS UI.
+If the task fails or times out, run it again and it will start where it left off.
+
+Arguments:
+
+ - `only`: Comma separated list of tasks to run on the multi-step migration (see "Available subtasks").
+   Example: `only=move-files,move-thumbnails`
+
+Availabile subtasks:
+
+ - `move-files`: The main task, moves database and filesystem data
+ - `move-thumbnails`: Move existing thumbnails, rather than have them generated on the fly.
+    This task is optional, but helps to avoid growing your asset folder (no duplicate thumbnails)
+ - `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.
+
 ## Automatic migration
 
 Migration can be invoked by either this task, or can be configured to automatically run during dev build
@@ -37,14 +53,12 @@ SilverStripe\Assets\File:
 
 You can also run this task without CLI access through the [queuedjobs](https://github.com/symbiote/silverstripe-queuedjobs) module.
 
-## Migration of thumbnails
-
-If you have the [asset admin](https://github.com/silverstripe/silverstripe-asset-admin) module installed
-this will also ensure that thumbnails for these images are generated when running 'MigrateFileTask'.
-Existing thumbnails will not be migrated however, and must be re-generated for use in the CMS.
+## Migration of existing thumbnails
 
-Note: Thumbnails can be regenerated on a one-by-one basis within the CMS by re-saving it
-within the file edit details form.
+Thumbnails generated through SilverStripe's image manipulation layer can be created by authors
+resizing images in the rich text editor, through template or PHP code, or by SilverStripe's built-in CMS logic.
+They are now called "variants", and are placed in a different folder structure. In order to avoid re-generating those thumbnails,
+and cluttering up your asset store with orphaned files, the task will move them to the new location by default.
 
 ## Discarded files during migration
 

docs/en/04_Changelogs/4.4.0.md

@@ -2,6 +2,8 @@
 
 ## Overview {#overview}
 
+ - [Optional migration to hash-less public asset URLs](#hash-less)
+ - [Optional migration of legacy thumbnail locations](#legacy-thumb)
  - [Correct PHP types are now returned from database queries](/developer_guides/model/sql_select#data-types)
  - [Server Requirements](/getting_started/server_requirements/#web-server-software-requirements) have been refined:
    MySQL 5.5 end of life reached in December 2018, thus SilverStripe 4.4 requires MySQL 5.6+.  
@@ -32,10 +34,25 @@ This will avoid potential conflict with SiteTree URL Segments.
 
 You may also need to update your server configuration if you have applied special conditions to the `resources` path.
 
-### Optional migration to hash-less public asset URLs {#hashless-urls}
+### Optional migration tasks: Overview
 
 SilverStripe 4.x introduced an [asset abstraction](https://docs.silverstripe.org/en/4/developer_guides/files/file_storage/)
 system which required a [file migration](https://docs.silverstripe.org/en/4/developer_guides/files/file_migration/) task.
+
+We have ironed out some edge cases since then:
+
+ * [Hash-less public asset URLs](#hash-less)
+ * [Legacy thumbnail locations](#legacy-thumb)
+ * TODO Shortcode migration
+
+
+You can opt-in to performing these migration tasks on your already upgraded SilverStripe 4.x project.
+Projects which are upgraded from 3.x to 4.4 or newer will run these tasks by default.
+You can perform these tasks in the background without CLI access by installing and configuring
+the [queuedjobs](https://github.com/symbiote/silverstripe-queuedjobs) module.
+
+### Optional migration tasks: Hash-less public asset URLs {#hash-less}
+
 It allowed files to be access protected, have a separate draft stage,
 and track changes to file metadata and their contents through the `Versioned` system.
 
@@ -58,10 +75,30 @@ In order to opt-in to moving these files, run the following command:
 vendor/bin/sake dev/tasks/MigrateFileTask
 ``` 
 
-Note that you can run this task without CLI access by installing and configuring
-the [queuedjobs](https://github.com/symbiote/silverstripe-queuedjobs) module.
+Further information is provided in the [Hash-less Public Asset URLs FAQ](#hashless-faq) below,
+as well as the [Github issue](https://github.com/silverstripe/silverstripe-versioned/issues/177).
+
+### Optional migration tasks: Legacy thumbnail locations {#legacy-thumb}
+
+Alongside the new [asset abstraction](https://docs.silverstripe.org/en/4/developer_guides/files/file_storage/),
+we've also changed where thumbnails are [stored](/developer_guides/files/file_storage#variant-file-paths).
+The file format is now generalised as a "variant", and no longer lives in a `_resampled` folder.
+Prior to this release, these thumbnails were left in place. For thumbnails generated
+through PHP or template code, these are generated on demand in their new location,
+causing duplication and unnecessary storage space.
+
+You can opt-in to moving these legacy thumbnails to their new locations
+with a subtask of `dev/tasks/MigrateFileTask`. If newer thumbnails have been generated,
+it'll keep those. New migrations from 3.x to 4.x will include this migration step by default.
+
+```
+vendor/bin/sake dev/tasks/MigrateFileTask only=move-thumbnails
+```
 
-Further information is provided in the [Hash-less Public Asset URLs FAQ](#hashless-faq) below.
+Note that as part of the [hash-less public asset URLs](#hash-less)
+introduced in this release, requests to these legacy thumbnails will automatically redirect to
+their new locations. Review the [Github issue](https://github.com/silverstripe/silverstripe-assets/issues/235)
+for more details. 
 
 ### Hash-less Public Asset URLs FAQ {#hashless-faq}
 

src/Dev/Tasks/MigrateFileTask.php

@@ -2,12 +2,18 @@
 
 namespace SilverStripe\Dev\Tasks;
 
+use Monolog\Formatter\FormatterInterface;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use SilverStripe\AssetAdmin\Helper\ImageThumbnailHelper;
+use SilverStripe\Assets\LegacyThumbnailMigrationHelper;
+use SilverStripe\Assets\Storage\AssetStore;
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Tests\Injector\InjectorTest;
+use SilverStripe\Logging\HTTPOutputHandler;
 use SilverStripe\Logging\PreformattedEchoHandler;
 use SilverStripe\ORM\DB;
 use SilverStripe\Assets\FileMigrationHelper;
@@ -22,36 +28,127 @@ class MigrateFileTask extends BuildTask
 
     protected $title = 'Migrate File dataobjects from 3.x';
 
-    protected $description =
-        'Imports all files referenced by File dataobjects into the new Asset Persistence Layer introduced in 4.0. ' .
-        'If the task fails or times out, run it again and it will start where it left off.';
+    protected $defaultSubtasks = [
+        'move-files',
+        'move-thumbnails',
+        'generate-cms-thumbnails'
+    ];
+
+    private static $dependencies = [
+        'logger' => '%$' . LoggerInterface::class,
+    ];
+
+    /** @var Logger */
+    private $logger;
 
     public function run($request)
     {
         $this->addLogHandlers();
 
-        if (!class_exists(FileMigrationHelper::class)) {
-            DB::alteration_message("No file migration helper detected", "notice");
-            return;
+        $args = $request->getVars();
+        $this->validateArgs($args);
+
+        $subtasks = !empty($args['only']) ? explode(',', $args['only']) : $this->defaultSubtasks;
+
+        if (in_array('move-files', $subtasks)) {
+            if (!class_exists(FileMigrationHelper::class)) {
+                $this->logger->error("No file migration helper detected");
+                return;
+            }
+
+            $this->logger->info('### Migrating filesystem and database records (move-files)');
+
+            $this->logger->info('If the task fails or times out, run it again and it will start where it left off.');
+
+            $migrated = FileMigrationHelper::singleton()->run();
+            if ($migrated) {
+                $this->logger->info("{$migrated} File DataObjects upgraded");
+            } else {
+                $this->logger->info("No File DataObjects need upgrading");
+            }
         }
 
-        DB::alteration_message(
-            'If the task fails or times out, run it again and it will start where it left off.',
-            "info"
-        );
+        if (in_array('move-thumbnails', $subtasks)) {
+            if (!class_exists(LegacyThumbnailMigrationHelper::class)) {
+                $this->logger->error("LegacyThumbnailMigrationHelper not found");
+                return;
+            }
 
-        $migrated = FileMigrationHelper::singleton()->run();
-        if ($migrated) {
-            DB::alteration_message("{$migrated} File DataObjects upgraded", "changed");
-        } else {
-            DB::alteration_message("No File DataObjects need upgrading", "notice");
+            $this->logger->info('### Migrating existing thumbnails (move-thumbnails)');
+
+            $moved = LegacyThumbnailMigrationHelper::singleton()
+                ->setLogger($this->logger)
+                ->run($this->getStore());
+
+            if ($moved) {
+                $this->logger->info(sprintf("%d thumbnails moved", count($moved)));
+            } else {
+                $this->logger->info("No thumbnails moved");
+            }
+        }
+
+        if (in_array('generate-cms-thumbnails', $subtasks)) {
+            if (!class_exists(ImageThumbnailHelper::class)) {
+                $this->logger->error("ImageThumbnailHelper not found");
+                return;
+            }
+
+            $this->logger->info('### Generating new CMS UI thumbnails (generate-cms-thumbnails)');
+
+            ImageThumbnailHelper::singleton()->run();
         }
+    }
 
-        if (!class_exists(ImageThumbnailHelper::class)) {
-            DB::alteration_message("No image thumbnail helper detected", "notice");
-            return;
+    public function getDescription()
+    {
+        return <<<TXT
+Imports all files referenced by File dataobjects into the new Asset Persistence Layer introduced in 4.0.
+Moves existing thumbnails, and generates new thumbnail sizes for the CMS UI.
+If the task fails or times out, run it again and it will start where it left off.
+See https://docs.silverstripe.org/en/4/developer_guides/files/file_migration/.
+
+Arguments:
+- only: Comma separated list of tasks to run on the multi-step migration (see "Available subtasks").
+        Example: only=move-files,move-thumbnails
+
+Availabile subtasks:
+- move-files: The main task, moves database and filesystem data
+- move-thumbnails: Move existing thumbnails, rather than have them generated on the fly.
+  This task is optional, but helps to avoid growing your asset folder (no duplicate thumbnails)
+- 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.
+TXT;
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+
+        return $this;
+    }
+
+    /**
+     * @return AssetStore
+     */
+    protected function getStore()
+    {
+        return singleton(AssetStore::class);
+    }
+
+    /**
+     * @param array $args
+     * @throws \InvalidArgumentException
+     */
+    protected function validateArgs($args)
+    {
+        if (!empty($args['only'])) {
+            if (array_diff(explode(',', $args['only']), $this->defaultSubtasks)) {
+                throw new \InvalidArgumentException('Invalid subtasks detected: ' . $args['only']);
+            }
         }
-        ImageThumbnailHelper::singleton()->run();
     }
 
     /**