$namespace = $row->job_namespace;
$dbkey = $row->job_title;
$title = Title::makeTitleSafe( $namespace, $dbkey );
- $job = Job::factory( $row->job_cmd, $title, Job::extractBlob( $row->job_params ), $row->job_id );
+ $job = Job::factory( $row->job_cmd, $title, Job::extractBlob( $row->job_params ),
+ $row->job_id );
$dbw->delete( 'job', $job->insertFields(), __METHOD__ );
$dbw->commit();
/**
* Insert a single job into the queue.
+ * @return bool true on success
*/
function insert() {
$fields = $this->insertFields();
return;
}
}
- $dbw->insert( 'job', $fields, __METHOD__ );
+ return $dbw->insert( 'job', $fields, __METHOD__ );
}
protected function insertFields() {
}
$this->mUpload = new UploadFromUrl;
- $this->mUpload->initialize( $this->mParams['filename'], $this->mParams['url'],
+ $result = $this->mUpload->initialize( $this->mParams['filename'], $this->mParams['url'],
$this->mParams['comment'] );
- $this->getResult()->addValue( null, $this->getModuleName(), Status::newGood() );
+ $this->getResult()->addValue( null, $this->getModuleName(), array( 'queued' => $result ) );
return;
}
} else {
/**
* Checks if the upload from URL feature is enabled
+ * @return bool
*/
public static function isEnabled() {
global $wgAllowCopyUploads;
/**
* Entry point for API upload
+ * @return bool true on success
*/
public function initialize( $name, $url, $comment, $watchlist ) {
global $wgUser;
$job = new UploadFromUrlJob( $title, $params );
- $job->insert();
+ return $job->insert();
}
/**
'token' => $token,
), $data );
- $this->assertThat( $data[0]['upload'], $this->isInstanceOf( 'Status' ),
- "Got Status Object" );
- $this->assertTrue( $data[0]['upload']->isOk(), 'Job added');
+ $this->assertTrue( $data[0]['upload']['queued'], 'Job added');
$job = Job::pop();
$this->assertThat( $job, $this->isInstanceOf( 'UploadFromUrlJob' ),