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

follow up r61355

Browse source
This commit is contained in:
Mark A. Hershberger 2010-01-23 05:20:31 +00:00
parent d2a3a4b444
commit eecb86354a
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/api/ApiUpload.php
View file

@ -84,7 +84,13 @@ class ApiUpload extends ApiBase {
// Initialize $this->mUpload
if ( $this->mParams['enablechunks'] ) {
$this->mUpload = new UploadFromChunks();
$this->mUpload->initialize( $request );
$this->mUpload->initialize
( $request->getText( 'done' ),
$request->getText( 'filename' ),
$request->getText( 'chunksessionkey' ),
$request->getFileTempName( 'chunk' ),
$request->getFileSize( 'chunk' ),
$request->getSessionData( 'wsUploadData' ) );
if ( !$this->mUpload->status->isOK() ) {
return $this->dieUsageMsg( $this->mUpload->status->getWikiText(),
@ -278,7 +284,7 @@ class ApiUpload extends ApiBase {
'watch' => false,
'ignorewarnings' => false,
'file' => null,
'enablechunks' => null,
'enablechunks' => false,
'chunksessionkey' => null,
'chunk' => null,
'done' => false,
@ -302,6 +308,9 @@ class ApiUpload extends ApiBase {
'ignorewarnings' => 'Ignore any warnings',
'file' => 'File contents',
'enablechunks' => 'Set to use chunk mode; see http://firefogg.org/dev/chunk_post.html for protocol',
'chunksessionkey' => 'The session key, established on the first contact during the chunked upload',
'chunk' => 'The data in this chunk of a chunked upload',
'done' => 'Set to 1 on the last chunk of a chunked upload',
'url' => 'Url to fetch the file from',
'sessionkey' => array(
'Session key returned by a previous upload that failed due to warnings',

25
includes/upload/UploadFromChunks.php
View file

@ -42,12 +42,9 @@ class UploadFromChunks extends UploadBase {
throw new MWException( 'not implemented' );
}
public function initialize( &$request ) {
$done = $request->getText( 'done' );
$filename = $request->getText( 'filename' );
$sessionKey = $request->getText( 'chunksessionkey' );
$this->initFromSessionKey( $sessionKey, $request );
public function initialize( $done, $filename, $sessionKey, $path,
$fileSize, $sessionData ) {
$this->initFromSessionKey( $sessionKey, $sessionData );
if ( !$this->sessionKey && !$done ) {
// session key not set, init the chunk upload system:
@ -60,8 +57,8 @@ class UploadFromChunks extends UploadBase {
}
if ( $this->chunkMode == self::CHUNK || $this->chunkMode == self::DONE ) {
$this->mTempPath = $request->getFileTempName( 'chunk' );
$this->fileSize += $request->getFileSize( 'chunk' );
$this->mTempPath = $path;
$this->fileSize += $fileSize;
}
}
@ -94,14 +91,12 @@ class UploadFromChunks extends UploadBase {
*
* @returns void
*/
protected function initFromSessionKey( $sessionKey, $request ) {
protected function initFromSessionKey( $sessionKey, $sessionData ) {
if ( !$sessionKey || empty( $sessionKey ) ) {
$this->status = Status::newFromFatal( 'Missing session data.' );
return;
}
$this->sessionKey = $sessionKey;
// load the sessionData array:
$sessionData = $request->getSessionData( 'wsUploadData' );
if ( isset( $sessionData[$this->sessionKey]['version'] )
&& $sessionData[$this->sessionKey]['version'] == self::SESSION_VERSION ) {
@ -124,7 +119,7 @@ class UploadFromChunks extends UploadBase {
*/
public function performUpload( $comment, $pageText, $watch, $user ) {
wfDebug( "\n\n\performUpload(chunked): sum:" . $comment . ' c: ' . $pageText . ' w:' . $watch );
global $wgUser;
global $wgUser, $wgOut;
if ( $this->chunkMode == self::INIT ) {
// firefogg expects a specific result per:
@ -140,7 +135,7 @@ class UploadFromChunks extends UploadBase {
'uploadUrl' => wfExpandUrl( wfScript( 'api' ) ) . "?action=upload&" .
"token={$token}&format=json&enablechunks=true&chunksessionkey=" .
$this->setupChunkSession( $comment, $pageText, $watch ) ) );
exit( 0 );
$wgOut->disable();
} else if ( $this->chunkMode == self::CHUNK ) {
$status = $this->appendChunk();
if ( !$status->isOK() ) {
@ -153,7 +148,7 @@ class UploadFromChunks extends UploadBase {
echo FormatJson::encode(
array( 'result' => 1, 'filesize' => $this->fileSize )
);
exit( 0 );
$wgOut->disable();
} else if ( $this->chunkMode == self::DONE ) {
if ( $comment == '' )
$comment = $this->comment;
@ -178,7 +173,7 @@ class UploadFromChunks extends UploadBase {
'done' => 1,
'resultUrl' => $file->getDescriptionUrl() )
);
exit( 0 );
$wgOut->disable();
}
}