PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-04-27 13:31:10 -05:00
Code Issues Projects Releases Wiki Activity

Wikifetch: refactor text fetching, fix listing disambig results

Browse Source
This commit is contained in:
James Lu 2017-09-01 18:04:20 -07:00
parent 9986babd2e
commit 08d8f48db5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Wikifetch/plugin.py
View File

@ -180,13 +180,20 @@ class Wikifetch(callbacks.Plugin):
# If any of the above post-processing tricks fail, just ignore # If any of the above post-processing tricks fail, just ignore
pass pass
text_content = tree
if use_mw_parsing:
text_content = tree.xpath("//div[@class='mw-parser-output']") or tree.xpath("//div[@id='mw-content-text']")
if text_content:
text_content = text_content[0]
self.log.debug('Wikifetch: Using %s as text_content', text_content)
# check if it's a disambiguation page # check if it's a disambiguation page
disambig = tree.xpath('//table[@id="disambigbox"]') or \ disambig = tree.xpath('//table[@id="disambigbox"]') or \
tree.xpath('//table[@id="setindexbox"]') or \ tree.xpath('//table[@id="setindexbox"]') or \
tree.xpath('//div[contains(@class, "disambig")]') # Wikia (2017-01-27) tree.xpath('//div[contains(@class, "disambig")]') # Wikia (2017-01-27)
if disambig: if disambig:
reply += format(_('%u is a disambiguation page. '), addr) reply += format(_('%u is a disambiguation page. '), addr)
disambig = tree.xpath('//div[@id="bodyContent"]/div/ul/li') disambig = text_content.xpath('./ul/li')
disambig_results = [] disambig_results = []
for item in disambig: for item in disambig:
@ -206,12 +213,8 @@ class Wikifetch(callbacks.Plugin):
elif 'ns-talk' in tree.find("body").attrib.get('class', ''): elif 'ns-talk' in tree.find("body").attrib.get('class', ''):
reply += format(_('This article appears to be a talk page: %u'), addr) reply += format(_('This article appears to be a talk page: %u'), addr)
else: else:
if use_mw_parsing: # Get the first paragraph as text.
# As of 2017-06-03, Wikipedia has put its text content under a new "mw-parser-output" div, while p = text_content.xpath("./p[1]")
# other sites (e.g. Wikia) still have it directly under "mw-content-text".
p = tree.xpath("//div[@id='mw-content-text']/p[1]") or tree.xpath("//div[@class='mw-parser-output']/p[1]")
else: # Don't look for MediaWiki-specific tags if MediaWiki parsing is disabled
p = tree.xpath("//p[1]")
if len(p) == 0 or 'wiki/Special:Search' in addr: if len(p) == 0 or 'wiki/Special:Search' in addr:
if 'wikipedia:wikiproject' in addr.lower(): if 'wikipedia:wikiproject' in addr.lower():
reply += format(_('This page appears to be a WikiProject page, ' reply += format(_('This page appears to be a WikiProject page, '