nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Fix some bugs in Wikipedia and WatchWebsite modules

Browse Source
This commit is contained in:
Némunaire 2012-11-08 13:25:51 +01:00
parent 17dd6961cf
commit f33768a853
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ddg/Wikipedia.py
View File

@ -33,7 +33,7 @@ class Wikipedia:
if c != "": if c != "":
yield c yield c
RGXP_p = re.compile(r"(<!--.*-->|<ref[^>]*/>|<ref[^>]*>[^>]*</ref>|<dfn[^>]*>[^>]*</dfn>|\{\{[^}]*\}\}|\[\[([^\[\]]*\[\[[^\]\[]*\]\])+[^\[\]]*\]\]|\{\{([^{}]*\{\{.*\}\}[^{}]*)+\}\}|\[\[[^\]|]+(\|[^\]\|]+)*\]\])|#\* ''" + "\n", re.I) RGXP_p = re.compile(r"(<!--.*-->|<ref[^>]*/>|<ref[^>]*>[^>]*</ref>|<dfn[^>]*>[^>]*</dfn>|\{\{[^{}]*\}\}|\[\[([^\[\]]*\[\[[^\]\[]*\]\])+[^\[\]]*\]\]|\{\{([^{}]*\{\{.*\}\}[^{}]*)+\}\}|\[\[[^\]|]+(\|[^\]\|]+)*\]\])|#\* ''" + "\n", re.I)
RGXP_l = re.compile(r'\{\{(nobr|lang\|[^|}]+)\|([^}]+)\}\}', re.I) RGXP_l = re.compile(r'\{\{(nobr|lang\|[^|}]+)\|([^}]+)\}\}', re.I)
RGXP_m = re.compile(r'\{\{pron\|([^|}]+)\|[^}]+\}\}', re.I) RGXP_m = re.compile(r'\{\{pron\|([^|}]+)\|[^}]+\}\}', re.I)
RGXP_t = re.compile("==+ *([^=]+) *=+=\n+([^\n])", re.I) RGXP_t = re.compile("==+ *([^=]+) *=+=\n+([^\n])", re.I)

7
modules/watchWebsite/__init__.py
View File

@ -146,7 +146,6 @@ def alert_change(content, site):
diff = site["_lastpage"].diff(page) diff = site["_lastpage"].diff(page)
if len(diff) > 0: if len(diff) > 0:
site["_lastpage"] = page site["_lastpage"] = page
print_debug("[%s] Page differ!" % getHost(site["url"]))
diff.reverse() diff.reverse()
for d in diff: for d in diff:
site.setIndex("term", "category") site.setIndex("term", "category")
@ -154,11 +153,11 @@ def alert_change(content, site):
if len(categories) > 0: if len(categories) > 0:
if d.category is None or d.category not in categories: if d.category is None or d.category not in categories:
format_response(site, link, categories[""]["part"]) format_response(site, d.link, categories[""]["part"], d.title)
else: else:
format_response(site, link, categories[d.category]["part"]) format_response(site, d.link, categories[d.category]["part"], d.title)
else: else:
format_response(site, link, urllib.parse.unquote(d.title)) format_response(site, d.link, urllib.parse.unquote(d.title))
else: else:
start_watching(site) start_watching(site)
return #Stop here, no changes, so don't save return #Stop here, no changes, so don't save