jenkins-bot has submitted this change and it was merged.
Change subject: Fixed stat calls in checkImages
......................................................................
Fixed stat calls in checkImages
Bug: T64148
Change-Id: Ibfafb7dd76248855b75edee6c7ecaa87108d17ba
---
M maintenance/checkImages.php
1 file changed, 7 insertions(+), 13 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php
index 3921c07..0364db2 100644
--- a/maintenance/checkImages.php
+++ b/maintenance/checkImages.php
@@ -42,39 +42,33 @@
$numImages = 0;
$numGood = 0;
+ $repo = RepoGroup::singleton()->getLocalRepo();
do {
$res = $dbr->select( 'image', '*', array( 'img_name > '
. $dbr->addQuotes( $start ) ),
__METHOD__, array( 'LIMIT' => $this->mBatchSize
) );
foreach ( $res as $row ) {
$numImages++;
$start = $row->img_name;
- $file =
RepoGroup::singleton()->getLocalRepo()->newFileFromRow( $row );
+ $file = $repo->newFileFromRow( $row );
$path = $file->getPath();
if ( !$path ) {
$this->output( "{$row->img_name}: not
locally accessible\n" );
continue;
}
- wfSuppressWarnings();
- $stat = stat( $file->getPath() );
- wfRestoreWarnings();
- if ( !$stat ) {
+ $size = $repo->getFileSize( $file->getPath() );
+ if ( $size === false ) {
$this->output( "{$row->img_name}:
missing\n" );
continue;
}
- if ( $stat['mode'] & 040000 ) {
- $this->output( "{$row->img_name}: is a
directory\n" );
- continue;
- }
-
- if ( $stat['size'] == 0 && $row->img_size != 0
) {
+ if ( $size == 0 && $row->img_size != 0 ) {
$this->output( "{$row->img_name}:
truncated, was {$row->img_size}\n" );
continue;
}
- if ( $stat['size'] != $row->img_size ) {
+ if ( $size != $row->img_size ) {
$this->output( "{$row->img_name}: size
mismatch DB={$row->img_size}, "
- . "actual={$stat['size']}\n" );
+ . "actual={$size}\n" );
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/204814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfafb7dd76248855b75edee6c7ecaa87108d17ba
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
