1 files changed, 68 insertions, 17 deletions

diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php
index 97dc5824..af4bbb74 100644
--- a/maintenance/deleteArchivedFiles.php
+++ b/maintenance/deleteArchivedFiles.php
@@ -3,29 +3,80 @@
 /**
  * Delete archived (non-current) files from the database
  *
- * @file
+ * 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
+ *
  * @ingroup Maintenance
  * @author Aaron Schulz
  * Based on deleteOldRevisions.php by Rob Church
  */
 
-$options = array( 'delete', 'help' );
-require_once( 'commandLine.inc' );
-require_once( 'deleteArchivedFiles.inc' );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-echo( "Delete Archived Images\n\n" );
-
-if( @$options['help'] ) {
-	ShowUsage();
-} else {
-	DeleteArchivedFiles( @$options['delete'] );
-}
+class DeleteArchivedFiles extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Deletes all archived images.";
+		$this->addOption( 'delete', 'Perform the deletion' );
+		$this->addOption( 'force', 'Force deletion of rows from filearchive' );
+	}
 
-function ShowUsage() {
-	echo( "Deletes all archived images.\n\n" );
-	echo( "These images will no longer be restorable.\n\n" );
-	echo( "Usage: php deleteArchivedRevisions.php [--delete|--help]\n\n" );
-	echo( "delete : Performs the deletion\n" );
-	echo( "  help : Show this usage information\n" );
+	public function execute() {
+		if( !$this->hasOption('delete') ) {
+			$this->output( "Use --delete to actually confirm this script\n" );
+			return;
+		}
+		$force = $this->hasOption( 'force' );
+		# Data should come off the master, wrapped in a transaction
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
+		$tbl_arch = $dbw->tableName( 'filearchive' );
+		$repo = RepoGroup::singleton()->getLocalRepo();
+		# Get "active" revisions from the filearchive table
+		$this->output( "Searching for and deleting archived files...\n" );
+		$res = $dbw->query( "SELECT fa_id,fa_storage_group,fa_storage_key FROM $tbl_arch" );
+		$count = 0;
+		foreach( $res as $row ) {
+			$key = $row->fa_storage_key;
+			$group = $row->fa_storage_group;
+			$id = $row->fa_id;
+			$path = $repo->getZonePath( 'deleted' ).'/'.$repo->getDeletedHashPath($key).$key;
+			$sha1 = substr( $key, 0, strcspn( $key, '.' ) );
+			// Check if the file is used anywhere...
+			$inuse = $dbw->selectField( 'oldimage', '1',
+				array( 'oi_sha1' => $sha1,
+				'oi_deleted & '.File::DELETED_FILE => File::DELETED_FILE ),
+				__METHOD__,
+				array( 'FOR UPDATE' )
+			);
+			if ( $path && file_exists($path) && !$inuse ) {
+				unlink($path); // delete
+				$count++;
+				$dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );
+			} else {
+				$this->output( "Notice - file '$key' not found in group '$group'\n" );
+				if ( $force ) {
+					$this->output( "Got --force, deleting DB entry\n" );
+					$dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );
+				}
+			}
+		}
+		$dbw->commit();
+		$this->output( "Done! [$count file(s)]\n" );
+	}
 }
 
+$maintClass = "DeleteArchivedFiles";
+require_once( DO_MAINTENANCE );