X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupUploadStash.php;h=441e8ae367bd975eb8946df440248b790b44efdb;hb=7f5c8d7bce9c813d2d21fc3dce81f75f5b1b704d;hp=dc03c349e41dc09051eb56dadd844e09d7dbb45a;hpb=d7562b948c15144efdcfd8f47953c239aca2c6af;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php
index dc03c349e4..441e8ae367 100644
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -44,6 +44,7 @@ class UploadStashCleanup extends Maintenance {
 		global $wgUploadStashMaxAge;
 
 		$repo = RepoGroup::singleton()->getLocalRepo();
+		$tempRepo = $repo->getTempRepo();
 
 		$dbr = $repo->getSlaveDb();
 
@@ -58,54 +59,80 @@ class UploadStashCleanup extends Maintenance {
 			__METHOD__
 		);
 
-		if( !is_object( $res ) || $res->numRows() == 0 ) {
-			$this->output( "No files to cleanup!\n" );
-			// nothing to do.
-			return;
-		}
-
-		// finish the read before starting writes.
-		$keys = array();
-		foreach( $res as $row ) {
-			array_push( $keys, $row->us_key );
-		}
+		// Delete all registered stash files...
+		if ( $res->numRows() == 0 ) {
+			$this->output( "No stashed files to cleanup according to the DB.\n" );
+		} else {
+			// finish the read before starting writes.
+			$keys = array();
+			foreach( $res as $row ) {
+				array_push( $keys, $row->us_key );
+			}
 
-		$this->output( 'Removing ' . count( $keys ) . " file(s)...\n" );
-		// this could be done some other, more direct/efficient way, but using
-		// UploadStash's own methods means it's less likely to fall accidentally
-		// out-of-date someday
-		$stash = new UploadStash( $repo );
+			$this->output( 'Removing ' . count( $keys ) . " file(s)...\n" );
+			// this could be done some other, more direct/efficient way, but using
+			// UploadStash's own methods means it's less likely to fall accidentally
+			// out-of-date someday
+			$stash = new UploadStash( $repo );
 
-		$i = 0;
-		foreach( $keys as $key ) {
-			$i++;
-			try {
-				$stash->getFile( $key, true );
-				$stash->removeFileNoAuth( $key );
-			} catch ( UploadStashBadPathException $ex ) {
-				$this->output( "Failed removing stashed upload with key: $key\n"  );
-			} catch ( UploadStashZeroLengthFileException $ex ) {
-				$this->output( "Failed removing stashed upload with key: $key\n"  );
-			}
-			if ( $i % 100 == 0 ) {
-				$this->output( "$i\n" );
+			$i = 0;
+			foreach( $keys as $key ) {
+				$i++;
+				try {
+					$stash->getFile( $key, true );
+					$stash->removeFileNoAuth( $key );
+				} catch ( UploadStashBadPathException $ex ) {
+					$this->output( "Failed removing stashed upload with key: $key\n"  );
+				} catch ( UploadStashZeroLengthFileException $ex ) {
+					$this->output( "Failed removing stashed upload with key: $key\n"  );
+				}
+				if ( $i % 100 == 0 ) {
+					$this->output( "$i\n" );
+				}
 			}
+			$this->output( "$i done\n" );
 		}
-		$this->output( "$i done\n" );
 
-		$tempRepo = $repo->getTempRepo();
+		// Delete all the corresponding thumbnails...
 		$dir      = $tempRepo->getZonePath( 'thumb' );
 		$iterator = $tempRepo->getBackend()->getFileList( array( 'dir' => $dir ) );
-
 		$this->output( "Deleting old thumbnails...\n" );
 		$i = 0;
 		foreach ( $iterator as $file ) {
-			$i++;
 			if ( wfTimestamp( TS_UNIX, $tempRepo->getFileTimestamp( "$dir/$file" ) ) < $cutoff ) {
-				$tempRepo->quickPurge( "$dir/$file" );
+				$status = $tempRepo->quickPurge( "$dir/$file" );
+				if ( !$status->isOK() ) {
+					$this->error( print_r( $status->getErrorsArray(), true ) );
+				}
+				if ( ( ++$i % 100 ) == 0 ) {
+					$this->output( "$i\n" );
+				}
 			}
-			if ( $i % 100 == 0 ) {
-				$this->output( "$i\n" );
+		}
+		$this->output( "$i done\n" );
+
+		// Apparently lots of stash files are not registered in the DB...
+		$dir      = $tempRepo->getZonePath( 'public' );
+		$iterator = $tempRepo->getBackend()->getFileList( array( 'dir' => $dir ) );
+		$this->output( "Deleting orphaned temp files...\n" );
+		if ( strpos( $dir, '/local-temp' ) === false ) { // sanity check
+			$this->error( "Temp repo is not using the temp container.", 1 ); // die
+		}
+		$i = 0;
+		foreach ( $iterator as $file ) {
+			// Absolute sanity check for stashed files and file segments
+			if ( !preg_match( '#(^\d{14}!|\.\d+\.\w+\.\d+$)#', basename( $file ) ) ) {
+				$this->output( "Skipped non-stash $file\n" );
+				continue;
+			}
+			if ( wfTimestamp( TS_UNIX, $tempRepo->getFileTimestamp( "$dir/$file" ) ) < $cutoff ) {
+				$status = $tempRepo->quickPurge( "$dir/$file" );
+				if ( !$status->isOK() ) {
+					$this->error( print_r( $status->getErrorsArray(), true ) );
+				}
+				if ( ( ++$i % 100 ) == 0 ) {
+					$this->output( "$i\n" );
+				}
 			}
 		}
 		$this->output( "$i done\n" );