From: Daniel Kinzler <daniel@users.mediawiki.org>
Date: Fri, 2 Oct 2009 09:54:20 +0000 (+0000)
Subject: new options: --limit --sleep --from
X-Git-Tag: 1.31.0-rc.0~39413
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=7d19e2cdb9a3faf938f00da6af2c413e2d029be3;p=lhc%2Fweb%2Fwiklou.git

new options: --limit --sleep --from
---

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 38595dd90d..ec5a16b36e 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -9,10 +9,10 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-$optionsWithArgs = array( 'extensions', 'comment', 'comment-file', 'comment-ext', 'user', 'license' );
+$optionsWithArgs = array( 'extensions', 'comment', 'comment-file', 'comment-ext', 'user', 'license', 'sleep', 'limit', 'from' );
 require_once( dirname(__FILE__) . '/commandLine.inc' );
 require_once( 'importImages.inc' );
-$added = $skipped = $overwritten = 0;
+$processed = $added = $ignored = $skipped = $overwritten = $failed = 0;
 
 echo( "Import Images\n\n" );
 
@@ -25,7 +25,7 @@ if( count( $args ) > 0 ) {
 	if (isset($options['protect']) && isset($options['unprotect']))
 			die("Cannot specify both protect and unprotect.  Only 1 is allowed.\n");
 
-	if ($options['protect'] == 1)
+if (isset($options['protect']) && $options['protect'] == 1)
 			die("You must specify a protection option.\n");
 
 	# Prepare the list of allowed extensions
@@ -45,6 +45,17 @@ if( count( $args ) > 0 ) {
 		$user = User::newFromName( 'Maintenance script' );
 	$wgUser = $user;
 
+	# Get --from 
+	$from = @$options['from'];
+
+	# Get sleep time. 
+	$sleep = @$options['sleep'];
+	if ( $sleep ) $sleep = (int)$sleep; 
+
+	# Get limit number
+	$limit = @$options['limit'];
+	if ( $limit ) $limit = (int)$limit; 
+
 	# Get the upload comment
 	$comment = 'Importing image file';
 
@@ -76,6 +87,15 @@ if( count( $args ) > 0 ) {
 				continue;
 			}
 	
+			if ( $from ) {
+				if ( $from == $title->getDBkey() ) {
+					$from = NULL;
+				} else {
+					$ignored++;
+					continue;
+				}
+			}
+
 			# Check existence
 			$image = wfLocalFile( $title );
 			if( $image->exists() ) {
@@ -105,6 +125,10 @@ if( count( $args ) > 0 ) {
 						echo( " Failed to load comment file {$f}, using default comment. " );
 					}
 				}
+
+				if ( $commentText && $comment ) {
+					$commentText = trim( $commentText ) . "\n\n" . trim( $comment );
+				}
 			}
 
 			if ( !$commentText ) {
@@ -118,6 +142,7 @@ if( count( $args ) > 0 ) {
 				$archive = $image->publish( $file );
 				if( WikiError::isError( $archive ) || !$archive->isGood() ) {
 					echo( "failed.\n" );
+					$failed++;
 					continue;
 				}
 			}
@@ -141,7 +166,6 @@ if( count( $args ) > 0 ) {
 			}
 
 
-			$$svar++;
 			if ( isset( $options['dry'] ) ) {
 				echo( "done.\n" );
 			} else if ( $image->recordUpload( $archive->value, $commentText, $license ) ) {
@@ -164,14 +188,24 @@ if( count( $args ) > 0 ) {
 
 			} else {
 				echo( "failed.\n" );
+				$svar = 'failed';
 			}
 			
+			$$svar++;
+			$processed++;
+
+			if ( $limit && $processed >= $limit )
+				break;
+
+			if ( $sleep )
+				sleep( $sleep );
 		}
 		
 		# Print out some statistics
 		echo( "\n" );
-		foreach( array( 'count' => 'Found', 'added' => 'Added',
-			'skipped' => 'Skipped', 'overwritten' => 'Overwritten' ) as $var => $desc ) {
+		foreach( array( 'count' => 'Found', 'limit' => 'Limit', 'ignored' => 'Ignored', 
+			'added' => 'Added', 'skipped' => 'Skipped', 'overwritten' => 'Overwritten', 
+			'failed' => 'Failed' ) as $var => $desc ) {
 			if( $$var > 0 )
 				echo( "{$desc}: {$$var}\n" );
 		}
@@ -199,12 +233,16 @@ USAGE: php importImages.php [options] <dir>
 
 Options:
 --extensions=<exts>	Comma-separated list of allowable extensions, defaults to \$wgFileExtensions
---overwrite		Overwrite existing images if a conflicting-named image is found
+--overwrite		Overwrite existing images with the same name (default is to skip them)
+--limit=<num>		Limit the number of images to process. Ignored or skipped images are not counted.
+--from=<name>		Ignore all files until the one with the given name. Useful for resuming
+                        aborted imports. <name> should be the file's canonical database form.
+--sleep=<sec> 		Sleep between files. Useful mostly for debugging.
 --user=<username> 	Set username of uploader, default 'Maintenance script'
---comment=<text>  	Set upload summary comment, default 'Importing image file'
+--comment=<text>  	Set upload summary comment, default 'Importing image file'.
 --comment-file=<file>  	Set upload summary comment the the content of <file>.
 --comment-ext=<ext>  	Causes the comment for each file to be loaded from a file with the same name
-			but the extension <ext>.
+			but the extension <ext>. If a global comment is also given, it is appended.
 --license=<code>  	Use an optional license template
 --dry			Dry run, don't import anything
 --protect=<protect>     Specify the protect value (autoconfirmed,sysop)