urls - bugfixes

[erebus.git] / modules / urls.py

diff --git a/modules/urls.py b/modules/urls.py
index bfa8b57f0830691d3daeab67ad364d5d81135ca3..4c4bf6b54799926a80c0cd825c9c79983036ba3d 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -6,8 +6,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1], # compatible module API versions
-       'depends': [], # other modules required to work properly?
+       'compatible': [0],
+       'depends': [],
+       'softdeps': [],
 }
 
 # http://embed.ly/tools/generator
@@ -25,10 +26,10 @@ from BeautifulSoup import BeautifulSoup
 html_parser = HTMLParser.HTMLParser()
 
 hostmask_regex = re.compile(r'^(.*)!(.*)@(.*)$')
-url_regex = re.compile(r'((?:https?://|spotify:)[^\s]+)')
+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{22})')
+       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=&_\-]+'),
@@ -86,23 +87,9 @@ def privmsg_hook(bot, textline):
 
        for match in url_regex.findall(line):
                if match:
-                       if 'open.spotify.com' in match or 'spotify:' in match:
-                               for r in spotify_regex:
-                                       for sptype, track in r.findall(match):
-                                               bot.msg(chan, unescape(gotspotify(sptype, track)))
-
-                       elif 'youtube.com' in match or 'youtu.be' in match:
-                               for r in youtube_regex:
-                                       for url in r.findall(match):
-                                               bot.msg(chan, unescape(gotyoutube(url)))
-
-                       elif 'twitch.tv' in match:
-                               for r in twitch_regex:
-                                       for uri in r.findall(match):
-                                               bot.msg(chan, unescape(gottwitch(uri)))
-
-                       else:
-                               bot.msg(chan, unescape(goturl(match)))
+                       response = goturl(match)
+                       if response is not None:
+                               bot.msg(chan, response)
 
 def unescape(line):
        return html_parser.unescape(line)
@@ -124,13 +111,13 @@ def gotspotify(type, track):
                minutes = int(length)/60
                seconds =  int(length)%60
 
-               return 'Track: %s - %s / %s %s:%.2d %2d%%' % (artist_name, name, album_name, minutes, seconds, popularity)
+               return unescape('Track: %s - %s / %s %s:%.2d %2d%%' % (artist_name, name, album_name, minutes, seconds, popularity))
 
        elif lookup_type == 'album':
                album_name = soup.find('album').find('name').string
                artist_name = soup.find('artist').find('name').string
                released = soup.find('released').string
-               return 'Album: %s - %s - %s' % (artist_name, album_name, released)
+               return unescape('Album: %s - %s - %s' % (artist_name, album_name, released))
 
        else:
                return 'Unsupported type.'
@@ -147,7 +134,7 @@ def gotyoutube(url):
                title = video_info['entry']['title']["$t"]
                author = video_info['entry']['author'][0]['name']['$t']
 
-               return "Youtube: %s (%s)" % (title, author)
+               return unescape("Youtube: %s (%s)" % (title, author))
        except:
                pass
 
@@ -156,7 +143,7 @@ def gottwitch(uri):
                respdata = urllib2.urlopen(url).read()
                twitch = json.loads(respdata)
                try:
-                       return 'Twitch: %s (%s playing %s)' % (twitch[0]['channel']['status'], twitch[0]['channel']['login'], twitch[0]['channel']['meta_game'])
+                       return unescape('Twitch: %s (%s playing %s)' % (twitch[0]['channel']['status'], twitch[0]['channel']['login'], twitch[0]['channel']['meta_game']))
                except:
                        return 'Twitch: Channel offline.'
 
@@ -165,6 +152,6 @@ def goturl(url):
        opener = urllib2.build_opener(SmartRedirectHandler())
        try:
                soup = BeautifulSoup(opener.open(request, timeout=2))
-               return 'Title: %s' % soup.title.string
+               return unescape('Title: %s' % (soup.title.string))
        except:
-               return 'Invalid URL/Timeout'
+               return None