mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Description2
synced 2024-11-23 14:26:44 +00:00
Implement a RemexHtml-based provider (requires 1.38)
This patch has been in testing on ark.wiki.gg (with the platform's approval) for a few months now, and has yielded us significantly better extracts than the live algorithm. It brings Description2 closer to TextExtracts' level, but without its constraints. TextExtracts does not enable us to override descriptions as we see fit, requires internal API calls, and uses HtmlFormatter which has its own slew of problems. I'm also raising MW requirement to 1.38: this change has not been tested with older versions, and I removed uses of old `getProperty` in favour of `getPageProperty` to clean up the code. I doubt this really matters much: support for 1.35 is about to end (if it hasn't already), and 1.38 itself is already EoL. It also appears that lately this extension only received forward-compatibility patches. New provider leverages RemexHtml (used in core MediaWiki and Parsoid) to parse and process a page's HTML. For performance reasons (but also bit of practicality - it's unlikely that description derival needs full page text...) any HTML after the first <h1-6> heading is dropped and not parsed. However, this is just a precaution, on ARK we haven't noticed any performance degradation. Two new configuration variables are added: - `$wgUseSimpleDescriptionAlgorithm` (proposed default: false) determines which extract provider is used. `true` is the previous algorithm. `false` is the new Remex implementation. - `$wgDescriptionRemoveElements` is an array of tag names and/or class names to strip out when generating extracts. This is only supported in the Remex provider, and would be hard to retrofit into the previous algorithm. Depends-On: I04b00f99085f07f773212ee3eca8470eece34e9e Change-Id: I8e6bf1f17443feac89f07e728d395e5a525bd4d1
This commit is contained in:
parent
d325abc0dd
commit
dcfd6ea6a8
|
@ -9,11 +9,32 @@
|
|||
"license-name": "GPL-2.0-or-later",
|
||||
"type": "other",
|
||||
"requires": {
|
||||
"MediaWiki": ">= 1.35.0"
|
||||
"MediaWiki": ">= 1.38.0"
|
||||
},
|
||||
"config": {
|
||||
"EnableMetaDescriptionFunctions": false,
|
||||
"DescriptionMaxChars": 300
|
||||
"DescriptionMaxChars": 300,
|
||||
"DescriptionAlgorithm": "MediaWiki\\Extension\\Description2\\RemexDescriptionProvider",
|
||||
"DescriptionRemoveElements": [
|
||||
"table",
|
||||
"div",
|
||||
"script",
|
||||
"style",
|
||||
"figure",
|
||||
"input",
|
||||
"div.infobox",
|
||||
"div.ambox",
|
||||
"div.dmbox",
|
||||
"ul.gallery",
|
||||
".mw-editsection",
|
||||
"sup.reference",
|
||||
"ul.references",
|
||||
".error",
|
||||
".nomobile",
|
||||
".noprint",
|
||||
".noexcerpt",
|
||||
".sortkey"
|
||||
]
|
||||
},
|
||||
"ConfigRegistry": {
|
||||
"Description2": "GlobalVarConfig::newInstance"
|
||||
|
|
|
@ -23,18 +23,10 @@ class Description2 {
|
|||
*/
|
||||
public static function setDescription( Parser $parser, $desc ) {
|
||||
$parserOutput = $parser->getOutput();
|
||||
if ( method_exists( $parserOutput, 'getPageProperty' ) ) {
|
||||
// MW 1.38+
|
||||
if ( $parserOutput->getPageProperty( 'description' ) !== null ) {
|
||||
return;
|
||||
}
|
||||
$parserOutput->setPageProperty( 'description', $desc );
|
||||
} else {
|
||||
if ( $parserOutput->getProperty( 'description' ) !== false ) {
|
||||
return;
|
||||
}
|
||||
$parserOutput->setProperty( 'description', $desc );
|
||||
if ( $parserOutput->getPageProperty( 'description' ) !== null ) {
|
||||
return;
|
||||
}
|
||||
$parserOutput->setPageProperty( 'description', $desc );
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
133
includes/RemexDescriptionProvider.php
Normal file
133
includes/RemexDescriptionProvider.php
Normal file
|
@ -0,0 +1,133 @@
|
|||
<?php
|
||||
|
||||
namespace MediaWiki\Extension\Description2;
|
||||
|
||||
use Config;
|
||||
use Wikimedia\RemexHtml\HTMLData;
|
||||
use Wikimedia\RemexHtml\Serializer\HtmlFormatter;
|
||||
use Wikimedia\RemexHtml\Serializer\Serializer;
|
||||
use Wikimedia\RemexHtml\Serializer\SerializerNode;
|
||||
use Wikimedia\RemexHtml\Tokenizer\Tokenizer;
|
||||
use Wikimedia\RemexHtml\TreeBuilder\Dispatcher;
|
||||
use Wikimedia\RemexHtml\TreeBuilder\TreeBuilder;
|
||||
|
||||
class RemexDescriptionProvider implements DescriptionProvider {
|
||||
/** @var string[] */
|
||||
private array $toRemove;
|
||||
|
||||
/**
|
||||
* @param Config $config
|
||||
*/
|
||||
public function __construct( Config $config ) {
|
||||
$this->toRemove = $config->get( 'DescriptionRemoveElements' );
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts description from the HTML representation of a page.
|
||||
*
|
||||
* This algorithm:
|
||||
* 1. Looks for the first <hN> heading (potentially included in the ToC) and cuts the text to avoid unnecessary
|
||||
* server load.
|
||||
* 2. Invokes RemexHTML to parse and reserialise the HTML representation.
|
||||
* 3. Comments are excluded.
|
||||
* 4. HTML elements are filtered by tag name and the 'class' attribute. Removals are dictated through the
|
||||
* $wgDescriptionRemoveElements config variable.
|
||||
* 5. HTML tags are stripped, and only text is preserved.
|
||||
* 6. Strips white-space around the extract.
|
||||
*
|
||||
* This is more costly than the SimpleDescriptionProvider but is far more flexible and easier to manipulate by
|
||||
* editors.
|
||||
*
|
||||
* @param string $text
|
||||
* @return string
|
||||
*/
|
||||
public function derive( string $text ): ?string {
|
||||
$formatter = new class( $options = [], $this->toRemove ) extends HtmlFormatter {
|
||||
|
||||
/** @var string[] */
|
||||
private array $toRemove;
|
||||
|
||||
/**
|
||||
* @param array $options
|
||||
* @param array $toRemove
|
||||
*/
|
||||
public function __construct( $options, array $toRemove ) {
|
||||
parent::__construct( $options );
|
||||
$this->toRemove = $toRemove;
|
||||
}
|
||||
|
||||
/**
|
||||
* Skips comments.
|
||||
*
|
||||
* @param SerializerNode $parent
|
||||
* @param string $text
|
||||
* @return void
|
||||
*/
|
||||
public function comment( SerializerNode $parent, $text ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Strips out HTML tags leaving bare text, and strips out undesirable elements per configuration.
|
||||
*
|
||||
* @param SerializerNode $parent
|
||||
* @param SerializerNode $node
|
||||
* @param string $contents
|
||||
* @return void
|
||||
*/
|
||||
public function element( SerializerNode $parent, SerializerNode $node, $contents ) {
|
||||
// Read CSS classes off the node into an array for later
|
||||
$nodeClasses = $node->attrs->getValues()['class'] ?? null;
|
||||
if ( $nodeClasses ) {
|
||||
$nodeClasses = explode( ' ', $nodeClasses );
|
||||
}
|
||||
|
||||
// Strip away elements matching our removal list. This only supports tags and classes.
|
||||
foreach ( $this->toRemove as $selectorish ) {
|
||||
$split = explode( '.', $selectorish );
|
||||
$tagName = array_shift( $split );
|
||||
|
||||
if ( $tagName !== '' && $node->name !== $tagName ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( $split && ( !$nodeClasses || array_diff( $split, $nodeClasses ) ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
return $contents;
|
||||
}
|
||||
|
||||
/**
|
||||
* Skips document starter tags.
|
||||
*
|
||||
* @param string $fragmentNamespace
|
||||
* @param string $fragmentName
|
||||
* @return void
|
||||
*/
|
||||
public function startDocument( $fragmentNamespace, $fragmentName ) {
|
||||
return '';
|
||||
}
|
||||
};
|
||||
|
||||
// Preserve only the first section
|
||||
if ( preg_match( '/^.*?(?=<h[1-6]\b(?! id="mw-toc-heading"))/s', $text, $matches ) ) {
|
||||
$text = $matches[0];
|
||||
}
|
||||
|
||||
$serializer = new Serializer( $formatter );
|
||||
$treeBuilder = new TreeBuilder( $serializer );
|
||||
$dispatcher = new Dispatcher( $treeBuilder );
|
||||
$tokenizer = new Tokenizer( $dispatcher, $text );
|
||||
|
||||
$tokenizer->execute( [
|
||||
'fragmentNamespace' => HTMLData::NS_HTML,
|
||||
'fragmentName' => 'body',
|
||||
] );
|
||||
|
||||
return trim( $serializer->getResult() );
|
||||
}
|
||||
}
|
|
@ -1,13 +1,14 @@
|
|||
<?php
|
||||
|
||||
use MediaWiki\Extension\Description2\DescriptionProvider;
|
||||
use MediaWiki\Extension\Description2\SimpleDescriptionProvider;
|
||||
use MediaWiki\MediaWikiServices;
|
||||
|
||||
return [
|
||||
'Description2.DescriptionProvider' => static function (
|
||||
MediaWikiServices $services
|
||||
): DescriptionProvider {
|
||||
return new SimpleDescriptionProvider();
|
||||
// The provider implementation is determined by the $wgDescriptionAlgorithm variable.
|
||||
$class = $services->getMainConfig()->get( 'DescriptionAlgorithm' );
|
||||
return new $class( $services->getMainConfig() );
|
||||
},
|
||||
];
|
||||
|
|
|
@ -2,7 +2,14 @@
|
|||
|
||||
namespace MediaWiki\Extension\Description2;
|
||||
|
||||
use Config;
|
||||
|
||||
class SimpleDescriptionProvider implements DescriptionProvider {
|
||||
/**
|
||||
* @param Config $config
|
||||
*/
|
||||
public function __construct( Config $config ) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts description from the HTML representation of a page.
|
||||
|
|
Loading…
Reference in a new issue