summaryrefslogtreecommitdiff
path: root/maintenance/importImages.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-08-12 09:28:15 +0200
committerPierre Schmitz <pierre@archlinux.de>2013-08-12 09:28:15 +0200
commit08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 (patch)
tree577a29fb579188d16003a209ce2a2e9c5b0aa2bd /maintenance/importImages.php
parentcacc939b34e315b85e2d72997811eb6677996cc1 (diff)
Update to MediaWiki 1.21.1
Diffstat (limited to 'maintenance/importImages.php')
-rw-r--r--maintenance/importImages.php55
1 files changed, 35 insertions, 20 deletions
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 8d92383d..782f502d 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -31,7 +31,10 @@
* @author Mij <mij@bitchx.it>
*/
-$optionsWithArgs = array( 'extensions', 'comment', 'comment-file', 'comment-ext', 'user', 'license', 'sleep', 'limit', 'from', 'source-wiki-url' );
+$optionsWithArgs = array(
+ 'extensions', 'comment', 'comment-file', 'comment-ext', 'summary', 'user',
+ 'license', 'sleep', 'limit', 'from', 'source-wiki-url', 'timestamp',
+);
require_once( __DIR__ . '/commandLine.inc' );
require_once( __DIR__ . '/importImages.inc' );
$processed = $added = $ignored = $skipped = $overwritten = $failed = 0;
@@ -61,7 +64,7 @@ $extensions = isset( $options['extensions'] )
: $wgFileExtensions;
# Search the path provided for candidates for import
-$files = findFiles( $dir, $extensions );
+$files = findFiles( $dir, $extensions, isset( $options['search-recursively'] ) );
# Initialise the user for this operation
$user = isset( $options['user'] )
@@ -98,6 +101,8 @@ if ( $limit ) {
$limit = (int)$limit;
}
+$timestamp = isset( $options['timestamp'] ) ? $options['timestamp'] : false;
+
# Get the upload comment. Provide a default one in case there's no comment given.
$comment = 'Importing image file';
@@ -112,6 +117,8 @@ if ( isset( $options['comment-file'] ) ) {
$commentExt = isset( $options['comment-ext'] ) ? $options['comment-ext'] : false;
+$summary = isset( $options['summary'] ) ? $options['summary'] : '';
+
# Get the license specifier
$license = isset( $options['license'] ) ? $options['license'] : '';
@@ -230,9 +237,14 @@ if ( $count > 0 ) {
}
}
+ $commentText = SpecialUpload::getInitialPageText( $commentText, $license );
+ if ( !$summary ) {
+ $summary = $commentText;
+ }
+
if ( isset( $options['dry'] ) ) {
echo( "done.\n" );
- } elseif ( $image->recordUpload( $archive->value, $commentText, $license ) ) {
+ } elseif ( $image->recordUpload2( $archive->value, $summary, $commentText, false, $timestamp ) ) {
# We're done!
echo( "done.\n" );
@@ -314,25 +326,28 @@ USAGE: php importImages.php [options] <dir>
<dir> : Path to the directory containing images to be imported
Options:
---extensions=<exts> Comma-separated list of allowable extensions, defaults to \$wgFileExtensions
---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.
---skip-dupes Skip images that were already uploaded under a different name (check SHA1)
---sleep=<sec> Sleep between files. Useful mostly for debugging.
---user=<username> Set username of uploader, default 'Maintenance script'
---check-userblock Check if the user got blocked during import.
---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>. If a global comment is also given, it is appended.
---license=<code> Use an optional license template
---dry Dry run, don't import anything
+--extensions=<exts> Comma-separated list of allowable extensions, defaults to \$wgFileExtensions
+--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.
+--skip-dupes Skip images that were already uploaded under a different name (check SHA1)
+--search-recursively Search recursively for files in subdirectories
+--sleep=<sec> Sleep between files. Useful mostly for debugging.
+--user=<username> Set username of uploader, default 'Maintenance script'
+--check-userblock Check if the user got blocked during import.
+--comment=<text> Set file description, default 'Importing image file'.
+--comment-file=<file> Set description to the content of <file>.
+--comment-ext=<ext> Causes the description for each file to be loaded from a file with the same name
+ but the extension <ext>. If a global description 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)
+--summary=<summary> Upload summary, description will be used if not provided
+--timestamp=<timestamp> Override upload time/date, all MediaWiki timestamp formats are accepted
--unprotect Unprotects all uploaded images
---source-wiki-url if specified, take User and Comment data for each imported file from this URL.
- For example, --source-wiki-url="http://en.wikipedia.org/"
+--source-wiki-url If specified, take User and Comment data for each imported file from this URL.
+ For example, --source-wiki-url="http://en.wikipedia.org/"
TEXT;
exit( 1 );