[TASK] Doctrine: Migrate ProcessedFileChecksumUpdate 97/49497/6
authorChristian Kuhn <lolli@schwarzbu.ch>
Tue, 16 Aug 2016 14:00:24 +0000 (16:00 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 21 Aug 2016 11:58:16 +0000 (13:58 +0200)
Change-Id: If52785f2e9cc277f6234056505e916375f897979
Resolves: #77521
Releases: master
Reviewed-on: https://review.typo3.org/49497
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/install/Classes/Updates/ProcessedFileChecksumUpdate.php

index 92b40c6..fce5d48 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Install\Updates;
  */
 
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -41,18 +42,40 @@ class ProcessedFileChecksumUpdate extends AbstractUpdate
             return false;
         }
 
-        $join = 'sys_file_processedfile LEFT JOIN sys_registry ON CAST(entry_key AS CHAR) = CAST(sys_file_processedfile.uid AS CHAR) AND entry_namespace = \'ProcessedFileChecksumUpdate\'';
-        $count = $this->getDatabaseConnection()->exec_SELECTcountRows('*', $join, '(entry_key IS NULL AND sys_file_processedfile.identifier <> \'\') OR sys_file_processedfile.width IS NULL');
-        if (!$count) {
-            return false;
+        $execute = false;
+
+        // Check if there is a registry entry from a former run that may have been stopped
+        $registry = GeneralUtility::makeInstance(Registry::class);
+        $registryEntry = $registry->get('core', 'ProcessedFileChecksumUpdate');
+        if ($registryEntry !== null) {
+            $execute = true;
+        }
+
+        // Enable if there are non empty sys_file_processedfile entries
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
+            ->getQueryBuilderForTable('sys_file_processedfile');
+        $incompleteCount = $queryBuilder->count('uid')
+            ->from('sys_file_processedfile')
+            ->orWhere(
+                $queryBuilder->expr()->notIn('identifier', $queryBuilder->createNamedParameter('')),
+                $queryBuilder->expr()->isNull('width'),
+                $queryBuilder->expr()->isNull('height')
+            )->execute()->fetchColumn(0);
+        if ((bool)$incompleteCount) {
+            $execute = true;
         }
 
-        $description = 'The checksum calculation for processed files (image thumbnails) has been changed with TYPO3 CMS 7.3 and 6.2.13.
-This means that your processed files need to be updated, if you update from versions <strong>below TYPO3 CMS 7.3 or 6.2.13</strong>.<br />
-This can either happen on demand, when the processed file is first needed, or by executing this wizard, which updates all processed images at once.<br />
-<strong>Important:</strong> If you have lots of processed files, you should prefer using this wizard, otherwise this might cause a lot of work for your server.';
+        if ($execute) {
+            $description = 'The checksum calculation for processed files (image thumbnails) has been changed with'
+                . ' TYPO3 CMS 7.3 and 6.2.13. This means that your processed files need to be updated, if you update'
+                . ' from versions <strong>below TYPO3 CMS 7.3 or 6.2.13</strong>.<br />'
+                . 'This can either happen on demand, when the processed file is first needed, or by executing this'
+                . ' wizard, which updates all processed images at once.<br />'
+                . '<strong>Important:</strong> If you have lots of processed files, you should prefer using this'
+                . ' wizard, otherwise this might cause a lot of work for your server.';
+        }
 
-        return true;
+        return $execute;
     }
 
     /**
@@ -64,12 +87,14 @@ This can either happen on demand, when the processed file is first needed, or by
      */
     public function performUpdate(array &$databaseQueries, &$customMessages)
     {
-        $db = $this->getDatabaseConnection();
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $fileConnection = $connectionPool->getConnectionByName('sys_file_processedfile');
-        $registryConnection = $connectionPool->getConnectionForTable('sys_registry');
+        $registry = GeneralUtility::makeInstance(Registry::class);
+        $factory = GeneralUtility::makeInstance(ResourceFactory::class);
+        $fileConnection = GeneralUtility::makeInstance(ConnectionPool::class)
+            ->getConnectionForTable('sys_file_processedfile');
 
-        // remove all invalid records which hold NULL values
+        $firstUid = $registry->get('core', 'ProcessedFileChecksumUpdate');
+
+        // Remove all invalid records which hold NULL values
         $queryBuilder = $fileConnection->createQueryBuilder();
         $queryBuilder->delete('sys_file_processedfile')
             ->orWhere(
@@ -78,31 +103,32 @@ This can either happen on demand, when the processed file is first needed, or by
             )
             ->execute();
 
-        $factory = GeneralUtility::makeInstance(ResourceFactory::class);
-
-        $join = 'sys_file_processedfile LEFT JOIN sys_registry ON entry_key = CAST(sys_file_processedfile.uid AS CHAR) AND entry_namespace = \'ProcessedFileChecksumUpdate\'';
-        $res = $db->exec_SELECTquery('sys_file_processedfile.*', $join, 'entry_key IS NULL AND sys_file_processedfile.identifier <> \'\'');
-        while ($processedFileRow = $db->sql_fetch_assoc($res)) {
+        // Get all other rows
+        $queryBuilder = $fileConnection->createQueryBuilder();
+        $queryBuilder = $queryBuilder->select('*')
+            ->from('sys_file_processedfile')
+            ->orderBy('uid');
+        // If there was a start trigger, use it
+        if ($firstUid !== null && (int)$firstUid > 0) {
+            $queryBuilder->where($queryBuilder->expr()->gt('uid', (int)$firstUid));
+        }
+        $statement = $queryBuilder->execute();
+        while ($processedFileRow = $statement->fetch()) {
             try {
                 $storage = $factory->getStorageObject($processedFileRow['storage']);
             } catch (\InvalidArgumentException $e) {
                 $storage = null;
             }
             if (!$storage) {
-                // invalid storage, delete record, we can't take care of the associated file
+                // Invalid storage, delete record, we can't take care of the associated file
                 $fileConnection->delete('sys_file_processedfile', ['uid' => (int)$processedFileRow['uid']]);
+                $registry->set('core', 'ProcessedFileChecksumUpdate', (int)$processedFileRow['uid']);
                 continue;
             }
 
             if ($storage->getDriverType() !== 'Local') {
-                // non-local storage, we can't treat this, skip the record and mark it done
-                $registryConnection->insert(
-                    'sys_registry',
-                    [
-                        'entry_namespace' => 'ProcessedFileChecksumUpdate',
-                        'entry_key' => $processedFileRow['uid']
-                    ]
-                );
+                // Non-local storage, we can't treat this, skip the record and mark it done
+                $registry->set('core', 'ProcessedFileChecksumUpdate', (int)$processedFileRow['uid']);
                 continue;
             }
 
@@ -117,9 +143,10 @@ This can either happen on demand, when the processed file is first needed, or by
             try {
                 $originalFile = $factory->getFileObject($processedFileRow['original']);
             } catch (\Exception $e) {
-                // no original file there anymore, delete local file
+                // No original file there anymore, delete local file
                 @unlink($filePath);
                 $fileConnection->delete('sys_file_processedfile', ['uid' => (int)$processedFileRow['uid']]);
+                $registry->set('core', 'ProcessedFileChecksumUpdate', (int)$processedFileRow['uid']);
                 continue;
             }
 
@@ -131,7 +158,11 @@ This can either happen on demand, when the processed file is first needed, or by
             // if the checksum already matches, there is nothing to do
             if ($newChecksum !== $processedFileRow['checksum']) {
                 $newName = str_replace($processedFileRow['checksum'], $newChecksum, $processedFileRow['name']);
-                $newIdentifier = str_replace($processedFileRow['checksum'], $newChecksum, $processedFileRow['identifier']);
+                $newIdentifier = str_replace(
+                    $processedFileRow['checksum'],
+                    $newChecksum,
+                    $processedFileRow['identifier']
+                );
                 $newFilePath = str_replace($processedFileRow['checksum'], $newChecksum, $filePath);
 
                 // rename file
@@ -143,21 +174,18 @@ This can either happen on demand, when the processed file is first needed, or by
                         'name' => $newName,
                         'checksum' => $newChecksum
                     );
-                    $db->exec_UPDATEquery('sys_file_processedfile', 'uid=' . $processedFileRow['uid'], $fields);
+                    $fileConnection->update(
+                        'sys_file_processedfile',
+                        $fields,
+                        ['uid' => (int)$processedFileRow['uid']]
+                    );
                 }
                 // if the rename of the file failed, keep the record, but do not bother with it again
             }
-
-            $registryConnection->insert(
-                'sys_registry',
-                [
-                    'entry_namespace' => 'ProcessedFileChecksumUpdate',
-                    'entry_key' => $processedFileRow['uid']
-                ]
-            );
+            $registry->set('core', 'ProcessedFileChecksumUpdate', (int)$processedFileRow['uid']);
         }
 
-        $registryConnection->delete('sys_registry', ['entry_namespace' => 'ProcessedFileChecksumUpdate']);
+        $registry->remove('core', 'ProcessedFileChecksumUpdate');
         $this->markWizardAsDone();
         return true;
     }