X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FdeleteArchivedFiles.php;h=bd8ca1090ada2c26327352a3419e597050f9d639;hb=415b31766677e190c13322742b4e42da1157538c;hp=af4bbb74837337984048d1986e01c5df36ba74a5;hpb=ffc662b09647501b4d349b3379eb76f35f608455;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php
index af4bbb7483..bd8ca1090a 100644
--- a/maintenance/deleteArchivedFiles.php
+++ b/maintenance/deleteArchivedFiles.php
@@ -1,8 +1,9 @@
 <?php
-
 /**
  * Delete archived (non-current) files from the database
  *
+ * Based on deleteOldRevisions.php by Rob Church.
+ *
  * 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
@@ -18,13 +19,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  * @author Aaron Schulz
- * Based on deleteOldRevisions.php by Rob Church
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
+/**
+ * Maintenance script to delete archived (non-current) files from the database.
+ *
+ * @ingroup Maintenance
+ */
 class DeleteArchivedFiles extends Maintenance {
 	public function __construct() {
 		parent::__construct();
@@ -34,49 +40,83 @@ class DeleteArchivedFiles extends Maintenance {
 	}
 
 	public function execute() {
-		if( !$this->hasOption('delete') ) {
+		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' );
+		$dbw = $this->getDB( DB_MASTER );
+		$dbw->begin( __METHOD__ );
 		$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" );
+		$res = $dbw->select(
+			'filearchive',
+			array( 'fa_id', 'fa_storage_group', 'fa_storage_key', 'fa_sha1' ),
+			'',
+			__METHOD__
+		);
+
 		$count = 0;
-		foreach( $res as $row ) {
+		foreach ( $res as $row ) {
 			$key = $row->fa_storage_key;
+			if ( !strlen( $key ) ) {
+				$this->output( "Entry with ID {$row->fa_id} has empty key, skipping\n" );
+				continue;
+			}
+
 			$group = $row->fa_storage_group;
 			$id = $row->fa_id;
-			$path = $repo->getZonePath( 'deleted' ).'/'.$repo->getDeletedHashPath($key).$key;
-			$sha1 = substr( $key, 0, strcspn( $key, '.' ) );
+			$path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key;
+			if ( isset( $row->fa_sha1 ) ) {
+				$sha1 = $row->fa_sha1;
+			} else {
+				// old row, populate from key
+				$sha1 = LocalRepo::getHashFromKey( $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 ),
+			$inuse = $dbw->selectField(
+				'oldimage',
+				'1',
+				array(
+					'oi_sha1' => $sha1,
+					$dbw->bitAnd( '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 {
+
+			$needForce = true;
+			if ( !$repo->fileExists( $path ) ) {
 				$this->output( "Notice - file '$key' not found in group '$group'\n" );
-				if ( $force ) {
+			} elseif ( $inuse ) {
+				$this->output( "Notice - file '$key' is still in use\n" );
+			} elseif ( !$repo->quickPurge( $path ) ) {
+				$this->output( "Unable to remove file $path, skipping\n" );
+				continue; // don't delete even with --force
+			} else {
+				$needForce = false;
+			}
+
+			if ( $needForce ) {
+				if ( $this->hasOption( 'force' ) ) {
 					$this->output( "Got --force, deleting DB entry\n" );
-					$dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );
+				} else {
+					continue;
 				}
 			}
+
+			$count++;
+			$dbw->delete( 'filearchive', array( 'fa_id' => $id ), __METHOD__ );
 		}
-		$dbw->commit();
+
+		$dbw->commit( __METHOD__ );
 		$this->output( "Done! [$count file(s)]\n" );
 	}
 }
 
 $maintClass = "DeleteArchivedFiles";
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;