wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-11-15 20:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add --delete to GenerateFancyCaptchas"

Browse source
This commit is contained in:
jenkins-bot 2016-11-21 21:55:47 +00:00 committed by Gerrit Code Review
parent f8c1262644 18849474b9
commit 761634716f
1 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
maintenance/GenerateFancyCaptchas.php
View file

@ -48,6 +48,7 @@ class GenerateFancyCaptchas extends Maintenance {
"oldcaptcha",
"Whether to use captcha-old.py which doesn't have OCR fighting improvements"
);
$this->addOption( "delete", "Delete the old captches" );
$this->mDescription = "Generate new captchas and move them into storage";
}
@ -60,10 +61,15 @@ class GenerateFancyCaptchas extends Maintenance {
}
$backend = $instance->getBackend();
$countAct = $instance->estimateCaptchaCount();
$this->output( "Estimated number of captchas is $countAct.\n" );
$deleteOldCaptchas = $this->getOption( 'delete' );
$countGen = (int)$this->getOption( 'fill' );
if ( !$deleteOldCaptchas ) {
$countAct = $instance->estimateCaptchaCount();
$this->output( "Estimated number of current captchas is $countAct.\n" );
$countGen -= $countAct;
}
$countGen = (int)$this->getOption( 'fill' ) - $countAct;
if ( $countGen <= 0 ) {
$this->output( "No need to generate anymore captchas.\n" );
return;
@ -110,6 +116,21 @@ class GenerateFancyCaptchas extends Maintenance {
RecursiveIteratorIterator::CHILD_FIRST // include dirs
);
$this->output( "Done.\n" );
$originalFiles = [];
if ( $deleteOldCaptchas ) {
$this->output( "Getting a list of old captchas...\n" );
foreach (
$backend->getFileList(
[ 'dir' => $backend->getRootStoragePath() . '/captcha-render' ]
) as $file
) {
$originalFiles[] = $file;
}
$this->output( "Done.\n" );
}
$this->output( "Copying the new captchas to storage...\n" );
foreach ( $iter as $fileInfo ) {
if ( !$fileInfo->isFile() ) {
@ -126,6 +147,16 @@ class GenerateFancyCaptchas extends Maintenance {
$this->error( "Could not save file '{$fileInfo->getPathname()}'.\n" );
}
}
$this->output( "Done.\n" );
if ( $deleteOldCaptchas ) {
$numOriginalFiles = count( $originalFiles );
$this->output( "Deleting {$numOriginalFiles} old captchas...\n" );
foreach ( $originalFiles as $file ) {
$backend->quickDelete( [ 'src' => $file ] );
}
$this->output( "Done.\n" );
}
} catch ( Exception $e ) {
wfRecursiveRemoveDir( $tmpDir );
throw $e;