Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-15 20:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

XW-2415 | make TemplatesHelper more generic

Browse source
This commit is contained in:
Igor Rogatty 2016-12-14 12:31:25 +01:00
parent c599b34595
commit f138e36089
3 changed files with 44 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PortableInfobox.setup.php
View file

@ -46,7 +46,7 @@ foreach ( $wgInfoboxParserNodes as $parserNode ) {
$wgAutoloadClasses[ 'Wikia\PortableInfobox\Helpers\InfoboxParamsValidator' ] = $dir . 'services/Helpers/InfoboxParamsValidator.php';
$wgAutoloadClasses[ 'Wikia\PortableInfobox\Helpers\PortableInfoboxDataBag' ] = $dir . 'services/Helpers/PortableInfoboxDataBag.php';
$wgAutoloadClasses[ 'Wikia\PortableInfobox\Helpers\PortableInfoboxRenderServiceHelper' ] = $dir . 'services/Helpers/PortableInfoboxRenderServiceHelper.php';
$wgAutoloadClasses[ 'Wikia\PortableInfobox\Helpers\PortableInfoboxTemplatesHelper' ] = $dir . 'services/Helpers/PortableInfoboxTemplatesHelper.php';
$wgAutoloadClasses[ 'Wikia\PortableInfobox\Helpers\PortableInfoboxParsingHelper' ] = $dir . 'services/Helpers/PortableInfoboxParsingHelper.php';
$wgAutoloadClasses[ 'Wikia\PortableInfobox\Helpers\PagePropsProxy' ] = $dir . 'services/Helpers/PagePropsProxy.php';
//sanitizers

39
services/Helpers/PortableInfoboxTemplatesHelper.php → services/Helpers/PortableInfoboxParsingHelper.php
View file

@ -2,12 +2,7 @@
namespace Wikia\PortableInfobox\Helpers;
/**
* Helper used for checking if template consist any hidden infoboxes (eg. put into <includeonly> tag)
*
* Class PortableInfoboxTemplatesHelper
*/
class PortableInfoboxTemplatesHelper {
class PortableInfoboxParsingHelper {
/**
* @desc Try to find out if infobox got "hidden" inside includeonly tag. Parse it if that's the case.
@ -16,9 +11,9 @@ class PortableInfoboxTemplatesHelper {
*
* @return mixed false when no infoboxes found, Array with infoboxes on success
*/
public function parseInfoboxes( $title ) {
public function parseIncludeonlyInfoboxes( $title ) {
// for templates we need to check for include tags
$templateText = \PortableInfoboxDataService::fetchArticleContent( $title );
$templateText = $this->fetchArticleContent( $title );
$includeonlyText = $this->getIncludeonlyText( $templateText );
if ( $includeonlyText ) {
@ -47,12 +42,38 @@ class PortableInfoboxTemplatesHelper {
return false;
}
public function reparseArticle( $title ) {
$parser = new \Parser();
$parserOptions = new \ParserOptions();
$parser->parse( $this->fetchArticleContent( $title ), $title, $parserOptions );
return json_decode( $parser->getOutput()
->getProperty( \PortableInfoboxDataService::INFOBOXES_PROPERTY_NAME ), true );
}
/**
* @param $title \Title
*
* @return string
*/
protected function fetchArticleContent( \Title $title ) {
if ( $title && $title->exists() ) {
$article = \Article::newFromTitle( $title, \RequestContext::getMain() );
if ( $article && $article->exists() ) {
$content = $article->fetchContent();
}
}
return isset( $content ) && $content ? $content : '';
}
/**
* @param $title
* @return array of strings (infobox markups)
*/
public function getMarkup( $title ) {
$content = \PortableInfoboxDataService::fetchArticleContent( $title );
$content = $this->fetchArticleContent( $title );
return $this->getInfoboxes( $content );
}

54
services/PortableInfoboxDataService.class.php
View file

@ -1,7 +1,7 @@
<?php
use Wikia\PortableInfobox\Helpers\PagePropsProxy;
use Wikia\PortableInfobox\Helpers\PortableInfoboxTemplatesHelper;
use Wikia\PortableInfobox\Helpers\PortableInfoboxParsingHelper;
use Wikia\PortableInfobox\Parser\Nodes\NodeInfobox;
class PortableInfoboxDataService {
@ -10,7 +10,7 @@ class PortableInfoboxDataService {
const INFOBOXES_PROPERTY_NAME = 'infoboxes';
protected $title;
protected $templateHelper;
protected $parsingHelper;
protected $propsProxy;
protected $cache;
protected $cachekey;
@ -22,7 +22,7 @@ class PortableInfoboxDataService {
*/
protected function __construct( $title ) {
$this->title = $title !== null ? $title : new Title();
$this->templateHelper = new PortableInfoboxTemplatesHelper();
$this->parsingHelper = new PortableInfoboxParsingHelper();
$this->propsProxy = new PagePropsProxy();
$this->cachekey = wfMemcKey(
__CLASS__,
@ -41,8 +41,8 @@ class PortableInfoboxDataService {
}
// set internal helpers methods
public function setTemplatesHelper( $helper ) {
$this->templateHelper = $helper;
public function setParsingHelper( $helper ) {
$this->parsingHelper = $helper;
return $this;
}
@ -60,7 +60,7 @@ class PortableInfoboxDataService {
*/
public function getData() {
if ( $this->title && $this->title->exists() && $this->title->inNamespace( NS_TEMPLATE ) ) {
$incOnlyTemplates = $this->templateHelper->parseInfoboxes( $this->title );
$incOnlyTemplates = $this->parsingHelper->parseIncludeonlyInfoboxes( $this->title );
if ( $incOnlyTemplates ) {
$this->delete();
$this->set( $incOnlyTemplates );
@ -75,7 +75,7 @@ class PortableInfoboxDataService {
* @return array of strings (infobox markups)
*/
public function getInfoboxes() {
return $this->templateHelper->getMarkup( $this->title );
return $this->parsingHelper->getMarkup( $this->title );
}
/**
@ -93,23 +93,6 @@ class PortableInfoboxDataService {
return array_unique( $images );
}
/**
* @param $title \Title
*
* @return string
*/
public static function fetchArticleContent( \Title $title ) {
if ( $title && $title->exists() ) {
$article = \Article::newFromTitle( $title, \RequestContext::getMain() );
if ( $article && $article->exists() ) {
$content = $article->fetchContent();
}
}
return isset( $content ) && $content ? $content : '';
}
/**
* Get image list from single infobox data
*
@ -200,7 +183,7 @@ class PortableInfoboxDataService {
$id = $this->title->getArticleID();
if ( $id ) {
return WikiaDataAccess::cache( $this->cachekey, WikiaResponse::CACHE_STANDARD, function () use ( $id ) {
return $this->reparseIfNeeded(
return $this->reparseArticleIfNeeded(
json_decode( $this->propsProxy->get( $id, self::INFOBOXES_PROPERTY_NAME ), true )
);
} );
@ -216,9 +199,10 @@ class PortableInfoboxDataService {
*
* @return array
*/
protected function reparseIfNeeded( $infoboxes ) {
protected function reparseArticleIfNeeded( $infoboxes ) {
if ( is_null( $infoboxes ) ) {
return $this->reparse();
$infoboxes = $this->parsingHelper->reparseArticle( $this->title );
$this->set( $infoboxes );
}
foreach ( $infoboxes as $infobox ) {
@ -226,26 +210,14 @@ class PortableInfoboxDataService {
empty( $infobox ) ||
$infobox['parser_tag_version'] !== PortableInfoboxParserTagController::PARSER_TAG_VERSION
) {
return $this->reparse();
$infoboxes = $this->parsingHelper->reparseArticle( $this->title );
$this->set( $infoboxes );
}
}
return $infoboxes;
}
protected function reparse() {
$parser = new \Parser();
$parserOptions = new \ParserOptions();
$parser->parse( $this->fetchArticleContent( $this->title ), $this->title, $parserOptions );
$infoboxes = json_decode( $parser->getOutput()
->getProperty( \PortableInfoboxDataService::INFOBOXES_PROPERTY_NAME ), true );
$this->set( $infoboxes );
return $infoboxes;
}
protected function store( $data ) {
$id = $this->title->getArticleID();
if ( $id ) {