http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73849
Revision: 73849
Author: neilk
Date: 2010-09-28 00:40:06 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
ok, bringing these files back after the move command failed
Modified Paths:
--------------
branches/uploadwizard/phase3/includes/AutoLoader.php
Added Paths:
-----------
branches/uploadwizard/phase3/includes/upload/UploadFromFileToStash.php
Modified: branches/uploadwizard/phase3/includes/AutoLoader.php
===================================================================
--- branches/uploadwizard/phase3/includes/AutoLoader.php 2010-09-28
00:34:15 UTC (rev 73848)
+++ branches/uploadwizard/phase3/includes/AutoLoader.php 2010-09-28
00:40:06 UTC (rev 73849)
@@ -667,12 +667,12 @@
'UserloginTemplate' => 'includes/templates/Userlogin.php',
# includes/upload
+ 'SessionStash' => 'includes/upload/SessionStash.php',
'UploadBase' => 'includes/upload/UploadBase.php',
'UploadFromStash' => 'includes/upload/UploadFromStash.php',
'UploadFromFile' => 'includes/upload/UploadFromFile.php',
'UploadFromFileToStash' => 'includes/upload/UploadFromFileToStash.php',
'UploadFromUrl' => 'includes/upload/UploadFromUrl.php',
- 'SessionStash' => 'includes/upload/SessionStash.php',
# languages
'Language' => 'languages/Language.php',
Added: branches/uploadwizard/phase3/includes/upload/UploadFromFileToStash.php
===================================================================
--- branches/uploadwizard/phase3/includes/upload/UploadFromFileToStash.php
(rev 0)
+++ branches/uploadwizard/phase3/includes/upload/UploadFromFileToStash.php
2010-09-28 00:40:06 UTC (rev 73849)
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Implements regular file uploads, except:
+ * - stores in local temp area, adds record to session (SessionStash)
+ * - returns lots of mime info and metadata
+ * - creates thumbnail
+ * - returns URLs for file and thumbnail accessible only to uploading user
+ *
+ * @file
+ * @ingroup upload
+ * @author Neil Kandalgaonkar
+ */
+
+class UploadFromFileToStash extends UploadFromFile {
+
+ /**
+ * Return the primary uploaded file (when in stash)
+ * @return {File}
+ public function getLocalFile() {
+ if ( ! is_a( $this->mLocalFile, 'File' ) ) {
+ wfDebug( __METHOD__ );
+ wfDebug( print_r( debug_backtrace(), 1 ) );
+ throw new MWException( 'file not in stash yet' );
+ }
+ return $this->mLocalFile;
+ }
+ */
+
+
+ /**
+ * Overrides performUpload, which normally adds the file to the
database and makes it publicly available.
+ * Instead, we store it in the SessionStash, and return metadata about
the file
+ * We also create a thumbnail, which is visible only to the uploading
user.
+ *
+ * @return {Status} result
+ */
+ public function performUpload( $comment, $pageText, $watch, $user ) {
+ $status = new Status();
+ try {
+ $stash = new SessionStash();
+ $data = array(
+ 'comment' => $comment,
+ 'pageText' => $pageText,
+ 'watch' => $watch,
+ 'mFileProps' => $this->mFileProps
+ );
+
+ // we now change the value of the local file
+ $this->mLocalFile = $stash->stashFile( false,
$this->mTempPath, $data );
+ $status->setResult( true, $this->mLocalFile );
+
+ } catch ( Exception $e ) {
+ $status->setResult( false );
+ $status->error( $e->getMessage );
+ }
+
+ return $status;
+ }
+
+ /**
+ * Get image info, but also add a thumbnail. Relies a lot on
SessionStashFile...
+ * This method also has to pass in an API result, which is a rather bad
idea and breaks
+ * separation of concerns, but that's how the rest of the code works :(
+ *
+ * @param {ApiResult} result
+ * @return {Array} key-val pair of image info, including thumbnail
+ */
+ public function getImageInfo( $result ) {
+
+ $imageInfo = parent::getImageInfo( $result );
+
+ // XXX get default thumbnail width.
+ // perhaps when initializing... Isn't this a global? Can't find
it anywhere in docs.
+ $thumbWidth = 120;
+
+ if ( isset( $this->mParams['thumbWidth'] ) ) {
+ $thumbWidthParam = ( int )(
$this->mParams['thumbWidth'] );
+ if ( $thumbWidthParam > 0 and $thumbWidthParam <=
$file->getWidth() ) {
+ $thumbWidth = $thumbWidthParam;
+ }
+ }
+
+ $thumbnailImage = null;
+
+ // because the file is a SessionStashFile, this thumbnail will
also be stashed,
+ // and a thumbnailFile will be created
+ if ( ! $thumbnailImage = $this->getLocalFile()->getThumbnail(
$thumbWidth ) ) {
+ $this->dieUsageMsg( 'Could not obtain thumbnail',
'nothumb' );
+ }
+
+ $thumbFile = $thumbnailImage->thumbnailFile;
+
+ $imageInfo[ 'thumbnail' ] = $this->getImageInfoForFile(
$thumbFile, $result );
+
+ return $imageInfo;
+ }
+};
Property changes on:
branches/uploadwizard/phase3/includes/upload/UploadFromFileToStash.php
___________________________________________________________________
Added: svn:eol-style
+ native
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
