Split LocalFile.php to have one class in one file
authorUmherirrender <umherirrender_de.wp@web.de>
Sat, 6 Apr 2019 10:02:26 +0000 (12:02 +0200)
committerUmherirrender <umherirrender_de.wp@web.de>
Sun, 14 Apr 2019 09:45:39 +0000 (11:45 +0200)
Change-Id: Ic8e5220f2a1832dfc39f00720001235429ed2cab

.phpcs.xml
autoload.php
includes/filerepo/file/LocalFile.php
includes/filerepo/file/LocalFileDeleteBatch.php [new file with mode: 0644]
includes/filerepo/file/LocalFileLockError.php [new file with mode: 0644]
includes/filerepo/file/LocalFileMoveBatch.php [new file with mode: 0644]
includes/filerepo/file/LocalFileRestoreBatch.php [new file with mode: 0644]

index 31ee706..7037ea7 100644 (file)
                <exclude-pattern>*/includes/api/ApiErrorFormatter\.php</exclude-pattern>
                <exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
                <exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
-               <exclude-pattern>*/includes/filerepo/file/LocalFile\.php</exclude-pattern>
                <exclude-pattern>*/includes/htmlform/HTMLFormElement\.php</exclude-pattern>
                <exclude-pattern>*/includes/libs/filebackend/FileBackendStore\.php</exclude-pattern>
                <exclude-pattern>*/includes/libs/filebackend/FSFileBackend\.php</exclude-pattern>
index 5ed3981..be4a1de 100644 (file)
@@ -790,10 +790,10 @@ $wgAutoloadLocalClasses = [
        'LoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/LoadBalancer.php',
        'LoadBalancerSingle' => __DIR__ . '/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php',
        'LocalFile' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
-       'LocalFileDeleteBatch' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
-       'LocalFileLockError' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
-       'LocalFileMoveBatch' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
-       'LocalFileRestoreBatch' => __DIR__ . '/includes/filerepo/file/LocalFile.php',
+       'LocalFileDeleteBatch' => __DIR__ . '/includes/filerepo/file/LocalFileDeleteBatch.php',
+       'LocalFileLockError' => __DIR__ . '/includes/filerepo/file/LocalFileLockError.php',
+       'LocalFileMoveBatch' => __DIR__ . '/includes/filerepo/file/LocalFileMoveBatch.php',
+       'LocalFileRestoreBatch' => __DIR__ . '/includes/filerepo/file/LocalFileRestoreBatch.php',
        'LocalIdLookup' => __DIR__ . '/includes/user/LocalIdLookup.php',
        'LocalRepo' => __DIR__ . '/includes/filerepo/LocalRepo.php',
        'LocalSettingsGenerator' => __DIR__ . '/includes/installer/LocalSettingsGenerator.php',
index aa04fae..86b8bbb 100644 (file)
@@ -2295,1148 +2295,4 @@ class LocalFile extends File {
        function __destruct() {
                $this->unlock();
        }
-} // LocalFile class
-
-# ------------------------------------------------------------------------------
-
-/**
- * Helper class for file deletion
- * @ingroup FileAbstraction
- */
-class LocalFileDeleteBatch {
-       /** @var LocalFile */
-       private $file;
-
-       /** @var string */
-       private $reason;
-
-       /** @var array */
-       private $srcRels = [];
-
-       /** @var array */
-       private $archiveUrls = [];
-
-       /** @var array Items to be processed in the deletion batch */
-       private $deletionBatch;
-
-       /** @var bool Whether to suppress all suppressable fields when deleting */
-       private $suppress;
-
-       /** @var Status */
-       private $status;
-
-       /** @var User */
-       private $user;
-
-       /**
-        * @param File $file
-        * @param string $reason
-        * @param bool $suppress
-        * @param User|null $user
-        */
-       function __construct( File $file, $reason = '', $suppress = false, $user = null ) {
-               $this->file = $file;
-               $this->reason = $reason;
-               $this->suppress = $suppress;
-               if ( $user ) {
-                       $this->user = $user;
-               } else {
-                       global $wgUser;
-                       $this->user = $wgUser;
-               }
-               $this->status = $file->repo->newGood();
-       }
-
-       public function addCurrent() {
-               $this->srcRels['.'] = $this->file->getRel();
-       }
-
-       /**
-        * @param string $oldName
-        */
-       public function addOld( $oldName ) {
-               $this->srcRels[$oldName] = $this->file->getArchiveRel( $oldName );
-               $this->archiveUrls[] = $this->file->getArchiveUrl( $oldName );
-       }
-
-       /**
-        * Add the old versions of the image to the batch
-        * @return string[] List of archive names from old versions
-        */
-       public function addOlds() {
-               $archiveNames = [];
-
-               $dbw = $this->file->repo->getMasterDB();
-               $result = $dbw->select( 'oldimage',
-                       [ 'oi_archive_name' ],
-                       [ 'oi_name' => $this->file->getName() ],
-                       __METHOD__
-               );
-
-               foreach ( $result as $row ) {
-                       $this->addOld( $row->oi_archive_name );
-                       $archiveNames[] = $row->oi_archive_name;
-               }
-
-               return $archiveNames;
-       }
-
-       /**
-        * @return array
-        */
-       protected function getOldRels() {
-               if ( !isset( $this->srcRels['.'] ) ) {
-                       $oldRels =& $this->srcRels;
-                       $deleteCurrent = false;
-               } else {
-                       $oldRels = $this->srcRels;
-                       unset( $oldRels['.'] );
-                       $deleteCurrent = true;
-               }
-
-               return [ $oldRels, $deleteCurrent ];
-       }
-
-       /**
-        * @return array
-        */
-       protected function getHashes() {
-               $hashes = [];
-               list( $oldRels, $deleteCurrent ) = $this->getOldRels();
-
-               if ( $deleteCurrent ) {
-                       $hashes['.'] = $this->file->getSha1();
-               }
-
-               if ( count( $oldRels ) ) {
-                       $dbw = $this->file->repo->getMasterDB();
-                       $res = $dbw->select(
-                               'oldimage',
-                               [ 'oi_archive_name', 'oi_sha1' ],
-                               [ 'oi_archive_name' => array_keys( $oldRels ),
-                                       'oi_name' => $this->file->getName() ], // performance
-                               __METHOD__
-                       );
-
-                       foreach ( $res as $row ) {
-                               if ( rtrim( $row->oi_sha1, "\0" ) === '' ) {
-                                       // Get the hash from the file
-                                       $oldUrl = $this->file->getArchiveVirtualUrl( $row->oi_archive_name );
-                                       $props = $this->file->repo->getFileProps( $oldUrl );
-
-                                       if ( $props['fileExists'] ) {
-                                               // Upgrade the oldimage row
-                                               $dbw->update( 'oldimage',
-                                                       [ 'oi_sha1' => $props['sha1'] ],
-                                                       [ 'oi_name' => $this->file->getName(), 'oi_archive_name' => $row->oi_archive_name ],
-                                                       __METHOD__ );
-                                               $hashes[$row->oi_archive_name] = $props['sha1'];
-                                       } else {
-                                               $hashes[$row->oi_archive_name] = false;
-                                       }
-                               } else {
-                                       $hashes[$row->oi_archive_name] = $row->oi_sha1;
-                               }
-                       }
-               }
-
-               $missing = array_diff_key( $this->srcRels, $hashes );
-
-               foreach ( $missing as $name => $rel ) {
-                       $this->status->error( 'filedelete-old-unregistered', $name );
-               }
-
-               foreach ( $hashes as $name => $hash ) {
-                       if ( !$hash ) {
-                               $this->status->error( 'filedelete-missing', $this->srcRels[$name] );
-                               unset( $hashes[$name] );
-                       }
-               }
-
-               return $hashes;
-       }
-
-       protected function doDBInserts() {
-               global $wgActorTableSchemaMigrationStage;
-
-               $now = time();
-               $dbw = $this->file->repo->getMasterDB();
-
-               $commentStore = MediaWikiServices::getInstance()->getCommentStore();
-               $actorMigration = ActorMigration::newMigration();
-
-               $encTimestamp = $dbw->addQuotes( $dbw->timestamp( $now ) );
-               $encUserId = $dbw->addQuotes( $this->user->getId() );
-               $encGroup = $dbw->addQuotes( 'deleted' );
-               $ext = $this->file->getExtension();
-               $dotExt = $ext === '' ? '' : ".$ext";
-               $encExt = $dbw->addQuotes( $dotExt );
-               list( $oldRels, $deleteCurrent ) = $this->getOldRels();
-
-               // Bitfields to further suppress the content
-               if ( $this->suppress ) {
-                       $bitfield = Revision::SUPPRESSED_ALL;
-               } else {
-                       $bitfield = 'oi_deleted';
-               }
-
-               if ( $deleteCurrent ) {
-                       $tables = [ 'image' ];
-                       $fields = [
-                               'fa_storage_group' => $encGroup,
-                               'fa_storage_key' => $dbw->conditional(
-                                       [ 'img_sha1' => '' ],
-                                       $dbw->addQuotes( '' ),
-                                       $dbw->buildConcat( [ "img_sha1", $encExt ] )
-                               ),
-                               'fa_deleted_user' => $encUserId,
-                               'fa_deleted_timestamp' => $encTimestamp,
-                               'fa_deleted' => $this->suppress ? $bitfield : 0,
-                               'fa_name' => 'img_name',
-                               'fa_archive_name' => 'NULL',
-                               'fa_size' => 'img_size',
-                               'fa_width' => 'img_width',
-                               'fa_height' => 'img_height',
-                               'fa_metadata' => 'img_metadata',
-                               'fa_bits' => 'img_bits',
-                               'fa_media_type' => 'img_media_type',
-                               'fa_major_mime' => 'img_major_mime',
-                               'fa_minor_mime' => 'img_minor_mime',
-                               'fa_description_id' => 'img_description_id',
-                               'fa_timestamp' => 'img_timestamp',
-                               'fa_sha1' => 'img_sha1'
-                       ];
-                       $joins = [];
-
-                       $fields += array_map(
-                               [ $dbw, 'addQuotes' ],
-                               $commentStore->insert( $dbw, 'fa_deleted_reason', $this->reason )
-                       );
-
-                       if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
-                               $fields['fa_user'] = 'img_user';
-                               $fields['fa_user_text'] = 'img_user_text';
-                       }
-                       if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
-                               $fields['fa_actor'] = 'img_actor';
-                       }
-
-                       if (
-                               ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_BOTH ) === SCHEMA_COMPAT_WRITE_BOTH
-                       ) {
-                               // Upgrade any rows that are still old-style. Otherwise an upgrade
-                               // might be missed if a deletion happens while the migration script
-                               // is running.
-                               $res = $dbw->select(
-                                       [ 'image' ],
-                                       [ 'img_name', 'img_user', 'img_user_text' ],
-                                       [ 'img_name' => $this->file->getName(), 'img_actor' => 0 ],
-                                       __METHOD__
-                               );
-                               foreach ( $res as $row ) {
-                                       $actorId = User::newFromAnyId( $row->img_user, $row->img_user_text, null )->getActorId( $dbw );
-                                       $dbw->update(
-                                               'image',
-                                               [ 'img_actor' => $actorId ],
-                                               [ 'img_name' => $row->img_name, 'img_actor' => 0 ],
-                                               __METHOD__
-                                       );
-                               }
-                       }
-
-                       $dbw->insertSelect( 'filearchive', $tables, $fields,
-                               [ 'img_name' => $this->file->getName() ], __METHOD__, [], [], $joins );
-               }
-
-               if ( count( $oldRels ) ) {
-                       $fileQuery = OldLocalFile::getQueryInfo();
-                       $res = $dbw->select(
-                               $fileQuery['tables'],
-                               $fileQuery['fields'],
-                               [
-                                       'oi_name' => $this->file->getName(),
-                                       'oi_archive_name' => array_keys( $oldRels )
-                               ],
-                               __METHOD__,
-                               [ 'FOR UPDATE' ],
-                               $fileQuery['joins']
-                       );
-                       $rowsInsert = [];
-                       if ( $res->numRows() ) {
-                               $reason = $commentStore->createComment( $dbw, $this->reason );
-                               foreach ( $res as $row ) {
-                                       $comment = $commentStore->getComment( 'oi_description', $row );
-                                       $user = User::newFromAnyId( $row->oi_user, $row->oi_user_text, $row->oi_actor );
-                                       $rowsInsert[] = [
-                                               // Deletion-specific fields
-                                               'fa_storage_group' => 'deleted',
-                                               'fa_storage_key' => ( $row->oi_sha1 === '' )
-                                               ? ''
-                                               : "{$row->oi_sha1}{$dotExt}",
-                                               'fa_deleted_user' => $this->user->getId(),
-                                               'fa_deleted_timestamp' => $dbw->timestamp( $now ),
-                                               // Counterpart fields
-                                               'fa_deleted' => $this->suppress ? $bitfield : $row->oi_deleted,
-                                               'fa_name' => $row->oi_name,
-                                               'fa_archive_name' => $row->oi_archive_name,
-                                               'fa_size' => $row->oi_size,
-                                               'fa_width' => $row->oi_width,
-                                               'fa_height' => $row->oi_height,
-                                               'fa_metadata' => $row->oi_metadata,
-                                               'fa_bits' => $row->oi_bits,
-                                               'fa_media_type' => $row->oi_media_type,
-                                               'fa_major_mime' => $row->oi_major_mime,
-                                               'fa_minor_mime' => $row->oi_minor_mime,
-                                               'fa_timestamp' => $row->oi_timestamp,
-                                               'fa_sha1' => $row->oi_sha1
-                                       ] + $commentStore->insert( $dbw, 'fa_deleted_reason', $reason )
-                                       + $commentStore->insert( $dbw, 'fa_description', $comment )
-                                       + $actorMigration->getInsertValues( $dbw, 'fa_user', $user );
-                               }
-                       }
-
-                       $dbw->insert( 'filearchive', $rowsInsert, __METHOD__ );
-               }
-       }
-
-       function doDBDeletes() {
-               $dbw = $this->file->repo->getMasterDB();
-               list( $oldRels, $deleteCurrent ) = $this->getOldRels();
-
-               if ( count( $oldRels ) ) {
-                       $dbw->delete( 'oldimage',
-                               [
-                                       'oi_name' => $this->file->getName(),
-                                       'oi_archive_name' => array_keys( $oldRels )
-                               ], __METHOD__ );
-               }
-
-               if ( $deleteCurrent ) {
-                       $dbw->delete( 'image', [ 'img_name' => $this->file->getName() ], __METHOD__ );
-               }
-       }
-
-       /**
-        * Run the transaction
-        * @return Status
-        */
-       public function execute() {
-               $repo = $this->file->getRepo();
-               $this->file->lock();
-
-               // Prepare deletion batch
-               $hashes = $this->getHashes();
-               $this->deletionBatch = [];
-               $ext = $this->file->getExtension();
-               $dotExt = $ext === '' ? '' : ".$ext";
-
-               foreach ( $this->srcRels as $name => $srcRel ) {
-                       // Skip files that have no hash (e.g. missing DB record, or sha1 field and file source)
-                       if ( isset( $hashes[$name] ) ) {
-                               $hash = $hashes[$name];
-                               $key = $hash . $dotExt;
-                               $dstRel = $repo->getDeletedHashPath( $key ) . $key;
-                               $this->deletionBatch[$name] = [ $srcRel, $dstRel ];
-                       }
-               }
-
-               if ( !$repo->hasSha1Storage() ) {
-                       // Removes non-existent file from the batch, so we don't get errors.
-                       // This also handles files in the 'deleted' zone deleted via revision deletion.
-                       $checkStatus = $this->removeNonexistentFiles( $this->deletionBatch );
-                       if ( !$checkStatus->isGood() ) {
-                               $this->status->merge( $checkStatus );
-                               return $this->status;
-                       }
-                       $this->deletionBatch = $checkStatus->value;
-
-                       // Execute the file deletion batch
-                       $status = $this->file->repo->deleteBatch( $this->deletionBatch );
-                       if ( !$status->isGood() ) {
-                               $this->status->merge( $status );
-                       }
-               }
-
-               if ( !$this->status->isOK() ) {
-                       // Critical file deletion error; abort
-                       $this->file->unlock();
-
-                       return $this->status;
-               }
-
-               // Copy the image/oldimage rows to filearchive
-               $this->doDBInserts();
-               // Delete image/oldimage rows
-               $this->doDBDeletes();
-
-               // Commit and return
-               $this->file->unlock();
-
-               return $this->status;
-       }
-
-       /**
-        * Removes non-existent files from a deletion batch.
-        * @param array $batch
-        * @return Status
-        */
-       protected function removeNonexistentFiles( $batch ) {
-               $files = $newBatch = [];
-
-               foreach ( $batch as $batchItem ) {
-                       list( $src, ) = $batchItem;
-                       $files[$src] = $this->file->repo->getVirtualUrl( 'public' ) . '/' . rawurlencode( $src );
-               }
-
-               $result = $this->file->repo->fileExistsBatch( $files );
-               if ( in_array( null, $result, true ) ) {
-                       return Status::newFatal( 'backend-fail-internal',
-                               $this->file->repo->getBackend()->getName() );
-               }
-
-               foreach ( $batch as $batchItem ) {
-                       if ( $result[$batchItem[0]] ) {
-                               $newBatch[] = $batchItem;
-                       }
-               }
-
-               return Status::newGood( $newBatch );
-       }
-}
-
-# ------------------------------------------------------------------------------
-
-/**
- * Helper class for file undeletion
- * @ingroup FileAbstraction
- */
-class LocalFileRestoreBatch {
-       /** @var LocalFile */
-       private $file;
-
-       /** @var string[] List of file IDs to restore */
-       private $cleanupBatch;
-
-       /** @var string[] List of file IDs to restore */
-       private $ids;
-
-       /** @var bool Add all revisions of the file */
-       private $all;
-
-       /** @var bool Whether to remove all settings for suppressed fields */
-       private $unsuppress = false;
-
-       /**
-        * @param File $file
-        * @param bool $unsuppress
-        */
-       function __construct( File $file, $unsuppress = false ) {
-               $this->file = $file;
-               $this->cleanupBatch = [];
-               $this->ids = [];
-               $this->unsuppress = $unsuppress;
-       }
-
-       /**
-        * Add a file by ID
-        * @param int $fa_id
-        */
-       public function addId( $fa_id ) {
-               $this->ids[] = $fa_id;
-       }
-
-       /**
-        * Add a whole lot of files by ID
-        * @param int[] $ids
-        */
-       public function addIds( $ids ) {
-               $this->ids = array_merge( $this->ids, $ids );
-       }
-
-       /**
-        * Add all revisions of the file
-        */
-       public function addAll() {
-               $this->all = true;
-       }
-
-       /**
-        * Run the transaction, except the cleanup batch.
-        * The cleanup batch should be run in a separate transaction, because it locks different
-        * rows and there's no need to keep the image row locked while it's acquiring those locks
-        * The caller may have its own transaction open.
-        * So we save the batch and let the caller call cleanup()
-        * @return Status
-        */
-       public function execute() {
-               /** @var Language */
-               global $wgLang;
-
-               $repo = $this->file->getRepo();
-               if ( !$this->all && !$this->ids ) {
-                       // Do nothing
-                       return $repo->newGood();
-               }
-
-               $lockOwnsTrx = $this->file->lock();
-
-               $dbw = $this->file->repo->getMasterDB();
-
-               $commentStore = MediaWikiServices::getInstance()->getCommentStore();
-               $actorMigration = ActorMigration::newMigration();
-
-               $status = $this->file->repo->newGood();
-
-               $exists = (bool)$dbw->selectField( 'image', '1',
-                       [ 'img_name' => $this->file->getName() ],
-                       __METHOD__,
-                       // The lock() should already prevents changes, but this still may need
-                       // to bypass any transaction snapshot. However, if lock() started the
-                       // trx (which it probably did) then snapshot is post-lock and up-to-date.
-                       $lockOwnsTrx ? [] : [ 'LOCK IN SHARE MODE' ]
-               );
-
-               // Fetch all or selected archived revisions for the file,
-               // sorted from the most recent to the oldest.
-               $conditions = [ 'fa_name' => $this->file->getName() ];
-
-               if ( !$this->all ) {
-                       $conditions['fa_id'] = $this->ids;
-               }
-
-               $arFileQuery = ArchivedFile::getQueryInfo();
-               $result = $dbw->select(
-                       $arFileQuery['tables'],
-                       $arFileQuery['fields'],
-                       $conditions,
-                       __METHOD__,
-                       [ 'ORDER BY' => 'fa_timestamp DESC' ],
-                       $arFileQuery['joins']
-               );
-
-               $idsPresent = [];
-               $storeBatch = [];
-               $insertBatch = [];
-               $insertCurrent = false;
-               $deleteIds = [];
-               $first = true;
-               $archiveNames = [];
-
-               foreach ( $result as $row ) {
-                       $idsPresent[] = $row->fa_id;
-
-                       if ( $row->fa_name != $this->file->getName() ) {
-                               $status->error( 'undelete-filename-mismatch', $wgLang->timeanddate( $row->fa_timestamp ) );
-                               $status->failCount++;
-                               continue;
-                       }
-
-                       if ( $row->fa_storage_key == '' ) {
-                               // Revision was missing pre-deletion
-                               $status->error( 'undelete-bad-store-key', $wgLang->timeanddate( $row->fa_timestamp ) );
-                               $status->failCount++;
-                               continue;
-                       }
-
-                       $deletedRel = $repo->getDeletedHashPath( $row->fa_storage_key ) .
-                               $row->fa_storage_key;
-                       $deletedUrl = $repo->getVirtualUrl() . '/deleted/' . $deletedRel;
-
-                       if ( isset( $row->fa_sha1 ) ) {
-                               $sha1 = $row->fa_sha1;
-                       } else {
-                               // old row, populate from key
-                               $sha1 = LocalRepo::getHashFromKey( $row->fa_storage_key );
-                       }
-
-                       # Fix leading zero
-                       if ( strlen( $sha1 ) == 32 && $sha1[0] == '0' ) {
-                               $sha1 = substr( $sha1, 1 );
-                       }
-
-                       if ( is_null( $row->fa_major_mime ) || $row->fa_major_mime == 'unknown'
-                               || is_null( $row->fa_minor_mime ) || $row->fa_minor_mime == 'unknown'
-                               || is_null( $row->fa_media_type ) || $row->fa_media_type == 'UNKNOWN'
-                               || is_null( $row->fa_metadata )
-                       ) {
-                               // Refresh our metadata
-                               // Required for a new current revision; nice for older ones too. :)
-                               $props = RepoGroup::singleton()->getFileProps( $deletedUrl );
-                       } else {
-                               $props = [
-                                       'minor_mime' => $row->fa_minor_mime,
-                                       'major_mime' => $row->fa_major_mime,
-                                       'media_type' => $row->fa_media_type,
-                                       'metadata' => $row->fa_metadata
-                               ];
-                       }
-
-                       $comment = $commentStore->getComment( 'fa_description', $row );
-                       $user = User::newFromAnyId( $row->fa_user, $row->fa_user_text, $row->fa_actor );
-                       if ( $first && !$exists ) {
-                               // This revision will be published as the new current version
-                               $destRel = $this->file->getRel();
-                               $commentFields = $commentStore->insert( $dbw, 'img_description', $comment );
-                               $actorFields = $actorMigration->getInsertValues( $dbw, 'img_user', $user );
-                               $insertCurrent = [
-                                       'img_name' => $row->fa_name,
-                                       'img_size' => $row->fa_size,
-                                       'img_width' => $row->fa_width,
-                                       'img_height' => $row->fa_height,
-                                       'img_metadata' => $props['metadata'],
-                                       'img_bits' => $row->fa_bits,
-                                       'img_media_type' => $props['media_type'],
-                                       'img_major_mime' => $props['major_mime'],
-                                       'img_minor_mime' => $props['minor_mime'],
-                                       'img_timestamp' => $row->fa_timestamp,
-                                       'img_sha1' => $sha1
-                               ] + $commentFields + $actorFields;
-
-                               // The live (current) version cannot be hidden!
-                               if ( !$this->unsuppress && $row->fa_deleted ) {
-                                       $status->fatal( 'undeleterevdel' );
-                                       $this->file->unlock();
-                                       return $status;
-                               }
-                       } else {
-                               $archiveName = $row->fa_archive_name;
-
-                               if ( $archiveName == '' ) {
-                                       // This was originally a current version; we
-                                       // have to devise a new archive name for it.
-                                       // Format is <timestamp of archiving>!<name>
-                                       $timestamp = wfTimestamp( TS_UNIX, $row->fa_deleted_timestamp );
-
-                                       do {
-                                               $archiveName = wfTimestamp( TS_MW, $timestamp ) . '!' . $row->fa_name;
-                                               $timestamp++;
-                                       } while ( isset( $archiveNames[$archiveName] ) );
-                               }
-
-                               $archiveNames[$archiveName] = true;
-                               $destRel = $this->file->getArchiveRel( $archiveName );
-                               $insertBatch[] = [
-                                       'oi_name' => $row->fa_name,
-                                       'oi_archive_name' => $archiveName,
-                                       'oi_size' => $row->fa_size,
-                                       'oi_width' => $row->fa_width,
-                                       'oi_height' => $row->fa_height,
-                                       'oi_bits' => $row->fa_bits,
-                                       'oi_timestamp' => $row->fa_timestamp,
-                                       'oi_metadata' => $props['metadata'],
-                                       'oi_media_type' => $props['media_type'],
-                                       'oi_major_mime' => $props['major_mime'],
-                                       'oi_minor_mime' => $props['minor_mime'],
-                                       'oi_deleted' => $this->unsuppress ? 0 : $row->fa_deleted,
-                                       'oi_sha1' => $sha1
-                               ] + $commentStore->insert( $dbw, 'oi_description', $comment )
-                               + $actorMigration->getInsertValues( $dbw, 'oi_user', $user );
-                       }
-
-                       $deleteIds[] = $row->fa_id;
-
-                       if ( !$this->unsuppress && $row->fa_deleted & File::DELETED_FILE ) {
-                               // private files can stay where they are
-                               $status->successCount++;
-                       } else {
-                               $storeBatch[] = [ $deletedUrl, 'public', $destRel ];
-                               $this->cleanupBatch[] = $row->fa_storage_key;
-                       }
-
-                       $first = false;
-               }
-
-               unset( $result );
-
-               // Add a warning to the status object for missing IDs
-               $missingIds = array_diff( $this->ids, $idsPresent );
-
-               foreach ( $missingIds as $id ) {
-                       $status->error( 'undelete-missing-filearchive', $id );
-               }
-
-               if ( !$repo->hasSha1Storage() ) {
-                       // Remove missing files from batch, so we don't get errors when undeleting them
-                       $checkStatus = $this->removeNonexistentFiles( $storeBatch );
-                       if ( !$checkStatus->isGood() ) {
-                               $status->merge( $checkStatus );
-                               return $status;
-                       }
-                       $storeBatch = $checkStatus->value;
-
-                       // Run the store batch
-                       // Use the OVERWRITE_SAME flag to smooth over a common error
-                       $storeStatus = $this->file->repo->storeBatch( $storeBatch, FileRepo::OVERWRITE_SAME );
-                       $status->merge( $storeStatus );
-
-                       if ( !$status->isGood() ) {
-                               // Even if some files could be copied, fail entirely as that is the
-                               // easiest thing to do without data loss
-                               $this->cleanupFailedBatch( $storeStatus, $storeBatch );
-                               $status->setOK( false );
-                               $this->file->unlock();
-
-                               return $status;
-                       }
-               }
-
-               // Run the DB updates
-               // Because we have locked the image row, key conflicts should be rare.
-               // If they do occur, we can roll back the transaction at this time with
-               // no data loss, but leaving unregistered files scattered throughout the
-               // public zone.
-               // This is not ideal, which is why it's important to lock the image row.
-               if ( $insertCurrent ) {
-                       $dbw->insert( 'image', $insertCurrent, __METHOD__ );
-               }
-
-               if ( $insertBatch ) {
-                       $dbw->insert( 'oldimage', $insertBatch, __METHOD__ );
-               }
-
-               if ( $deleteIds ) {
-                       $dbw->delete( 'filearchive',
-                               [ 'fa_id' => $deleteIds ],
-                               __METHOD__ );
-               }
-
-               // If store batch is empty (all files are missing), deletion is to be considered successful
-               if ( $status->successCount > 0 || !$storeBatch || $repo->hasSha1Storage() ) {
-                       if ( !$exists ) {
-                               wfDebug( __METHOD__ . " restored {$status->successCount} items, creating a new current\n" );
-
-                               DeferredUpdates::addUpdate( SiteStatsUpdate::factory( [ 'images' => 1 ] ) );
-
-                               $this->file->purgeEverything();
-                       } else {
-                               wfDebug( __METHOD__ . " restored {$status->successCount} as archived versions\n" );
-                               $this->file->purgeDescription();
-                       }
-               }
-
-               $this->file->unlock();
-
-               return $status;
-       }
-
-       /**
-        * Removes non-existent files from a store batch.
-        * @param array $triplets
-        * @return Status
-        */
-       protected function removeNonexistentFiles( $triplets ) {
-               $files = $filteredTriplets = [];
-               foreach ( $triplets as $file ) {
-                       $files[$file[0]] = $file[0];
-               }
-
-               $result = $this->file->repo->fileExistsBatch( $files );
-               if ( in_array( null, $result, true ) ) {
-                       return Status::newFatal( 'backend-fail-internal',
-                               $this->file->repo->getBackend()->getName() );
-               }
-
-               foreach ( $triplets as $file ) {
-                       if ( $result[$file[0]] ) {
-                               $filteredTriplets[] = $file;
-                       }
-               }
-
-               return Status::newGood( $filteredTriplets );
-       }
-
-       /**
-        * Removes non-existent files from a cleanup batch.
-        * @param string[] $batch
-        * @return string[]
-        */
-       protected function removeNonexistentFromCleanup( $batch ) {
-               $files = $newBatch = [];
-               $repo = $this->file->repo;
-
-               foreach ( $batch as $file ) {
-                       $files[$file] = $repo->getVirtualUrl( 'deleted' ) . '/' .
-                               rawurlencode( $repo->getDeletedHashPath( $file ) . $file );
-               }
-
-               $result = $repo->fileExistsBatch( $files );
-
-               foreach ( $batch as $file ) {
-                       if ( $result[$file] ) {
-                               $newBatch[] = $file;
-                       }
-               }
-
-               return $newBatch;
-       }
-
-       /**
-        * Delete unused files in the deleted zone.
-        * This should be called from outside the transaction in which execute() was called.
-        * @return Status
-        */
-       public function cleanup() {
-               if ( !$this->cleanupBatch ) {
-                       return $this->file->repo->newGood();
-               }
-
-               $this->cleanupBatch = $this->removeNonexistentFromCleanup( $this->cleanupBatch );
-
-               $status = $this->file->repo->cleanupDeletedBatch( $this->cleanupBatch );
-
-               return $status;
-       }
-
-       /**
-        * Cleanup a failed batch. The batch was only partially successful, so
-        * rollback by removing all items that were successfully copied.
-        *
-        * @param Status $storeStatus
-        * @param array[] $storeBatch
-        */
-       protected function cleanupFailedBatch( $storeStatus, $storeBatch ) {
-               $cleanupBatch = [];
-
-               foreach ( $storeStatus->success as $i => $success ) {
-                       // Check if this item of the batch was successfully copied
-                       if ( $success ) {
-                               // Item was successfully copied and needs to be removed again
-                               // Extract ($dstZone, $dstRel) from the batch
-                               $cleanupBatch[] = [ $storeBatch[$i][1], $storeBatch[$i][2] ];
-                       }
-               }
-               $this->file->repo->cleanupBatch( $cleanupBatch );
-       }
-}
-
-# ------------------------------------------------------------------------------
-
-/**
- * Helper class for file movement
- * @ingroup FileAbstraction
- */
-class LocalFileMoveBatch {
-       /** @var LocalFile */
-       protected $file;
-
-       /** @var Title */
-       protected $target;
-
-       protected $cur;
-
-       protected $olds;
-
-       protected $oldCount;
-
-       protected $archive;
-
-       /** @var IDatabase */
-       protected $db;
-
-       /**
-        * @param File $file
-        * @param Title $target
-        */
-       function __construct( File $file, Title $target ) {
-               $this->file = $file;
-               $this->target = $target;
-               $this->oldHash = $this->file->repo->getHashPath( $this->file->getName() );
-               $this->newHash = $this->file->repo->getHashPath( $this->target->getDBkey() );
-               $this->oldName = $this->file->getName();
-               $this->newName = $this->file->repo->getNameFromTitle( $this->target );
-               $this->oldRel = $this->oldHash . $this->oldName;
-               $this->newRel = $this->newHash . $this->newName;
-               $this->db = $file->getRepo()->getMasterDB();
-       }
-
-       /**
-        * Add the current image to the batch
-        */
-       public function addCurrent() {
-               $this->cur = [ $this->oldRel, $this->newRel ];
-       }
-
-       /**
-        * Add the old versions of the image to the batch
-        * @return string[] List of archive names from old versions
-        */
-       public function addOlds() {
-               $archiveBase = 'archive';
-               $this->olds = [];
-               $this->oldCount = 0;
-               $archiveNames = [];
-
-               $result = $this->db->select( 'oldimage',
-                       [ 'oi_archive_name', 'oi_deleted' ],
-                       [ 'oi_name' => $this->oldName ],
-                       __METHOD__,
-                       [ 'LOCK IN SHARE MODE' ] // ignore snapshot
-               );
-
-               foreach ( $result as $row ) {
-                       $archiveNames[] = $row->oi_archive_name;
-                       $oldName = $row->oi_archive_name;
-                       $bits = explode( '!', $oldName, 2 );
-
-                       if ( count( $bits ) != 2 ) {
-                               wfDebug( "Old file name missing !: '$oldName' \n" );
-                               continue;
-                       }
-
-                       list( $timestamp, $filename ) = $bits;
-
-                       if ( $this->oldName != $filename ) {
-                               wfDebug( "Old file name doesn't match: '$oldName' \n" );
-                               continue;
-                       }
-
-                       $this->oldCount++;
-
-                       // Do we want to add those to oldCount?
-                       if ( $row->oi_deleted & File::DELETED_FILE ) {
-                               continue;
-                       }
-
-                       $this->olds[] = [
-                               "{$archiveBase}/{$this->oldHash}{$oldName}",
-                               "{$archiveBase}/{$this->newHash}{$timestamp}!{$this->newName}"
-                       ];
-               }
-
-               return $archiveNames;
-       }
-
-       /**
-        * Perform the move.
-        * @return Status
-        */
-       public function execute() {
-               $repo = $this->file->repo;
-               $status = $repo->newGood();
-               $destFile = wfLocalFile( $this->target );
-
-               $this->file->lock();
-               $destFile->lock(); // quickly fail if destination is not available
-
-               $triplets = $this->getMoveTriplets();
-               $checkStatus = $this->removeNonexistentFiles( $triplets );
-               if ( !$checkStatus->isGood() ) {
-                       $destFile->unlock();
-                       $this->file->unlock();
-                       $status->merge( $checkStatus ); // couldn't talk to file backend
-                       return $status;
-               }
-               $triplets = $checkStatus->value;
-
-               // Verify the file versions metadata in the DB.
-               $statusDb = $this->verifyDBUpdates();
-               if ( !$statusDb->isGood() ) {
-                       $destFile->unlock();
-                       $this->file->unlock();
-                       $statusDb->setOK( false );
-
-                       return $statusDb;
-               }
-
-               if ( !$repo->hasSha1Storage() ) {
-                       // Copy the files into their new location.
-                       // If a prior process fataled copying or cleaning up files we tolerate any
-                       // of the existing files if they are identical to the ones being stored.
-                       $statusMove = $repo->storeBatch( $triplets, FileRepo::OVERWRITE_SAME );
-                       wfDebugLog( 'imagemove', "Moved files for {$this->file->getName()}: " .
-                               "{$statusMove->successCount} successes, {$statusMove->failCount} failures" );
-                       if ( !$statusMove->isGood() ) {
-                               // Delete any files copied over (while the destination is still locked)
-                               $this->cleanupTarget( $triplets );
-                               $destFile->unlock();
-                               $this->file->unlock();
-                               wfDebugLog( 'imagemove', "Error in moving files: "
-                                       . $statusMove->getWikiText( false, false, 'en' ) );
-                               $statusMove->setOK( false );
-
-                               return $statusMove;
-                       }
-                       $status->merge( $statusMove );
-               }
-
-               // Rename the file versions metadata in the DB.
-               $this->doDBUpdates();
-
-               wfDebugLog( 'imagemove', "Renamed {$this->file->getName()} in database: " .
-                       "{$statusDb->successCount} successes, {$statusDb->failCount} failures" );
-
-               $destFile->unlock();
-               $this->file->unlock();
-
-               // Everything went ok, remove the source files
-               $this->cleanupSource( $triplets );
-
-               $status->merge( $statusDb );
-
-               return $status;
-       }
-
-       /**
-        * Verify the database updates and return a new Status indicating how
-        * many rows would be updated.
-        *
-        * @return Status
-        */
-       protected function verifyDBUpdates() {
-               $repo = $this->file->repo;
-               $status = $repo->newGood();
-               $dbw = $this->db;
-
-               $hasCurrent = $dbw->lockForUpdate(
-                       'image',
-                       [ 'img_name' => $this->oldName ],
-                       __METHOD__
-               );
-               $oldRowCount = $dbw->lockForUpdate(
-                       'oldimage',
-                       [ 'oi_name' => $this->oldName ],
-                       __METHOD__
-               );
-
-               if ( $hasCurrent ) {
-                       $status->successCount++;
-               } else {
-                       $status->failCount++;
-               }
-               $status->successCount += $oldRowCount;
-               // T36934: oldCount is based on files that actually exist.
-               // There may be more DB rows than such files, in which case $affected
-               // can be greater than $total. We use max() to avoid negatives here.
-               $status->failCount += max( 0, $this->oldCount - $oldRowCount );
-               if ( $status->failCount ) {
-                       $status->error( 'imageinvalidfilename' );
-               }
-
-               return $status;
-       }
-
-       /**
-        * Do the database updates and return a new Status indicating how
-        * many rows where updated.
-        */
-       protected function doDBUpdates() {
-               $dbw = $this->db;
-
-               // Update current image
-               $dbw->update(
-                       'image',
-                       [ 'img_name' => $this->newName ],
-                       [ 'img_name' => $this->oldName ],
-                       __METHOD__
-               );
-
-               // Update old images
-               $dbw->update(
-                       'oldimage',
-                       [
-                               'oi_name' => $this->newName,
-                               'oi_archive_name = ' . $dbw->strreplace( 'oi_archive_name',
-                                       $dbw->addQuotes( $this->oldName ), $dbw->addQuotes( $this->newName ) ),
-                       ],
-                       [ 'oi_name' => $this->oldName ],
-                       __METHOD__
-               );
-       }
-
-       /**
-        * Generate triplets for FileRepo::storeBatch().
-        * @return array[]
-        */
-       protected function getMoveTriplets() {
-               $moves = array_merge( [ $this->cur ], $this->olds );
-               $triplets = []; // The format is: (srcUrl, destZone, destUrl)
-
-               foreach ( $moves as $move ) {
-                       // $move: (oldRelativePath, newRelativePath)
-                       $srcUrl = $this->file->repo->getVirtualUrl() . '/public/' . rawurlencode( $move[0] );
-                       $triplets[] = [ $srcUrl, 'public', $move[1] ];
-                       wfDebugLog(
-                               'imagemove',
-                               "Generated move triplet for {$this->file->getName()}: {$srcUrl} :: public :: {$move[1]}"
-                       );
-               }
-
-               return $triplets;
-       }
-
-       /**
-        * Removes non-existent files from move batch.
-        * @param array $triplets
-        * @return Status
-        */
-       protected function removeNonexistentFiles( $triplets ) {
-               $files = [];
-
-               foreach ( $triplets as $file ) {
-                       $files[$file[0]] = $file[0];
-               }
-
-               $result = $this->file->repo->fileExistsBatch( $files );
-               if ( in_array( null, $result, true ) ) {
-                       return Status::newFatal( 'backend-fail-internal',
-                               $this->file->repo->getBackend()->getName() );
-               }
-
-               $filteredTriplets = [];
-               foreach ( $triplets as $file ) {
-                       if ( $result[$file[0]] ) {
-                               $filteredTriplets[] = $file;
-                       } else {
-                               wfDebugLog( 'imagemove', "File {$file[0]} does not exist" );
-                       }
-               }
-
-               return Status::newGood( $filteredTriplets );
-       }
-
-       /**
-        * Cleanup a partially moved array of triplets by deleting the target
-        * files. Called if something went wrong half way.
-        * @param array[] $triplets
-        */
-       protected function cleanupTarget( $triplets ) {
-               // Create dest pairs from the triplets
-               $pairs = [];
-               foreach ( $triplets as $triplet ) {
-                       // $triplet: (old source virtual URL, dst zone, dest rel)
-                       $pairs[] = [ $triplet[1], $triplet[2] ];
-               }
-
-               $this->file->repo->cleanupBatch( $pairs );
-       }
-
-       /**
-        * Cleanup a fully moved array of triplets by deleting the source files.
-        * Called at the end of the move process if everything else went ok.
-        * @param array[] $triplets
-        */
-       protected function cleanupSource( $triplets ) {
-               // Create source file names from the triplets
-               $files = [];
-               foreach ( $triplets as $triplet ) {
-                       $files[] = $triplet[0];
-               }
-
-               $this->file->repo->cleanupBatch( $files );
-       }
-}
-
-class LocalFileLockError extends ErrorPageError {
-       public function __construct( Status $status ) {
-               parent::__construct(
-                       'actionfailed',
-                       $status->getMessage()
-               );
-       }
-
-       public function report() {
-               global $wgOut;
-               $wgOut->setStatusCode( 429 );
-               parent::report();
-       }
 }
diff --git a/includes/filerepo/file/LocalFileDeleteBatch.php b/includes/filerepo/file/LocalFileDeleteBatch.php
new file mode 100644 (file)
index 0000000..ecd63e7
--- /dev/null
@@ -0,0 +1,429 @@
+<?php
+/**
+ * Local file in the wiki's own database.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup FileAbstraction
+ */
+
+use MediaWiki\MediaWikiServices;
+
+/**
+ * Helper class for file deletion
+ * @ingroup FileAbstraction
+ */
+class LocalFileDeleteBatch {
+       /** @var LocalFile */
+       private $file;
+
+       /** @var string */
+       private $reason;
+
+       /** @var array */
+       private $srcRels = [];
+
+       /** @var array */
+       private $archiveUrls = [];
+
+       /** @var array Items to be processed in the deletion batch */
+       private $deletionBatch;
+
+       /** @var bool Whether to suppress all suppressable fields when deleting */
+       private $suppress;
+
+       /** @var Status */
+       private $status;
+
+       /** @var User */
+       private $user;
+
+       /**
+        * @param File $file
+        * @param string $reason
+        * @param bool $suppress
+        * @param User|null $user
+        */
+       function __construct( File $file, $reason = '', $suppress = false, $user = null ) {
+               $this->file = $file;
+               $this->reason = $reason;
+               $this->suppress = $suppress;
+               if ( $user ) {
+                       $this->user = $user;
+               } else {
+                       global $wgUser;
+                       $this->user = $wgUser;
+               }
+               $this->status = $file->repo->newGood();
+       }
+
+       public function addCurrent() {
+               $this->srcRels['.'] = $this->file->getRel();
+       }
+
+       /**
+        * @param string $oldName
+        */
+       public function addOld( $oldName ) {
+               $this->srcRels[$oldName] = $this->file->getArchiveRel( $oldName );
+               $this->archiveUrls[] = $this->file->getArchiveUrl( $oldName );
+       }
+
+       /**
+        * Add the old versions of the image to the batch
+        * @return string[] List of archive names from old versions
+        */
+       public function addOlds() {
+               $archiveNames = [];
+
+               $dbw = $this->file->repo->getMasterDB();
+               $result = $dbw->select( 'oldimage',
+                       [ 'oi_archive_name' ],
+                       [ 'oi_name' => $this->file->getName() ],
+                       __METHOD__
+               );
+
+               foreach ( $result as $row ) {
+                       $this->addOld( $row->oi_archive_name );
+                       $archiveNames[] = $row->oi_archive_name;
+               }
+
+               return $archiveNames;
+       }
+
+       /**
+        * @return array
+        */
+       protected function getOldRels() {
+               if ( !isset( $this->srcRels['.'] ) ) {
+                       $oldRels =& $this->srcRels;
+                       $deleteCurrent = false;
+               } else {
+                       $oldRels = $this->srcRels;
+                       unset( $oldRels['.'] );
+                       $deleteCurrent = true;
+               }
+
+               return [ $oldRels, $deleteCurrent ];
+       }
+
+       /**
+        * @return array
+        */
+       protected function getHashes() {
+               $hashes = [];
+               list( $oldRels, $deleteCurrent ) = $this->getOldRels();
+
+               if ( $deleteCurrent ) {
+                       $hashes['.'] = $this->file->getSha1();
+               }
+
+               if ( count( $oldRels ) ) {
+                       $dbw = $this->file->repo->getMasterDB();
+                       $res = $dbw->select(
+                               'oldimage',
+                               [ 'oi_archive_name', 'oi_sha1' ],
+                               [ 'oi_archive_name' => array_keys( $oldRels ),
+                                       'oi_name' => $this->file->getName() ], // performance
+                               __METHOD__
+                       );
+
+                       foreach ( $res as $row ) {
+                               if ( rtrim( $row->oi_sha1, "\0" ) === '' ) {
+                                       // Get the hash from the file
+                                       $oldUrl = $this->file->getArchiveVirtualUrl( $row->oi_archive_name );
+                                       $props = $this->file->repo->getFileProps( $oldUrl );
+
+                                       if ( $props['fileExists'] ) {
+                                               // Upgrade the oldimage row
+                                               $dbw->update( 'oldimage',
+                                                       [ 'oi_sha1' => $props['sha1'] ],
+                                                       [ 'oi_name' => $this->file->getName(), 'oi_archive_name' => $row->oi_archive_name ],
+                                                       __METHOD__ );
+                                               $hashes[$row->oi_archive_name] = $props['sha1'];
+                                       } else {
+                                               $hashes[$row->oi_archive_name] = false;
+                                       }
+                               } else {
+                                       $hashes[$row->oi_archive_name] = $row->oi_sha1;
+                               }
+                       }
+               }
+
+               $missing = array_diff_key( $this->srcRels, $hashes );
+
+               foreach ( $missing as $name => $rel ) {
+                       $this->status->error( 'filedelete-old-unregistered', $name );
+               }
+
+               foreach ( $hashes as $name => $hash ) {
+                       if ( !$hash ) {
+                               $this->status->error( 'filedelete-missing', $this->srcRels[$name] );
+                               unset( $hashes[$name] );
+                       }
+               }
+
+               return $hashes;
+       }
+
+       protected function doDBInserts() {
+               global $wgActorTableSchemaMigrationStage;
+
+               $now = time();
+               $dbw = $this->file->repo->getMasterDB();
+
+               $commentStore = MediaWikiServices::getInstance()->getCommentStore();
+               $actorMigration = ActorMigration::newMigration();
+
+               $encTimestamp = $dbw->addQuotes( $dbw->timestamp( $now ) );
+               $encUserId = $dbw->addQuotes( $this->user->getId() );
+               $encGroup = $dbw->addQuotes( 'deleted' );
+               $ext = $this->file->getExtension();
+               $dotExt = $ext === '' ? '' : ".$ext";
+               $encExt = $dbw->addQuotes( $dotExt );
+               list( $oldRels, $deleteCurrent ) = $this->getOldRels();
+
+               // Bitfields to further suppress the content
+               if ( $this->suppress ) {
+                       $bitfield = Revision::SUPPRESSED_ALL;
+               } else {
+                       $bitfield = 'oi_deleted';
+               }
+
+               if ( $deleteCurrent ) {
+                       $tables = [ 'image' ];
+                       $fields = [
+                               'fa_storage_group' => $encGroup,
+                               'fa_storage_key' => $dbw->conditional(
+                                       [ 'img_sha1' => '' ],
+                                       $dbw->addQuotes( '' ),
+                                       $dbw->buildConcat( [ "img_sha1", $encExt ] )
+                               ),
+                               'fa_deleted_user' => $encUserId,
+                               'fa_deleted_timestamp' => $encTimestamp,
+                               'fa_deleted' => $this->suppress ? $bitfield : 0,
+                               'fa_name' => 'img_name',
+                               'fa_archive_name' => 'NULL',
+                               'fa_size' => 'img_size',
+                               'fa_width' => 'img_width',
+                               'fa_height' => 'img_height',
+                               'fa_metadata' => 'img_metadata',
+                               'fa_bits' => 'img_bits',
+                               'fa_media_type' => 'img_media_type',
+                               'fa_major_mime' => 'img_major_mime',
+                               'fa_minor_mime' => 'img_minor_mime',
+                               'fa_description_id' => 'img_description_id',
+                               'fa_timestamp' => 'img_timestamp',
+                               'fa_sha1' => 'img_sha1'
+                       ];
+                       $joins = [];
+
+                       $fields += array_map(
+                               [ $dbw, 'addQuotes' ],
+                               $commentStore->insert( $dbw, 'fa_deleted_reason', $this->reason )
+                       );
+
+                       if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
+                               $fields['fa_user'] = 'img_user';
+                               $fields['fa_user_text'] = 'img_user_text';
+                       }
+                       if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
+                               $fields['fa_actor'] = 'img_actor';
+                       }
+
+                       if (
+                               ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_BOTH ) === SCHEMA_COMPAT_WRITE_BOTH
+                       ) {
+                               // Upgrade any rows that are still old-style. Otherwise an upgrade
+                               // might be missed if a deletion happens while the migration script
+                               // is running.
+                               $res = $dbw->select(
+                                       [ 'image' ],
+                                       [ 'img_name', 'img_user', 'img_user_text' ],
+                                       [ 'img_name' => $this->file->getName(), 'img_actor' => 0 ],
+                                       __METHOD__
+                               );
+                               foreach ( $res as $row ) {
+                                       $actorId = User::newFromAnyId( $row->img_user, $row->img_user_text, null )->getActorId( $dbw );
+                                       $dbw->update(
+                                               'image',
+                                               [ 'img_actor' => $actorId ],
+                                               [ 'img_name' => $row->img_name, 'img_actor' => 0 ],
+                                               __METHOD__
+                                       );
+                               }
+                       }
+
+                       $dbw->insertSelect( 'filearchive', $tables, $fields,
+                               [ 'img_name' => $this->file->getName() ], __METHOD__, [], [], $joins );
+               }
+
+               if ( count( $oldRels ) ) {
+                       $fileQuery = OldLocalFile::getQueryInfo();
+                       $res = $dbw->select(
+                               $fileQuery['tables'],
+                               $fileQuery['fields'],
+                               [
+                                       'oi_name' => $this->file->getName(),
+                                       'oi_archive_name' => array_keys( $oldRels )
+                               ],
+                               __METHOD__,
+                               [ 'FOR UPDATE' ],
+                               $fileQuery['joins']
+                       );
+                       $rowsInsert = [];
+                       if ( $res->numRows() ) {
+                               $reason = $commentStore->createComment( $dbw, $this->reason );
+                               foreach ( $res as $row ) {
+                                       $comment = $commentStore->getComment( 'oi_description', $row );
+                                       $user = User::newFromAnyId( $row->oi_user, $row->oi_user_text, $row->oi_actor );
+                                       $rowsInsert[] = [
+                                               // Deletion-specific fields
+                                               'fa_storage_group' => 'deleted',
+                                               'fa_storage_key' => ( $row->oi_sha1 === '' )
+                                               ? ''
+                                               : "{$row->oi_sha1}{$dotExt}",
+                                               'fa_deleted_user' => $this->user->getId(),
+                                               'fa_deleted_timestamp' => $dbw->timestamp( $now ),
+                                               // Counterpart fields
+                                               'fa_deleted' => $this->suppress ? $bitfield : $row->oi_deleted,
+                                               'fa_name' => $row->oi_name,
+                                               'fa_archive_name' => $row->oi_archive_name,
+                                               'fa_size' => $row->oi_size,
+                                               'fa_width' => $row->oi_width,
+                                               'fa_height' => $row->oi_height,
+                                               'fa_metadata' => $row->oi_metadata,
+                                               'fa_bits' => $row->oi_bits,
+                                               'fa_media_type' => $row->oi_media_type,
+                                               'fa_major_mime' => $row->oi_major_mime,
+                                               'fa_minor_mime' => $row->oi_minor_mime,
+                                               'fa_timestamp' => $row->oi_timestamp,
+                                               'fa_sha1' => $row->oi_sha1
+                                       ] + $commentStore->insert( $dbw, 'fa_deleted_reason', $reason )
+                                       + $commentStore->insert( $dbw, 'fa_description', $comment )
+                                       + $actorMigration->getInsertValues( $dbw, 'fa_user', $user );
+                               }
+                       }
+
+                       $dbw->insert( 'filearchive', $rowsInsert, __METHOD__ );
+               }
+       }
+
+       function doDBDeletes() {
+               $dbw = $this->file->repo->getMasterDB();
+               list( $oldRels, $deleteCurrent ) = $this->getOldRels();
+
+               if ( count( $oldRels ) ) {
+                       $dbw->delete( 'oldimage',
+                               [
+                                       'oi_name' => $this->file->getName(),
+                                       'oi_archive_name' => array_keys( $oldRels )
+                               ], __METHOD__ );
+               }
+
+               if ( $deleteCurrent ) {
+                       $dbw->delete( 'image', [ 'img_name' => $this->file->getName() ], __METHOD__ );
+               }
+       }
+
+       /**
+        * Run the transaction
+        * @return Status
+        */
+       public function execute() {
+               $repo = $this->file->getRepo();
+               $this->file->lock();
+
+               // Prepare deletion batch
+               $hashes = $this->getHashes();
+               $this->deletionBatch = [];
+               $ext = $this->file->getExtension();
+               $dotExt = $ext === '' ? '' : ".$ext";
+
+               foreach ( $this->srcRels as $name => $srcRel ) {
+                       // Skip files that have no hash (e.g. missing DB record, or sha1 field and file source)
+                       if ( isset( $hashes[$name] ) ) {
+                               $hash = $hashes[$name];
+                               $key = $hash . $dotExt;
+                               $dstRel = $repo->getDeletedHashPath( $key ) . $key;
+                               $this->deletionBatch[$name] = [ $srcRel, $dstRel ];
+                       }
+               }
+
+               if ( !$repo->hasSha1Storage() ) {
+                       // Removes non-existent file from the batch, so we don't get errors.
+                       // This also handles files in the 'deleted' zone deleted via revision deletion.
+                       $checkStatus = $this->removeNonexistentFiles( $this->deletionBatch );
+                       if ( !$checkStatus->isGood() ) {
+                               $this->status->merge( $checkStatus );
+                               return $this->status;
+                       }
+                       $this->deletionBatch = $checkStatus->value;
+
+                       // Execute the file deletion batch
+                       $status = $this->file->repo->deleteBatch( $this->deletionBatch );
+                       if ( !$status->isGood() ) {
+                               $this->status->merge( $status );
+                       }
+               }
+
+               if ( !$this->status->isOK() ) {
+                       // Critical file deletion error; abort
+                       $this->file->unlock();
+
+                       return $this->status;
+               }
+
+               // Copy the image/oldimage rows to filearchive
+               $this->doDBInserts();
+               // Delete image/oldimage rows
+               $this->doDBDeletes();
+
+               // Commit and return
+               $this->file->unlock();
+
+               return $this->status;
+       }
+
+       /**
+        * Removes non-existent files from a deletion batch.
+        * @param array $batch
+        * @return Status
+        */
+       protected function removeNonexistentFiles( $batch ) {
+               $files = $newBatch = [];
+
+               foreach ( $batch as $batchItem ) {
+                       list( $src, ) = $batchItem;
+                       $files[$src] = $this->file->repo->getVirtualUrl( 'public' ) . '/' . rawurlencode( $src );
+               }
+
+               $result = $this->file->repo->fileExistsBatch( $files );
+               if ( in_array( null, $result, true ) ) {
+                       return Status::newFatal( 'backend-fail-internal',
+                               $this->file->repo->getBackend()->getName() );
+               }
+
+               foreach ( $batch as $batchItem ) {
+                       if ( $result[$batchItem[0]] ) {
+                               $newBatch[] = $batchItem;
+                       }
+               }
+
+               return Status::newGood( $newBatch );
+       }
+}
diff --git a/includes/filerepo/file/LocalFileLockError.php b/includes/filerepo/file/LocalFileLockError.php
new file mode 100644 (file)
index 0000000..7cfc8c2
--- /dev/null
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Local file in the wiki's own database.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup FileAbstraction
+ */
+
+class LocalFileLockError extends ErrorPageError {
+       public function __construct( Status $status ) {
+               parent::__construct(
+                       'actionfailed',
+                       $status->getMessage()
+               );
+       }
+
+       public function report() {
+               global $wgOut;
+               $wgOut->setStatusCode( 429 );
+               parent::report();
+       }
+}
diff --git a/includes/filerepo/file/LocalFileMoveBatch.php b/includes/filerepo/file/LocalFileMoveBatch.php
new file mode 100644 (file)
index 0000000..5594004
--- /dev/null
@@ -0,0 +1,339 @@
+<?php
+/**
+ * Local file in the wiki's own database.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup FileAbstraction
+ */
+
+use Wikimedia\Rdbms\IDatabase;
+
+/**
+ * Helper class for file movement
+ * @ingroup FileAbstraction
+ */
+class LocalFileMoveBatch {
+       /** @var LocalFile */
+       protected $file;
+
+       /** @var Title */
+       protected $target;
+
+       protected $cur;
+
+       protected $olds;
+
+       protected $oldCount;
+
+       protected $archive;
+
+       /** @var IDatabase */
+       protected $db;
+
+       /**
+        * @param File $file
+        * @param Title $target
+        */
+       function __construct( File $file, Title $target ) {
+               $this->file = $file;
+               $this->target = $target;
+               $this->oldHash = $this->file->repo->getHashPath( $this->file->getName() );
+               $this->newHash = $this->file->repo->getHashPath( $this->target->getDBkey() );
+               $this->oldName = $this->file->getName();
+               $this->newName = $this->file->repo->getNameFromTitle( $this->target );
+               $this->oldRel = $this->oldHash . $this->oldName;
+               $this->newRel = $this->newHash . $this->newName;
+               $this->db = $file->getRepo()->getMasterDB();
+       }
+
+       /**
+        * Add the current image to the batch
+        */
+       public function addCurrent() {
+               $this->cur = [ $this->oldRel, $this->newRel ];
+       }
+
+       /**
+        * Add the old versions of the image to the batch
+        * @return string[] List of archive names from old versions
+        */
+       public function addOlds() {
+               $archiveBase = 'archive';
+               $this->olds = [];
+               $this->oldCount = 0;
+               $archiveNames = [];
+
+               $result = $this->db->select( 'oldimage',
+                       [ 'oi_archive_name', 'oi_deleted' ],
+                       [ 'oi_name' => $this->oldName ],
+                       __METHOD__,
+                       [ 'LOCK IN SHARE MODE' ] // ignore snapshot
+               );
+
+               foreach ( $result as $row ) {
+                       $archiveNames[] = $row->oi_archive_name;
+                       $oldName = $row->oi_archive_name;
+                       $bits = explode( '!', $oldName, 2 );
+
+                       if ( count( $bits ) != 2 ) {
+                               wfDebug( "Old file name missing !: '$oldName' \n" );
+                               continue;
+                       }
+
+                       list( $timestamp, $filename ) = $bits;
+
+                       if ( $this->oldName != $filename ) {
+                               wfDebug( "Old file name doesn't match: '$oldName' \n" );
+                               continue;
+                       }
+
+                       $this->oldCount++;
+
+                       // Do we want to add those to oldCount?
+                       if ( $row->oi_deleted & File::DELETED_FILE ) {
+                               continue;
+                       }
+
+                       $this->olds[] = [
+                               "{$archiveBase}/{$this->oldHash}{$oldName}",
+                               "{$archiveBase}/{$this->newHash}{$timestamp}!{$this->newName}"
+                       ];
+               }
+
+               return $archiveNames;
+       }
+
+       /**
+        * Perform the move.
+        * @return Status
+        */
+       public function execute() {
+               $repo = $this->file->repo;
+               $status = $repo->newGood();
+               $destFile = wfLocalFile( $this->target );
+
+               $this->file->lock();
+               $destFile->lock(); // quickly fail if destination is not available
+
+               $triplets = $this->getMoveTriplets();
+               $checkStatus = $this->removeNonexistentFiles( $triplets );
+               if ( !$checkStatus->isGood() ) {
+                       $destFile->unlock();
+                       $this->file->unlock();
+                       $status->merge( $checkStatus ); // couldn't talk to file backend
+                       return $status;
+               }
+               $triplets = $checkStatus->value;
+
+               // Verify the file versions metadata in the DB.
+               $statusDb = $this->verifyDBUpdates();
+               if ( !$statusDb->isGood() ) {
+                       $destFile->unlock();
+                       $this->file->unlock();
+                       $statusDb->setOK( false );
+
+                       return $statusDb;
+               }
+
+               if ( !$repo->hasSha1Storage() ) {
+                       // Copy the files into their new location.
+                       // If a prior process fataled copying or cleaning up files we tolerate any
+                       // of the existing files if they are identical to the ones being stored.
+                       $statusMove = $repo->storeBatch( $triplets, FileRepo::OVERWRITE_SAME );
+                       wfDebugLog( 'imagemove', "Moved files for {$this->file->getName()}: " .
+                               "{$statusMove->successCount} successes, {$statusMove->failCount} failures" );
+                       if ( !$statusMove->isGood() ) {
+                               // Delete any files copied over (while the destination is still locked)
+                               $this->cleanupTarget( $triplets );
+                               $destFile->unlock();
+                               $this->file->unlock();
+                               wfDebugLog( 'imagemove', "Error in moving files: "
+                                       . $statusMove->getWikiText( false, false, 'en' ) );
+                               $statusMove->setOK( false );
+
+                               return $statusMove;
+                       }
+                       $status->merge( $statusMove );
+               }
+
+               // Rename the file versions metadata in the DB.
+               $this->doDBUpdates();
+
+               wfDebugLog( 'imagemove', "Renamed {$this->file->getName()} in database: " .
+                       "{$statusDb->successCount} successes, {$statusDb->failCount} failures" );
+
+               $destFile->unlock();
+               $this->file->unlock();
+
+               // Everything went ok, remove the source files
+               $this->cleanupSource( $triplets );
+
+               $status->merge( $statusDb );
+
+               return $status;
+       }
+
+       /**
+        * Verify the database updates and return a new Status indicating how
+        * many rows would be updated.
+        *
+        * @return Status
+        */
+       protected function verifyDBUpdates() {
+               $repo = $this->file->repo;
+               $status = $repo->newGood();
+               $dbw = $this->db;
+
+               $hasCurrent = $dbw->lockForUpdate(
+                       'image',
+                       [ 'img_name' => $this->oldName ],
+                       __METHOD__
+               );
+               $oldRowCount = $dbw->lockForUpdate(
+                       'oldimage',
+                       [ 'oi_name' => $this->oldName ],
+                       __METHOD__
+               );
+
+               if ( $hasCurrent ) {
+                       $status->successCount++;
+               } else {
+                       $status->failCount++;
+               }
+               $status->successCount += $oldRowCount;
+               // T36934: oldCount is based on files that actually exist.
+               // There may be more DB rows than such files, in which case $affected
+               // can be greater than $total. We use max() to avoid negatives here.
+               $status->failCount += max( 0, $this->oldCount - $oldRowCount );
+               if ( $status->failCount ) {
+                       $status->error( 'imageinvalidfilename' );
+               }
+
+               return $status;
+       }
+
+       /**
+        * Do the database updates and return a new Status indicating how
+        * many rows where updated.
+        */
+       protected function doDBUpdates() {
+               $dbw = $this->db;
+
+               // Update current image
+               $dbw->update(
+                       'image',
+                       [ 'img_name' => $this->newName ],
+                       [ 'img_name' => $this->oldName ],
+                       __METHOD__
+               );
+
+               // Update old images
+               $dbw->update(
+                       'oldimage',
+                       [
+                               'oi_name' => $this->newName,
+                               'oi_archive_name = ' . $dbw->strreplace( 'oi_archive_name',
+                                       $dbw->addQuotes( $this->oldName ), $dbw->addQuotes( $this->newName ) ),
+                       ],
+                       [ 'oi_name' => $this->oldName ],
+                       __METHOD__
+               );
+       }
+
+       /**
+        * Generate triplets for FileRepo::storeBatch().
+        * @return array[]
+        */
+       protected function getMoveTriplets() {
+               $moves = array_merge( [ $this->cur ], $this->olds );
+               $triplets = []; // The format is: (srcUrl, destZone, destUrl)
+
+               foreach ( $moves as $move ) {
+                       // $move: (oldRelativePath, newRelativePath)
+                       $srcUrl = $this->file->repo->getVirtualUrl() . '/public/' . rawurlencode( $move[0] );
+                       $triplets[] = [ $srcUrl, 'public', $move[1] ];
+                       wfDebugLog(
+                               'imagemove',
+                               "Generated move triplet for {$this->file->getName()}: {$srcUrl} :: public :: {$move[1]}"
+                       );
+               }
+
+               return $triplets;
+       }
+
+       /**
+        * Removes non-existent files from move batch.
+        * @param array $triplets
+        * @return Status
+        */
+       protected function removeNonexistentFiles( $triplets ) {
+               $files = [];
+
+               foreach ( $triplets as $file ) {
+                       $files[$file[0]] = $file[0];
+               }
+
+               $result = $this->file->repo->fileExistsBatch( $files );
+               if ( in_array( null, $result, true ) ) {
+                       return Status::newFatal( 'backend-fail-internal',
+                               $this->file->repo->getBackend()->getName() );
+               }
+
+               $filteredTriplets = [];
+               foreach ( $triplets as $file ) {
+                       if ( $result[$file[0]] ) {
+                               $filteredTriplets[] = $file;
+                       } else {
+                               wfDebugLog( 'imagemove', "File {$file[0]} does not exist" );
+                       }
+               }
+
+               return Status::newGood( $filteredTriplets );
+       }
+
+       /**
+        * Cleanup a partially moved array of triplets by deleting the target
+        * files. Called if something went wrong half way.
+        * @param array[] $triplets
+        */
+       protected function cleanupTarget( $triplets ) {
+               // Create dest pairs from the triplets
+               $pairs = [];
+               foreach ( $triplets as $triplet ) {
+                       // $triplet: (old source virtual URL, dst zone, dest rel)
+                       $pairs[] = [ $triplet[1], $triplet[2] ];
+               }
+
+               $this->file->repo->cleanupBatch( $pairs );
+       }
+
+       /**
+        * Cleanup a fully moved array of triplets by deleting the source files.
+        * Called at the end of the move process if everything else went ok.
+        * @param array[] $triplets
+        */
+       protected function cleanupSource( $triplets ) {
+               // Create source file names from the triplets
+               $files = [];
+               foreach ( $triplets as $triplet ) {
+                       $files[] = $triplet[0];
+               }
+
+               $this->file->repo->cleanupBatch( $files );
+       }
+}
diff --git a/includes/filerepo/file/LocalFileRestoreBatch.php b/includes/filerepo/file/LocalFileRestoreBatch.php
new file mode 100644 (file)
index 0000000..8dedbec
--- /dev/null
@@ -0,0 +1,427 @@
+<?php
+/**
+ * Local file in the wiki's own database.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup FileAbstraction
+ */
+
+use MediaWiki\MediaWikiServices;
+
+/**
+ * Helper class for file undeletion
+ * @ingroup FileAbstraction
+ */
+class LocalFileRestoreBatch {
+       /** @var LocalFile */
+       private $file;
+
+       /** @var string[] List of file IDs to restore */
+       private $cleanupBatch;
+
+       /** @var string[] List of file IDs to restore */
+       private $ids;
+
+       /** @var bool Add all revisions of the file */
+       private $all;
+
+       /** @var bool Whether to remove all settings for suppressed fields */
+       private $unsuppress = false;
+
+       /**
+        * @param File $file
+        * @param bool $unsuppress
+        */
+       function __construct( File $file, $unsuppress = false ) {
+               $this->file = $file;
+               $this->cleanupBatch = [];
+               $this->ids = [];
+               $this->unsuppress = $unsuppress;
+       }
+
+       /**
+        * Add a file by ID
+        * @param int $fa_id
+        */
+       public function addId( $fa_id ) {
+               $this->ids[] = $fa_id;
+       }
+
+       /**
+        * Add a whole lot of files by ID
+        * @param int[] $ids
+        */
+       public function addIds( $ids ) {
+               $this->ids = array_merge( $this->ids, $ids );
+       }
+
+       /**
+        * Add all revisions of the file
+        */
+       public function addAll() {
+               $this->all = true;
+       }
+
+       /**
+        * Run the transaction, except the cleanup batch.
+        * The cleanup batch should be run in a separate transaction, because it locks different
+        * rows and there's no need to keep the image row locked while it's acquiring those locks
+        * The caller may have its own transaction open.
+        * So we save the batch and let the caller call cleanup()
+        * @return Status
+        */
+       public function execute() {
+               /** @var Language */
+               global $wgLang;
+
+               $repo = $this->file->getRepo();
+               if ( !$this->all && !$this->ids ) {
+                       // Do nothing
+                       return $repo->newGood();
+               }
+
+               $lockOwnsTrx = $this->file->lock();
+
+               $dbw = $this->file->repo->getMasterDB();
+
+               $commentStore = MediaWikiServices::getInstance()->getCommentStore();
+               $actorMigration = ActorMigration::newMigration();
+
+               $status = $this->file->repo->newGood();
+
+               $exists = (bool)$dbw->selectField( 'image', '1',
+                       [ 'img_name' => $this->file->getName() ],
+                       __METHOD__,
+                       // The lock() should already prevents changes, but this still may need
+                       // to bypass any transaction snapshot. However, if lock() started the
+                       // trx (which it probably did) then snapshot is post-lock and up-to-date.
+                       $lockOwnsTrx ? [] : [ 'LOCK IN SHARE MODE' ]
+               );
+
+               // Fetch all or selected archived revisions for the file,
+               // sorted from the most recent to the oldest.
+               $conditions = [ 'fa_name' => $this->file->getName() ];
+
+               if ( !$this->all ) {
+                       $conditions['fa_id'] = $this->ids;
+               }
+
+               $arFileQuery = ArchivedFile::getQueryInfo();
+               $result = $dbw->select(
+                       $arFileQuery['tables'],
+                       $arFileQuery['fields'],
+                       $conditions,
+                       __METHOD__,
+                       [ 'ORDER BY' => 'fa_timestamp DESC' ],
+                       $arFileQuery['joins']
+               );
+
+               $idsPresent = [];
+               $storeBatch = [];
+               $insertBatch = [];
+               $insertCurrent = false;
+               $deleteIds = [];
+               $first = true;
+               $archiveNames = [];
+
+               foreach ( $result as $row ) {
+                       $idsPresent[] = $row->fa_id;
+
+                       if ( $row->fa_name != $this->file->getName() ) {
+                               $status->error( 'undelete-filename-mismatch', $wgLang->timeanddate( $row->fa_timestamp ) );
+                               $status->failCount++;
+                               continue;
+                       }
+
+                       if ( $row->fa_storage_key == '' ) {
+                               // Revision was missing pre-deletion
+                               $status->error( 'undelete-bad-store-key', $wgLang->timeanddate( $row->fa_timestamp ) );
+                               $status->failCount++;
+                               continue;
+                       }
+
+                       $deletedRel = $repo->getDeletedHashPath( $row->fa_storage_key ) .
+                               $row->fa_storage_key;
+                       $deletedUrl = $repo->getVirtualUrl() . '/deleted/' . $deletedRel;
+
+                       if ( isset( $row->fa_sha1 ) ) {
+                               $sha1 = $row->fa_sha1;
+                       } else {
+                               // old row, populate from key
+                               $sha1 = LocalRepo::getHashFromKey( $row->fa_storage_key );
+                       }
+
+                       # Fix leading zero
+                       if ( strlen( $sha1 ) == 32 && $sha1[0] == '0' ) {
+                               $sha1 = substr( $sha1, 1 );
+                       }
+
+                       if ( is_null( $row->fa_major_mime ) || $row->fa_major_mime == 'unknown'
+                               || is_null( $row->fa_minor_mime ) || $row->fa_minor_mime == 'unknown'
+                               || is_null( $row->fa_media_type ) || $row->fa_media_type == 'UNKNOWN'
+                               || is_null( $row->fa_metadata )
+                       ) {
+                               // Refresh our metadata
+                               // Required for a new current revision; nice for older ones too. :)
+                               $props = RepoGroup::singleton()->getFileProps( $deletedUrl );
+                       } else {
+                               $props = [
+                                       'minor_mime' => $row->fa_minor_mime,
+                                       'major_mime' => $row->fa_major_mime,
+                                       'media_type' => $row->fa_media_type,
+                                       'metadata' => $row->fa_metadata
+                               ];
+                       }
+
+                       $comment = $commentStore->getComment( 'fa_description', $row );
+                       $user = User::newFromAnyId( $row->fa_user, $row->fa_user_text, $row->fa_actor );
+                       if ( $first && !$exists ) {
+                               // This revision will be published as the new current version
+                               $destRel = $this->file->getRel();
+                               $commentFields = $commentStore->insert( $dbw, 'img_description', $comment );
+                               $actorFields = $actorMigration->getInsertValues( $dbw, 'img_user', $user );
+                               $insertCurrent = [
+                                       'img_name' => $row->fa_name,
+                                       'img_size' => $row->fa_size,
+                                       'img_width' => $row->fa_width,
+                                       'img_height' => $row->fa_height,
+                                       'img_metadata' => $props['metadata'],
+                                       'img_bits' => $row->fa_bits,
+                                       'img_media_type' => $props['media_type'],
+                                       'img_major_mime' => $props['major_mime'],
+                                       'img_minor_mime' => $props['minor_mime'],
+                                       'img_timestamp' => $row->fa_timestamp,
+                                       'img_sha1' => $sha1
+                               ] + $commentFields + $actorFields;
+
+                               // The live (current) version cannot be hidden!
+                               if ( !$this->unsuppress && $row->fa_deleted ) {
+                                       $status->fatal( 'undeleterevdel' );
+                                       $this->file->unlock();
+                                       return $status;
+                               }
+                       } else {
+                               $archiveName = $row->fa_archive_name;
+
+                               if ( $archiveName == '' ) {
+                                       // This was originally a current version; we
+                                       // have to devise a new archive name for it.
+                                       // Format is <timestamp of archiving>!<name>
+                                       $timestamp = wfTimestamp( TS_UNIX, $row->fa_deleted_timestamp );
+
+                                       do {
+                                               $archiveName = wfTimestamp( TS_MW, $timestamp ) . '!' . $row->fa_name;
+                                               $timestamp++;
+                                       } while ( isset( $archiveNames[$archiveName] ) );
+                               }
+
+                               $archiveNames[$archiveName] = true;
+                               $destRel = $this->file->getArchiveRel( $archiveName );
+                               $insertBatch[] = [
+                                       'oi_name' => $row->fa_name,
+                                       'oi_archive_name' => $archiveName,
+                                       'oi_size' => $row->fa_size,
+                                       'oi_width' => $row->fa_width,
+                                       'oi_height' => $row->fa_height,
+                                       'oi_bits' => $row->fa_bits,
+                                       'oi_timestamp' => $row->fa_timestamp,
+                                       'oi_metadata' => $props['metadata'],
+                                       'oi_media_type' => $props['media_type'],
+                                       'oi_major_mime' => $props['major_mime'],
+                                       'oi_minor_mime' => $props['minor_mime'],
+                                       'oi_deleted' => $this->unsuppress ? 0 : $row->fa_deleted,
+                                       'oi_sha1' => $sha1
+                               ] + $commentStore->insert( $dbw, 'oi_description', $comment )
+                               + $actorMigration->getInsertValues( $dbw, 'oi_user', $user );
+                       }
+
+                       $deleteIds[] = $row->fa_id;
+
+                       if ( !$this->unsuppress && $row->fa_deleted & File::DELETED_FILE ) {
+                               // private files can stay where they are
+                               $status->successCount++;
+                       } else {
+                               $storeBatch[] = [ $deletedUrl, 'public', $destRel ];
+                               $this->cleanupBatch[] = $row->fa_storage_key;
+                       }
+
+                       $first = false;
+               }
+
+               unset( $result );
+
+               // Add a warning to the status object for missing IDs
+               $missingIds = array_diff( $this->ids, $idsPresent );
+
+               foreach ( $missingIds as $id ) {
+                       $status->error( 'undelete-missing-filearchive', $id );
+               }
+
+               if ( !$repo->hasSha1Storage() ) {
+                       // Remove missing files from batch, so we don't get errors when undeleting them
+                       $checkStatus = $this->removeNonexistentFiles( $storeBatch );
+                       if ( !$checkStatus->isGood() ) {
+                               $status->merge( $checkStatus );
+                               return $status;
+                       }
+                       $storeBatch = $checkStatus->value;
+
+                       // Run the store batch
+                       // Use the OVERWRITE_SAME flag to smooth over a common error
+                       $storeStatus = $this->file->repo->storeBatch( $storeBatch, FileRepo::OVERWRITE_SAME );
+                       $status->merge( $storeStatus );
+
+                       if ( !$status->isGood() ) {
+                               // Even if some files could be copied, fail entirely as that is the
+                               // easiest thing to do without data loss
+                               $this->cleanupFailedBatch( $storeStatus, $storeBatch );
+                               $status->setOK( false );
+                               $this->file->unlock();
+
+                               return $status;
+                       }
+               }
+
+               // Run the DB updates
+               // Because we have locked the image row, key conflicts should be rare.
+               // If they do occur, we can roll back the transaction at this time with
+               // no data loss, but leaving unregistered files scattered throughout the
+               // public zone.
+               // This is not ideal, which is why it's important to lock the image row.
+               if ( $insertCurrent ) {
+                       $dbw->insert( 'image', $insertCurrent, __METHOD__ );
+               }
+
+               if ( $insertBatch ) {
+                       $dbw->insert( 'oldimage', $insertBatch, __METHOD__ );
+               }
+
+               if ( $deleteIds ) {
+                       $dbw->delete( 'filearchive',
+                               [ 'fa_id' => $deleteIds ],
+                               __METHOD__ );
+               }
+
+               // If store batch is empty (all files are missing), deletion is to be considered successful
+               if ( $status->successCount > 0 || !$storeBatch || $repo->hasSha1Storage() ) {
+                       if ( !$exists ) {
+                               wfDebug( __METHOD__ . " restored {$status->successCount} items, creating a new current\n" );
+
+                               DeferredUpdates::addUpdate( SiteStatsUpdate::factory( [ 'images' => 1 ] ) );
+
+                               $this->file->purgeEverything();
+                       } else {
+                               wfDebug( __METHOD__ . " restored {$status->successCount} as archived versions\n" );
+                               $this->file->purgeDescription();
+                       }
+               }
+
+               $this->file->unlock();
+
+               return $status;
+       }
+
+       /**
+        * Removes non-existent files from a store batch.
+        * @param array $triplets
+        * @return Status
+        */
+       protected function removeNonexistentFiles( $triplets ) {
+               $files = $filteredTriplets = [];
+               foreach ( $triplets as $file ) {
+                       $files[$file[0]] = $file[0];
+               }
+
+               $result = $this->file->repo->fileExistsBatch( $files );
+               if ( in_array( null, $result, true ) ) {
+                       return Status::newFatal( 'backend-fail-internal',
+                               $this->file->repo->getBackend()->getName() );
+               }
+
+               foreach ( $triplets as $file ) {
+                       if ( $result[$file[0]] ) {
+                               $filteredTriplets[] = $file;
+                       }
+               }
+
+               return Status::newGood( $filteredTriplets );
+       }
+
+       /**
+        * Removes non-existent files from a cleanup batch.
+        * @param string[] $batch
+        * @return string[]
+        */
+       protected function removeNonexistentFromCleanup( $batch ) {
+               $files = $newBatch = [];
+               $repo = $this->file->repo;
+
+               foreach ( $batch as $file ) {
+                       $files[$file] = $repo->getVirtualUrl( 'deleted' ) . '/' .
+                               rawurlencode( $repo->getDeletedHashPath( $file ) . $file );
+               }
+
+               $result = $repo->fileExistsBatch( $files );
+
+               foreach ( $batch as $file ) {
+                       if ( $result[$file] ) {
+                               $newBatch[] = $file;
+                       }
+               }
+
+               return $newBatch;
+       }
+
+       /**
+        * Delete unused files in the deleted zone.
+        * This should be called from outside the transaction in which execute() was called.
+        * @return Status
+        */
+       public function cleanup() {
+               if ( !$this->cleanupBatch ) {
+                       return $this->file->repo->newGood();
+               }
+
+               $this->cleanupBatch = $this->removeNonexistentFromCleanup( $this->cleanupBatch );
+
+               $status = $this->file->repo->cleanupDeletedBatch( $this->cleanupBatch );
+
+               return $status;
+       }
+
+       /**
+        * Cleanup a failed batch. The batch was only partially successful, so
+        * rollback by removing all items that were successfully copied.
+        *
+        * @param Status $storeStatus
+        * @param array[] $storeBatch
+        */
+       protected function cleanupFailedBatch( $storeStatus, $storeBatch ) {
+               $cleanupBatch = [];
+
+               foreach ( $storeStatus->success as $i => $success ) {
+                       // Check if this item of the batch was successfully copied
+                       if ( $success ) {
+                               // Item was successfully copied and needs to be removed again
+                               // Extract ($dstZone, $dstRel) from the batch
+                               $cleanupBatch[] = [ $storeBatch[$i][1], $storeBatch[$i][2] ];
+                       }
+               }
+               $this->file->repo->cleanupBatch( $cleanupBatch );
+       }
+}