From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 25 Sep 2014 16:17:53 +0000 (+0000)
Subject: Merge "Fix string callbacks for special page registration"
X-Git-Tag: 1.31.0-rc.0~13823
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=c80218d19393e2ae8d3b61bc4da9ed8c6eb09035;hp=8c005503e8e1a6544ea8e3095c34a228573b129d;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix string callbacks for special page registration"
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 3e36712454..c5032b5170 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -654,6 +654,7 @@ $wgAutoloadLocalClasses = array(
 	'UploadFromUrlJob' => 'includes/jobqueue/jobs/UploadFromUrlJob.php',
 	'AssembleUploadChunksJob' => 'includes/jobqueue/jobs/AssembleUploadChunksJob.php',
 	'PublishStashedFileJob' => 'includes/jobqueue/jobs/PublishStashedFileJob.php',
+	'ThumbnailRenderJob' => 'includes/jobqueue/jobs/ThumbnailRenderJob.php',
 
 	# includes/jobqueue/utils
 	'BacklinkJobUtils' => 'includes/jobqueue/utils/BacklinkJobUtils.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 427f868183..28349e9dde 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1242,6 +1242,46 @@ $wgThumbnailBuckets = null;
  */
 $wgThumbnailMinimumBucketDistance = 50;
 
+/**
+ * When defined, is an array of thumbnail widths to be rendered at upload time. The idea is to
+ * prerender common thumbnail sizes, in order to avoid the necessity to render them on demand, which
+ * has a performance impact for the first client to view a certain size.
+ *
+ * This obviously means that more disk space is needed per upload upfront.
+ *
+ * @since 1.24
+ */
+
+$wgUploadThumbnailRenderMap = array();
+
+/**
+ * The method through which the thumbnails will be prerendered for the entries in
+ * $wgUploadThumbnailRenderMap
+ *
+ * The method can be either "http" or "jobqueue". The former uses an http request to hit the
+ * thumbnail's URL.
+ * This method only works if thumbnails are configured to be rendered by a 404 handler. The latter
+ * option uses the job queue to render the thumbnail.
+ *
+ * @since 1.24
+ */
+$wgUploadThumbnailRenderMethod = 'jobqueue';
+
+/**
+ * When using the "http" wgUploadThumbnailRenderMethod, lets one specify a custom Host HTTP header.
+ *
+ * @since 1.24
+ */
+$wgUploadThumbnailRenderHttpCustomHost = false;
+
+/**
+ * When using the "http" wgUploadThumbnailRenderMethod, lets one specify a custom domain to send the
+ * HTTP request to.
+ *
+ * @since 1.24
+ */
+$wgUploadThumbnailRenderHttpCustomDomain = false;
+
 /**
  * Default parameters for the "<gallery>" tag
  */
@@ -6317,6 +6357,7 @@ $wgJobClasses = array(
 	'uploadFromUrl' => 'UploadFromUrlJob',
 	'AssembleUploadChunks' => 'AssembleUploadChunksJob',
 	'PublishStashedFile' => 'PublishStashedFileJob',
+	'ThumbnailRender' => 'ThumbnailRenderJob',
 	'null' => 'NullJob'
 );
 
diff --git a/includes/jobqueue/jobs/ThumbnailRenderJob.php b/includes/jobqueue/jobs/ThumbnailRenderJob.php
new file mode 100644
index 0000000000..ec68d7ef4e
--- /dev/null
+++ b/includes/jobqueue/jobs/ThumbnailRenderJob.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Job for asynchronous rendering of thumbnails.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup JobQueue
+ */
+
+/**
+ * Job for asynchronous rendering of thumbnails.
+ *
+ * @ingroup JobQueue
+ */
+class ThumbnailRenderJob extends Job {
+	public function __construct( $title, $params ) {
+		parent::__construct( 'ThumbnailRender', $title, $params );
+	}
+
+	public function run() {
+		global $wgUploadThumbnailRenderMethod;
+
+		$transformParams = $this->params['transformParams'];
+
+		$file = wfLocalFile( $this->title );
+
+		if ( $file && $file->exists() ) {
+			if ( $wgUploadThumbnailRenderMethod === 'jobqueue' ) {
+				$thumb = $file->transform( $transformParams, File::RENDER_NOW );
+
+				if ( $thumb && !$thumb->isError() ) {
+					return true;
+				} else {
+					$this->setLastError( __METHOD__ . ': thumbnail couln\'t be generated' );
+					return false;
+				}
+			} elseif ( $wgUploadThumbnailRenderMethod === 'http' ) {
+				$status = $this->hitThumbUrl( $file, $transformParams );
+
+				wfDebug( __METHOD__ . ": received status {$status}\n" );
+
+				if ( $status === 200 || $status === 301 || $status === 302 ) {
+					return true;
+				} elseif ( $status ) {
+					// Note that this currently happens (500) when requesting sizes larger then or
+					// equal to the original, which is harmless.
+					$this->setLastError( __METHOD__ . ': incorrect HTTP status ' . $status );
+					return false;
+				} else {
+					$this->setLastError( __METHOD__ . ': HTTP request failure' );
+					return false;
+				}
+			} else {
+				$this->setLastError( __METHOD__ . ': unknown thumbnail render method ' . $wgUploadThumbnailRenderMethod );
+				return false;
+			}
+		} else {
+			$this->setLastError( __METHOD__ . ': file doesn\'t exist' );
+			return false;
+		}
+	}
+
+	protected function hitThumbUrl( $file, $transformParams ) {
+		global $wgUploadThumbnailRenderHttpCustomHost, $wgUploadThumbnailRenderHttpCustomDomain;
+
+		$thumbName = $file->thumbName( $transformParams );
+		$thumbUrl = $file->getThumbUrl( $thumbName );
+
+		if ( $wgUploadThumbnailRenderHttpCustomDomain ) {
+			$thumbUrl = '//' . $wgUploadThumbnailRenderHttpCustomDomain . parse_url( $thumbUrl, PHP_URL_PATH );
+		}
+
+		wfDebug( __METHOD__ . ": hitting url {$thumbUrl}\n" );
+
+		$request = MWHttpRequest::factory( $thumbUrl, array(
+			'method' => 'HEAD',
+			'followRedirects' => true ) );
+
+		if ( $wgUploadThumbnailRenderHttpCustomHost ) {
+			$request->setHeader( 'Host', $wgUploadThumbnailRenderHttpCustomHost );
+		}
+
+		$status = $request->execute();
+
+		return $request->getStatus();
+	}
+}
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 89ce2b3a16..2419299086 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -746,6 +746,8 @@ abstract class UploadBase {
 				);
 			}
 			wfRunHooks( 'UploadComplete', array( &$this ) );
+
+			$this->postProcessUpload();
 		}
 
 		wfProfileOut( __METHOD__ );
@@ -753,6 +755,26 @@ abstract class UploadBase {
 		return $status;
 	}
 
+	/**
+	 * Perform extra steps after a successful upload.
+	 */
+	public function postProcessUpload() {
+		global $wgUploadThumbnailRenderMap;
+
+		$jobs = array();
+
+		$sizes = $wgUploadThumbnailRenderMap;
+		rsort( $sizes );
+
+		foreach ( $sizes as $size ) {
+			$jobs []= new ThumbnailRenderJob( $this->getLocalFile()->getTitle(), array(
+				'transformParams' => array( 'width' => $size ),
+			) );
+		}
+
+		JobQueueGroup::singleton()->push( $jobs );
+	}
+
 	/**
 	 * Returns the title of the file to be uploaded. Sets mTitleError in case
 	 * the name was illegal.
diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.css b/resources/src/mediawiki.action/mediawiki.action.history.diff.css
old mode 100644
new mode 100755
index afe9246842..092a59768e
--- a/resources/src/mediawiki.action/mediawiki.action.history.diff.css
+++ b/resources/src/mediawiki.action/mediawiki.action.history.diff.css
@@ -2,7 +2,6 @@
 ** Diff rendering
 */
 table.diff {
-	background-color: white;
 	border: none;
 	border-spacing: 4px;
 	margin: 0;