* Do not call this except from inside a repo class.
*/
static function newFromRow( $row, $repo ) {
- $title = Title::makeTitle( NS_IMAGE, $row->img_name );
+ $title = Title::makeTitle( NS_FILE, $row->img_name );
$file = new self( $title, $repo );
$file->loadFromRow( $row );
return $file;
return $this->metadata;
}
+ function getBitDepth() {
+ $this->load();
+ return $this->bits;
+ }
+
/**
* Return the size of the image file, in bytes
* @public
function getHistory($limit = null, $start = null, $end = null) {
$dbr = $this->repo->getSlaveDB();
+ $tables = array('oldimage');
+ $join_conds = array();
+ $fields = OldLocalFile::selectFields();
$conds = $opts = array();
$conds[] = "oi_name = " . $dbr->addQuotes( $this->title->getDBKey() );
if( $start !== null ) {
$opts['LIMIT'] = $limit;
}
$opts['ORDER BY'] = 'oi_timestamp DESC';
- $res = $dbr->select('oldimage', '*', $conds, __METHOD__, $opts);
+
+ wfRunHooks( 'LocalFile::getHistory', array( &$this, &$tables, &$fields, &$conds, &$opts, &$join_conds ) );
+
+ $res = $dbr->select( $tables, $fields, $conds, __METHOD__, $opts, $join_conds );
$r = array();
while( $row = $dbr->fetchObject($res) ) {
$r[] = OldLocalFile::newFromRow($row, $this->repo);
* @return FileRepoStatus object. On success, the value member contains the
* archive name, or an empty string if it was a new file.
*/
- function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $timestamp = false ) {
+ function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $timestamp = false, $user = null ) {
$this->lock();
$status = $this->publish( $srcPath, $flags );
if ( $status->ok ) {
- if ( !$this->recordUpload2( $status->value, $comment, $pageText, $props, $timestamp ) ) {
+ if ( !$this->recordUpload2( $status->value, $comment, $pageText, $props, $timestamp, $user ) ) {
$status->fatal( 'filenotfound', $srcPath );
}
}
/**
* Record a file upload in the upload log and the image table
*/
- function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false )
+ function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null )
{
- global $wgUser;
+ if( is_null( $user ) ) {
+ global $wgUser;
+ $user = $wgUser;
+ }
$dbw = $this->repo->getMasterDB();
+ $dbw->begin();
if ( !$props ) {
$props = $this->repo->getFileProps( $this->getVirtualUrl() );
}
$props['description'] = $comment;
- $props['user'] = $wgUser->getID();
- $props['user_text'] = $wgUser->getName();
+ $props['user'] = $user->getId();
+ $props['user_text'] = $user->getName();
$props['timestamp'] = wfTimestamp( TS_MW );
$this->setProps( $props );
'img_minor_mime' => $this->minor_mime,
'img_timestamp' => $timestamp,
'img_description' => $comment,
- 'img_user' => $wgUser->getID(),
- 'img_user_text' => $wgUser->getName(),
+ 'img_user' => $user->getId(),
+ 'img_user_text' => $user->getName(),
'img_metadata' => $this->metadata,
'img_sha1' => $this->sha1
),
'img_minor_mime' => $this->minor_mime,
'img_timestamp' => $timestamp,
'img_description' => $comment,
- 'img_user' => $wgUser->getID(),
- 'img_user_text' => $wgUser->getName(),
+ 'img_user' => $user->getId(),
+ 'img_user_text' => $user->getName(),
'img_metadata' => $this->metadata,
'img_sha1' => $this->sha1
), array( /* WHERE */
# Add the log entry
$log = new LogPage( 'upload' );
$action = $reupload ? 'overwrite' : 'upload';
- $log->addEntry( $action, $descTitle, $comment );
+ $log->addEntry( $action, $descTitle, $comment, array(), $user );
if( $descTitle->exists() ) {
# Create a null revision
+ $latest = $descTitle->getLatestRevID();
$nullRevision = Revision::newNullRevision( $dbw, $descTitle->getArticleId(), $log->getRcComment(), false );
$nullRevision->insertOn( $dbw );
- wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
+ wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $user) );
$article->updateRevisionOn( $dbw, $nullRevision );
# Invalidate the cache for the description page
* @return FileRepoStatus object.
*/
function move( $target ) {
+ wfDebugLog( 'imagemove', "Got request to move {$this->name} to " . $target->getText() );
$this->lock();
- $dbw = $this->repo->getMasterDB();
- $batch = new LocalFileMoveBatch( $this, $target, $dbw );
+ $batch = new LocalFileMoveBatch( $this, $target );
$batch->addCurrent();
$batch->addOlds();
- if( !$this->repo->canTransformVia404() ) {
- $batch->addThumbs();
- }
$status = $batch->execute();
+ wfDebugLog( 'imagemove', "Finished moving {$this->name}" );
$this->purgeEverything();
$this->unlock();
if ( !$revision ) return false;
$text = $revision->getText();
if ( !$text ) return false;
- $html = $wgParser->parse( $text, new ParserOptions );
- return $html;
+ $pout = $wgParser->parse( $text, $this->title, new ParserOptions() );
+ return $pout->getText();
}
function getDescription() {
// Initialise now if necessary
if ( $this->sha1 == '' && $this->fileExists ) {
$this->sha1 = File::sha1Base36( $this->getPath() );
- if ( strval( $this->sha1 ) != '' ) {
+ if ( !wfReadOnly() && strval( $this->sha1 ) != '' ) {
$dbw = $this->repo->getMasterDB();
$dbw->update( 'image',
array( 'img_sha1' => $this->sha1 ),
$dbw->delete( 'oldimage',
array(
'oi_name' => $this->file->getName(),
- 'oi_archive_name IN (' . $dbw->makeList( array_keys( $oldRels ) ) . ')'
+ 'oi_archive_name' => array_keys( $oldRels )
), __METHOD__ );
}
if ( $deleteCurrent ) {
$result = $dbw->select( 'filearchive', '*',
$conditions,
__METHOD__,
- array( 'ORDER BY' => 'fa_timestamp DESC' ) );
+ array( 'ORDER BY' => 'fa_timestamp DESC' )
+ );
$idsPresent = array();
$storeBatch = array();
'minor_mime' => $row->fa_minor_mime,
'major_mime' => $row->fa_major_mime,
'media_type' => $row->fa_media_type,
- 'metadata' => $row->fa_metadata );
+ 'metadata' => $row->fa_metadata
+ );
}
if ( $first && !$exists ) {
- // The live (current) version cannot be hidden!
- if( !$this->unsuppress && $row->fa_deleted ) {
- $this->file->unlock();
- return $status;
- }
// This revision will be published as the new current version
$destRel = $this->file->getRel();
$insertCurrent = array(
'img_user' => $row->fa_user,
'img_user_text' => $row->fa_user_text,
'img_timestamp' => $row->fa_timestamp,
- 'img_sha1' => $sha1);
+ 'img_sha1' => $sha1
+ );
+ // The live (current) version cannot be hidden!
+ if( !$this->unsuppress && $row->fa_deleted ) {
+ $storeBatch[] = array( $deletedUrl, 'public', $destRel );
+ $this->cleanupBatch[] = $row->fa_storage_key;
+ }
} else {
$archiveName = $row->fa_archive_name;
if( $archiveName == '' ) {
$deleteIds[] = $row->fa_id;
if( !$this->unsuppress && $row->fa_deleted & File::DELETED_FILE ) {
// private files can stay where they are
+ $status->successCount++;
} else {
$storeBatch[] = array( $deletedUrl, 'public', $destRel );
$this->cleanupBatch[] = $row->fa_storage_key;
* @ingroup FileRepo
*/
class LocalFileMoveBatch {
- var $file, $cur, $olds, $oldcount, $archive, $thumbs, $target, $db;
+ var $file, $cur, $olds, $oldCount, $archive, $target, $db;
- function __construct( File $file, Title $target, Database $db ) {
+ function __construct( File $file, Title $target ) {
$this->file = $file;
$this->target = $target;
$this->oldHash = $this->file->repo->getHashPath( $this->file->getName() );
- $this->newHash = $this->file->repo->getHashPath( $this->target->getDbKey() );
+ $this->newHash = $this->file->repo->getHashPath( $this->target->getDBKey() );
$this->oldName = $this->file->getName();
$this->newName = $this->file->repo->getNameFromTitle( $this->target );
$this->oldRel = $this->oldHash . $this->oldName;
$this->newRel = $this->newHash . $this->newName;
- $this->db = $db;
+ $this->db = $file->repo->getMasterDb();
}
+ /*
+ * Add the current image to the batch
+ */
function addCurrent() {
$this->cur = array( $this->oldRel, $this->newRel );
}
- function addThumbs() {
- // Thumbnails are purged, so no need to move them
- $this->thumbs = array();
- }
-
+ /*
+ * Add the old versions of the image to the batch
+ */
function addOlds() {
$archiveBase = 'archive';
$this->olds = array();
- $this->oldcount = 0;
+ $this->oldCount = 0;
$result = $this->db->select( 'oldimage',
array( 'oi_archive_name', 'oi_deleted' ),
__METHOD__
);
while( $row = $this->db->fetchObject( $result ) ) {
- $oldname = $row->oi_archive_name;
- $bits = explode( '!', $oldname, 2 );
+ $oldName = $row->oi_archive_name;
+ $bits = explode( '!', $oldName, 2 );
if( count( $bits ) != 2 ) {
- wfDebug( 'Invalid old file name: ' . $oldname );
+ wfDebug( 'Invalid old file name: ' . $oldName );
continue;
}
list( $timestamp, $filename ) = $bits;
wfDebug( 'Invalid old file name:' . $oldName );
continue;
}
- $this->oldcount++;
- // Do we want to add those to oldcount?
+ $this->oldCount++;
+ // Do we want to add those to oldCount?
if( $row->oi_deleted & File::DELETED_FILE ) {
continue;
}
$this->olds[] = array(
- "{$archiveBase}/{$this->oldHash}{$oldname}",
+ "{$archiveBase}/{$this->oldHash}{$oldName}",
"{$archiveBase}/{$this->newHash}{$timestamp}!{$this->newName}"
);
}
$this->db->freeResult( $result );
}
+ /*
+ * Perform the move.
+ */
function execute() {
$repo = $this->file->repo;
$status = $repo->newGood();
$triplets = $this->getMoveTriplets();
$statusDb = $this->doDBUpdates();
+ wfDebugLog( 'imagemove', "Renamed {$this->file->name} in database: {$statusDb->successCount} successes, {$statusDb->failCount} failures" );
$statusMove = $repo->storeBatch( $triplets, FSRepo::DELETE_SOURCE );
+ wfDebugLog( 'imagemove', "Moved files for {$this->file->name}: {$statusMove->successCount} successes, {$statusMove->failCount} failures" );
if( !$statusMove->isOk() ) {
+ wfDebugLog( 'imagemove', "Error in moving files: " . $statusMove->getWikiText() );
$this->db->rollback();
}
$status->merge( $statusDb );
return $status;
}
+ /*
+ * Do the database updates and return a new WikiError indicating how many
+ * rows where updated.
+ */
function doDBUpdates() {
$repo = $this->file->repo;
$status = $repo->newGood();
__METHOD__
);
$affected = $dbw->affectedRows();
- $total = $this->oldcount;
+ $total = $this->oldCount;
$status->successCount += $affected;
$status->failCount += $total - $affected;
return $status;
}
- // Generates triplets for FSRepo::storeBatch()
+ /*
+ * Generate triplets for FSRepo::storeBatch().
+ */
function getMoveTriplets() {
- $moves = array_merge( array( $this->cur ), $this->olds, $this->thumbs );
+ $moves = array_merge( array( $this->cur ), $this->olds );
$triplets = array(); // The format is: (srcUrl, destZone, destUrl)
foreach( $moves as $move ) {
// $move: (oldRelativePath, newRelativePath)
$srcUrl = $this->file->repo->getVirtualUrl() . '/public/' . rawurlencode( $move[0] );
$triplets[] = array( $srcUrl, 'public', $move[1] );
+ wfDebugLog( 'imagemove', "Generated move triplet for {$this->file->name}: {$srcUrl} :: public :: {$move[1]}" );
}
return $triplets;
}
dépôts / lhc / web / wiklou.git / blobdiff