urls - remove duplicate effort

[erebus.git] / modules / urls.py

diff --git a/modules/urls.py b/modules/urls.py
index fbffaf5ff1d4b266eb7b6b0a00b423ad8a0af698..0171fe4c2bde6772c3a670744c9c501a53a3bd8c 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -1,4 +1,4 @@
-# Erebus IRC bot - Author: Erebus Team
+# Erebus IRC bot - Author: Conny Sjoblom
 # vim: fileencoding=utf-8
 # URL Checker
 # This file is released into the public domain; see http://unlicense.org/
@@ -23,20 +23,21 @@ modstop = lib.modstop
 # module code
 import sys
 if sys.version_info.major < 3:
+       stringbase = basestring
        import urllib2
        import urlparse
        import HTMLParser
+       html = HTMLParser.HTMLParser()
        from BeautifulSoup import BeautifulSoup
 else:
+       stringbase = str
        import urllib.request as urllib2
        import urllib.parse as urlparse
-       import html.parser as HTMLParser
+       import html
        from bs4 import BeautifulSoup
 
 import re, json, datetime
 
-html_parser = HTMLParser.HTMLParser()
-
 hostmask_regex = re.compile(r'^(.*)!(.*)@(.*)$')
 
 def parser_hostmask(hostmask):
@@ -87,9 +88,12 @@ def process_line(line):
                                        num_found += 1
                                        if num_found > limit:
                                                return responses
-                                       resp = action(match)
+                                       if isinstance(match, stringbase):
+                                               resp = action(match)
+                                       else:
+                                               resp = action(*match)
                                        if resp is not None:
-                                               responses.append("%s: %s" % (prefix, action(match)))
+                                               responses.append("%s: %s" % (prefix, resp))
        return responses
 
 @lib.hooknum("PRIVMSG")
@@ -111,7 +115,7 @@ def privmsg_hook(bot, textline):
                        bot.msg(chan, ' | '.join(responses), True)
 
 def unescape(line):
-       return re.sub('\s+', ' ', html_parser.unescape(line))
+       return re.sub('\s+', ' ', html.unescape(line))
 
 def gotspotify(type, track):
        url = 'http://ws.spotify.com/lookup/1/?uri=spotify:%s:%s' % (type, track)
@@ -211,18 +215,23 @@ def goturl(url):
        opener = urllib2.build_opener(SmartRedirectHandler())
        try:
                soup = BeautifulSoup(opener.open(request, timeout=0.5))
-               return unescape('%s' % (soup.title.string))
+               if soup.title:
+                       return unescape('%s' % (soup.title.string))
+               else:
+                       return None
        except urllib2.HTTPError as e:
                return 'Error: %s %s' % (e.code, e.reason)
+       except urllib2.URLError as e:
+               return 'Error: %s' % (e.reason)
        except Exception as e:
-               return 'Error: %r' % (e.message)
+               return 'Error: %r' % (e.args)
 
 url_regex = (
        re.compile(r'https?://[^/\s]+\.[^/\s]+(?:/\S+)?'),
 )
 spotify_regex = (
        re.compile(r'spotify:(?P<type>\w+):(?P<track_id>\w{22})'),
-       re.compile(r'https?://open.spotify.com/(?P<type>\w+)/(?P<track_id>\w+)')
+       re.compile(r'https?://open\.spotify\.com/(?P<type>\w+)/(?P<track_id>\w+)')
 )
 youtube_regex = (
        re.compile(r'https?://(?:www\.)?youtube\.com/watch\?[a-zA-Z0-9=&_\-]+'),