* Handle fallbacks too in extension aliases

[lhc/web/wiklou.git] / maintenance / deleteArchivedFiles.inc

diff --git a/maintenance/deleteArchivedFiles.inc b/maintenance/deleteArchivedFiles.inc
index e98a1b4..da1c14d 100644 (file)
--- a/maintenance/deleteArchivedFiles.inc
+++ b/maintenance/deleteArchivedFiles.inc
@@ -3,17 +3,18 @@
 /**
  * Support functions for the deleteArchivedFiles script
  *
- * @addtogroup Maintenance
+ * @file
+ * @ingroup Maintenance
  * @author Aaron Schulz
  */
 
 require_once( "$IP/includes/FileStore.php" );
+require_once( "$IP/includes/filerepo/File.php" );
 
 function DeleteArchivedFiles( $delete = false ) {
 
        # Data should come off the master, wrapped in a transaction
        $dbw = wfGetDB( DB_MASTER );
-       $dbw->begin();
        
        $transaction = new FSTransaction();
        if( !FileStore::lock() ) {
@@ -32,26 +33,24 @@ function DeleteArchivedFiles( $delete = false ) {
                $id = $row->fa_id;
                
                $store = FileStore::get( $group );
-               if ( $store ) {
+               if( $store ) {
                        $path = $store->filePath( $key );
-                       if ( $path && file_exists($path) ) {
+                       $sha1 = substr( $key, 0, strcspn( $key, '.' ) );
+                       $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 ) {
                                $transaction->addCommit( FSTransaction::DELETE_FILE, $path );
                                $dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );
                        } else {
                                echo( "Notice - file '$key' not found in group '$group'\n" );
                        }
                } else {
-                       echo( "Notice - invalid file storage group '$group'\n" );
+                       echo( "Notice - invalid file storage group '$group' for file '$key'\n" );
                }
        }
        echo( "done.\n" );
        
        $transaction->commit();
-       
-       # This bit's done
-       # Purge redundant text records
-       $dbw->commit();
-
 }
-
-?>
\ No newline at end of file