X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrebuildFileCache.php;h=da8a6bc36d3bd6b148eb34873646ea81a32673d2;hb=b829bdece246bd083f7c63c63a0c333cbb210de7;hp=649557ed286c650fabe6b94d3b21b7a4bbf0c9e0;hpb=fc7d715b4b5adedd0ae3e9e6f969c89e19d460eb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 649557ed28..da8a6bc36d 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -29,6 +29,8 @@ require_once __DIR__ . '/Maintenance.php';
  * @ingroup Maintenance
  */
 class RebuildFileCache extends Maintenance {
+	private $enabled = true;
+
 	public function __construct() {
 		parent::__construct();
 		$this->addDescription( 'Build file cache for content pages' );
@@ -39,23 +41,27 @@ class RebuildFileCache extends Maintenance {
 	}
 
 	public function finalSetup() {
-		global $wgDebugToolbar;
+		global $wgDebugToolbar, $wgUseFileCache, $wgReadOnly;
 
+		$this->enabled = $wgUseFileCache;
+		// Script will handle capturing output and saving it itself
+		$wgUseFileCache = false;
 		// Debug toolbar makes content uncacheable so we disable it.
 		// Has to be done before Setup.php initialize MWDebug
 		$wgDebugToolbar = false;
+		//  Avoid DB writes (like enotif/counters)
+		$wgReadOnly = 'Building cache'; // avoid DB writes (like enotif/counters)
+
 		parent::finalSetup();
 	}
 
 	public function execute() {
-		global $wgUseFileCache, $wgReadOnly, $wgRequestTime;
-		global $wgOut;
-		if ( !$wgUseFileCache ) {
+		global $wgRequestTime;
+
+		if ( !$this->enabled ) {
 			$this->error( "Nothing to do -- \$wgUseFileCache is disabled.", true );
 		}
 
-		$wgReadOnly = 'Building cache'; // avoid DB writes (like enotif/counters)
-
 		$start = $this->getOption( 'start', "0" );
 		if ( !ctype_digit( $start ) ) {
 			$this->error( "Invalid value for start parameter.", true );
@@ -74,10 +80,10 @@ class RebuildFileCache extends Maintenance {
 		$overwrite = $this->getOption( 'overwrite', false );
 		$start = ( $start > 0 )
 			? $start
-			: $dbr->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
+			: $dbr->selectField( 'page', 'MIN(page_id)', false, __METHOD__ );
 		$end = ( $end > 0 )
 			? $end
-			: $dbr->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+			: $dbr->selectField( 'page', 'MAX(page_id)', false, __METHOD__ );
 		if ( !$start ) {
 			$this->error( "Nothing to do.", true );
 		}
@@ -93,16 +99,17 @@ class RebuildFileCache extends Maintenance {
 		// Go through each page and save the output
 		while ( $blockEnd <= $end ) {
 			// Get the pages
-			$res = $dbr->select( 'page', [ 'page_namespace', 'page_title', 'page_id' ],
+			$res = $dbr->select( 'page',
+				[ 'page_namespace', 'page_title', 'page_id' ],
 				[ 'page_namespace' => MWNamespace::getContentNamespaces(),
 					"page_id BETWEEN $blockStart AND $blockEnd" ],
+				__METHOD__,
 				[ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ]
 			);
 
 			$this->beginTransaction( $dbw, __METHOD__ ); // for any changes
 			foreach ( $res as $row ) {
 				$rebuilt = false;
-				$wgRequestTime = microtime( true ); # bug 22852
 
 				$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
 				if ( null == $title ) {
@@ -110,39 +117,52 @@ class RebuildFileCache extends Maintenance {
 					continue; // broken title?
 				}
 
-				$context = new RequestContext;
+				$context = new RequestContext();
 				$context->setTitle( $title );
 				$article = Article::newFromTitle( $title, $context );
 				$context->setWikiPage( $article->getPage() );
 
-				$wgOut = $context->getOutput(); // set display title
-
 				// If the article is cacheable, then load it
-				if ( $article->isFileCacheable() ) {
-					$cache = HTMLFileCache::newFromTitle( $title, 'view' );
-					if ( $cache->isCacheGood() ) {
+				if ( $article->isFileCacheable( HTMLFileCache::MODE_REBUILD ) ) {
+					$viewCache = new HTMLFileCache( $title, 'view' );
+					$historyCache = new HTMLFileCache( $title, 'history' );
+					if ( $viewCache->isCacheGood() && $historyCache->isCacheGood() ) {
 						if ( $overwrite ) {
 							$rebuilt = true;
 						} else {
-							$this->output( "Page {$row->page_id} already cached\n" );
+							$this->output( "Page '$title' (id {$row->page_id}) already cached\n" );
 							continue; // done already!
 						}
 					}
-					ob_start( [ &$cache, 'saveToFileCache' ] ); // save on ob_end_clean()
-					$wgUseFileCache = false; // hack, we don't want $article fiddling with filecache
-					$article->view();
+
 					MediaWiki\suppressWarnings(); // header notices
-					$wgOut->output();
+					// Cache ?action=view
+					$wgRequestTime = microtime( true ); # bug 22852
+					ob_start();
+					$article->view();
+					$context->getOutput()->output();
+					$context->getOutput()->clearHTML();
+					$viewHtml = ob_get_clean();
+					$viewCache->saveToFileCache( $viewHtml );
+					// Cache ?action=history
+					$wgRequestTime = microtime( true ); # bug 22852
+					ob_start();
+					Action::factory( 'history', $article, $context )->show();
+					$context->getOutput()->output();
+					$context->getOutput()->clearHTML();
+					$historyHtml = ob_get_clean();
+					$historyCache->saveToFileCache( $historyHtml );
 					MediaWiki\restoreWarnings();
-					$wgUseFileCache = true;
-					ob_end_clean(); // clear buffer
+
 					if ( $rebuilt ) {
-						$this->output( "Re-cached page {$row->page_id}\n" );
+						$this->output( "Re-cached page '$title' (id {$row->page_id})..." );
 					} else {
-						$this->output( "Cached page {$row->page_id}\n" );
+						$this->output( "Cached page '$title' (id {$row->page_id})..." );
 					}
+					$this->output( "[view: " . strlen( $viewHtml ) . " bytes; " .
+						"history: " . strlen( $historyHtml ) . " bytes]\n" );
 				} else {
-					$this->output( "Page {$row->page_id} not cacheable\n" );
+					$this->output( "Page '$title' (id {$row->page_id}) not cacheable\n" );
 				}
 			}
 			$this->commitTransaction( $dbw, __METHOD__ ); // commit any changes (just for sanity)