nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

WatchWebsite module: !unwatch work, !watch better parse URLs

Browse Source
This commit is contained in:
Némunaire 2012-10-15 02:11:24 +02:00
parent 28dee24b5a
commit 1b5b5af60b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/watchWebsite/__init__.py
View File

@ -45,11 +45,11 @@ def start_watching(site):
def explore_url(url): def explore_url(url):
return re.match("^(http://)?([^/]+)(/.*)$", url) return re.match("^(http://)?([^/:]+)(/.*)$", url)
def found_site(s, p): def found_site(s, p):
for site in DATAS: for site in DATAS.getNodes("watch"):
if site["server"] == s and site["page"] == p: if site is not None and site["server"] == s and site["page"] == p:
return site return site
return None return None
@ -64,8 +64,15 @@ def del_site(msg):
if site is not None and (msg.sender == site["sender"] or msg.is_owner): if site is not None and (msg.sender == site["sender"] or msg.is_owner):
CONTEXT.del_event(site["evt_id"]) CONTEXT.del_event(site["evt_id"])
DATAS.delChild(site) DATAS.delChild(site)
save()
return Response(msg.sender, "je ne surveille désormais plus cette URL.", return Response(msg.sender, "je ne surveille désormais plus cette URL.",
channel=msg.channel, nick=msg.nick) channel=msg.channel, nick=msg.nick)
elif site is None:
return Response(msg.sender, "je ne surveillais pas cette URL, impossible de la supprimer.",
channel=msg.channel, nick=msg.nick)
else:
return Response(msg.sender, "Vous ne pouvez pas supprimer cette URL.",
channel=msg.channel, nick=msg.nick)
return Response(msg.sender, "je ne surveillais pas cette URL pour vous.", return Response(msg.sender, "je ne surveillais pas cette URL pour vous.",
channel=msg.channel, nick=msg.nick) channel=msg.channel, nick=msg.nick)