Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "namespaceDupes.php: Handle invalid titles"

Browse source
This commit is contained in:
jenkins-bot 2021-10-16 12:48:58 +00:00 committed by Gerrit Code Review
commit fb67fdbe14
1 changed files with 44 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
maintenance/namespaceDupes.php
View file

@ -276,8 +276,12 @@ class NamespaceDupes extends Maintenance {
$ns, $name, $row->page_namespace, $row->page_title ); $ns, $name, $row->page_namespace, $row->page_title );
$logStatus = false; $logStatus = false;
if ( !$newTitle ) { if ( !$newTitle ) {
$logStatus = 'invalid title'; if ( $options['add-prefix'] == '' && $options['add-suffix'] == '' ) {
$action = 'abort'; $logStatus = 'invalid title and --add-prefix not specified';
$action = 'abort';
} else {
$action = 'alternate';
}
} elseif ( $newTitle->exists() ) { } elseif ( $newTitle->exists() ) {
if ( $options['merge'] ) { if ( $options['merge'] ) {
if ( $this->canMerge( $row->page_id, $newTitle, $logStatus ) ) { if ( $this->canMerge( $row->page_id, $newTitle, $logStatus ) ) {
@ -289,22 +293,27 @@ class NamespaceDupes extends Maintenance {
$action = 'abort'; $action = 'abort';
$logStatus = 'dest title exists and --add-prefix not specified'; $logStatus = 'dest title exists and --add-prefix not specified';
} else { } else {
$newTitle = $this->getAlternateTitle( $newTitle, $options ); $action = 'alternate';
if ( !$newTitle ) {
$action = 'abort';
$logStatus = 'alternate title is invalid';
} elseif ( $newTitle->exists() ) {
$action = 'abort';
$logStatus = 'title conflict';
} else {
$action = 'move';
$logStatus = 'alternate';
}
} }
} else { } else {
$action = 'move'; $action = 'move';
$logStatus = 'no conflict'; $logStatus = 'no conflict';
} }
if ( $action === 'alternate' ) {
[ $ns, $dbk ] = $this->getDestination( $ns, $name, $row->page_namespace,
$row->page_title );
$newTitle = $this->getAlternateTitle( $ns, $dbk, $options );
if ( !$newTitle ) {
$action = 'abort';
$logStatus = 'alternate title is invalid';
} elseif ( $newTitle->exists() ) {
$action = 'abort';
$logStatus = 'alternate title conflicts';
} else {
$action = 'move';
$logStatus = 'alternate';
}
}
// Take the action or log a dry run message // Take the action or log a dry run message
@ -511,14 +520,14 @@ class NamespaceDupes extends Maintenance {
} }
/** /**
* Get the preferred destination title for a given target page. * Get the preferred destination for a given target page.
* @param int $ns The destination namespace ID * @param int $ns The destination namespace ID
* @param string $name The conflicting prefix * @param string $name The conflicting prefix
* @param int $sourceNs The source namespace * @param int $sourceNs The source namespace
* @param int $sourceDbk The source DB key (i.e. page_title) * @param string $sourceDbk The source DB key (i.e. page_title)
* @return Title|false * @return array [ ns, dbkey ], not necessarily valid
*/ */
private function getDestinationTitle( $ns, $name, $sourceNs, $sourceDbk ) { private function getDestination( $ns, $name, $sourceNs, $sourceDbk ) {
$dbk = substr( $sourceDbk, strlen( "$name:" ) ); $dbk = substr( $sourceDbk, strlen( "$name:" ) );
if ( $ns == 0 ) { if ( $ns == 0 ) {
// An interwiki; try an alternate encoding with '-' for ':' // An interwiki; try an alternate encoding with '-' for ':'
@ -530,6 +539,19 @@ class NamespaceDupes extends Maintenance {
// This is an associated talk page moved with the --move-talk feature. // This is an associated talk page moved with the --move-talk feature.
$destNS = $nsInfo->getTalk( $destNS ); $destNS = $nsInfo->getTalk( $destNS );
} }
return [ $destNS, $dbk ];
}
/**
* Get the preferred destination title for a given target page.
* @param int $ns The destination namespace ID
* @param string $name The conflicting prefix
* @param int $sourceNs The source namespace
* @param string $sourceDbk The source DB key (i.e. page_title)
* @return Title|false
*/
private function getDestinationTitle( $ns, $name, $sourceNs, $sourceDbk ) {
[ $destNS, $dbk ] = $this->getDestination( $ns, $name, $sourceNs, $sourceDbk );
$newTitle = Title::makeTitleSafe( $destNS, $dbk ); $newTitle = Title::makeTitleSafe( $destNS, $dbk );
if ( !$newTitle || !$newTitle->canExist() ) { if ( !$newTitle || !$newTitle->canExist() ) {
return false; return false;
@ -541,26 +563,19 @@ class NamespaceDupes extends Maintenance {
* Get an alternative title to move a page to. This is used if the * Get an alternative title to move a page to. This is used if the
* preferred destination title already exists. * preferred destination title already exists.
* *
* @param LinkTarget $linkTarget * @param int $ns The destination namespace ID
* @param string $dbk The source DB key (i.e. page_title)
* @param array $options Associative array of validated command-line options * @param array $options Associative array of validated command-line options
* @return Title|bool * @return Title|bool
*/ */
private function getAlternateTitle( LinkTarget $linkTarget, $options ) { private function getAlternateTitle( $ns, $dbk, $options ) {
$prefix = $options['add-prefix']; $prefix = $options['add-prefix'];
$suffix = $options['add-suffix']; $suffix = $options['add-suffix'];
if ( $prefix == '' && $suffix == '' ) { if ( $prefix == '' && $suffix == '' ) {
return false; return false;
} }
while ( true ) { $newDbk = $prefix . $dbk . $suffix;
$dbk = $prefix . $linkTarget->getDBkey() . $suffix; return Title::makeTitleSafe( $ns, $newDbk );
$title = Title::makeTitleSafe( $linkTarget->getNamespace(), $dbk );
if ( !$title ) {
return false;
}
if ( !$title->exists() ) {
return $title;
}
}
} }
/** /**