Added new line so that it doesn't break output

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

diff --git a/maintenance/deleteArchivedFiles.inc b/maintenance/deleteArchivedFiles.inc
index 7ac5f3a..da1c14d 100644 (file)
--- a/maintenance/deleteArchivedFiles.inc
+++ b/maintenance/deleteArchivedFiles.inc
@@ -1,57 +1,56 @@
-<?php\r
-\r
-/**\r
- * Support functions for the deleteArchivedFiles script\r
- *\r
- * @addtogroup Maintenance\r
- * @author Aaron Schulz\r
- */\r
-\r
-require_once( "$IP/includes/FileStore.php" );\r
-\r
-function DeleteArchivedFiles( $delete = false ) {\r
-\r
-       # Data should come off the master, wrapped in a transaction\r
-       $dbw = wfGetDB( DB_MASTER );\r
-       $dbw->begin();\r
-       \r
-       $transaction = new FSTransaction();\r
-       if( !FileStore::lock() ) {\r
-               wfDebug( __METHOD__.": failed to acquire file store lock, aborting\n" );\r
-               return false;\r
-       }\r
-       \r
-       $tbl_arch = $dbw->tableName( 'filearchive' );\r
-       \r
-       # Get "active" revisions from the filearchive table\r
-       echo( "Searching for and deleting archived files...\n" );\r
-       $res = $dbw->query( "SELECT fa_id,fa_storage_group,fa_storage_key FROM $tbl_arch" );\r
-       while( $row = $dbw->fetchObject( $res ) ) {\r
-               $key = $row->fa_storage_key;\r
-               $group = $row->fa_storage_group;\r
-               $id = $row->fa_id;\r
-               \r
-               $store = FileStore::get( $group );\r
-               if ( $store ) {\r
-                       $path = $store->filePath( $key );\r
-                       if ( $path && file_exists($path) ) {\r
-                               $transaction->addCommit( FSTransaction::DELETE_FILE, $path );\r
-                               $dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );\r
-                       } else {\r
-                               echo( "Notice - file '$key' not found in group '$group'\n" );\r
-                       }\r
-               } else {\r
-                       echo( "Notice - invalid file storage group '$group'\n" );\r
-               }\r
-       }\r
-       echo( "done.\n" );\r
-       \r
-       $transaction->commit();\r
-       \r
-       # This bit's done\r
-       # Purge redundant text records\r
-       $dbw->commit();\r
-\r
-}\r
-\r
-?>
\ No newline at end of file
+<?php
+
+/**
+ * Support functions for the deleteArchivedFiles script
+ *
+ * @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 );
+       
+       $transaction = new FSTransaction();
+       if( !FileStore::lock() ) {
+               wfDebug( __METHOD__.": failed to acquire file store lock, aborting\n" );
+               return false;
+       }
+       
+       $tbl_arch = $dbw->tableName( 'filearchive' );
+       
+       # Get "active" revisions from the filearchive table
+       echo( "Searching for and deleting archived files...\n" );
+       $res = $dbw->query( "SELECT fa_id,fa_storage_group,fa_storage_key FROM $tbl_arch" );
+       while( $row = $dbw->fetchObject( $res ) ) {
+               $key = $row->fa_storage_key;
+               $group = $row->fa_storage_group;
+               $id = $row->fa_id;
+               
+               $store = FileStore::get( $group );
+               if( $store ) {
+                       $path = $store->filePath( $key );
+                       $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' for file '$key'\n" );
+               }
+       }
+       echo( "done.\n" );
+       
+       $transaction->commit();
+}