X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/a83e1f9c890a4d639765017759de49d496c1539b..c6880712495b23e15b6fdbee48368322856a9e95:/modules/urls.py diff --git a/modules/urls.py b/modules/urls.py index 9e8e3e2..4c4bf6b 100644 --- a/modules/urls.py +++ b/modules/urls.py @@ -6,10 +6,13 @@ 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 + # preamble import modlib lib = modlib.modlib(__name__) @@ -17,20 +20,22 @@ modstart = lib.modstart modstop = lib.modstop # module code -import re, json, urllib2, urlparse, HTMLParser +import re, urllib2, urlparse, json, HTMLParser from BeautifulSoup import BeautifulSoup -hostmask_regex = re.compile(r'^(.*)!(.*)@(.*)$') +html_parser = HTMLParser.HTMLParser() +hostmask_regex = re.compile(r'^(.*)!(.*)@(.*)$') +url_regex = re.compile(r'https?://[^/\s]+\.[^/\s]+(?:/\S+)?') spotify_regex = ( re.compile(r'spotify:(?P\w+):(?P\w{22})'), - re.compile(r'http://open.spotify.com/(?P\w+)/(?P\w{22})') + re.compile(r'https?://open.spotify.com/(?P\w+)/(?P\w+)') ) youtube_regex = ( re.compile(r'https?://(?:www\.)?youtube\.com/watch\?[a-zA-Z0-9=&_\-]+'), ) twitch_regex = ( - re.compile('(http|ftp|https):\/\/([\w\-_]+(?:(?:\.[\w\-_]+)+))([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?'), #TODO + re.compile(r'https?:\/\/(?:www\.)?twitch.tv\/([A-Za-z0-9]*)'), ) def parser_hostmask(hostmask): @@ -57,39 +62,44 @@ def parser_hostmask(hostmask): 'host': host } +class SmartRedirectHandler(urllib2.HTTPRedirectHandler): + def http_error_301(self, req, fp, code, msg, headers): + result = urllib2.HTTPRedirectHandler.http_error_301( + self, req, fp, code, msg, headers) + result.status = code + return result + + def http_error_302(self, req, fp, code, msg, headers): + result = urllib2.HTTPRedirectHandler.http_error_302( + self, req, fp, code, msg, headers) + result.status = code + return result + @lib.hooknum("PRIVMSG") -def privmsg_hook(bot, line): - sender = parser_hostmask(line[1:line.find(' ')]) +def privmsg_hook(bot, textline): + user = parser_hostmask(textline[1:textline.find(' ')]) + chan = textline.split()[2] try: - linetx = line.split(None, 3)[3][1:] + line = textline.split(None, 3)[3][1:] except IndexError: - linetx = '' - - chan = line.split()[2] - - if 'open.spotify.com' in line or 'spotify:' in line: - for r in spotify_regex: - for sptype, track in r.findall(linetx): - bot.msg(chan, gotspotify(sptype, track)) - - elif 'youtube.com' in line or 'youtu.be' in line: - print "got youtube!" - for r in youtube_regex: - for url in r.findall(linetx): - bot.msg(chan, gotyoutube(url)) + line = '' - elif 'twitch.tv' in line: pass #TODO fix twitch - - else: pass #TODO generic checker + for match in url_regex.findall(line): + if match: + response = goturl(match) + if response is not None: + bot.msg(chan, response) +def unescape(line): + return html_parser.unescape(line) def gotspotify(type, track): url = 'http://ws.spotify.com/lookup/1/?uri=spotify:%s:%s' % (type, track) xml = urllib2.urlopen(url).read() - soup = BeautifulSoup(xml) + soup = BeautifulSoup(xml, convertEntities=BeautifulSoup.HTML_ENTITIES) lookup_type = soup.contents[2].name - + if lookup_type == 'track': name = soup.find('name').string album_name = soup.find('album').find('name').string @@ -100,15 +110,15 @@ def gotspotify(type, track): length = float(soup.find('length').string) 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.' @@ -124,28 +134,24 @@ 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 - -def gottwitch(url): - return "" - #FIXME: +def gottwitch(uri): + url = 'http://api.justin.tv/api/stream/list.json?channel=%s' % uri.split('/')[0] + respdata = urllib2.urlopen(url).read() + twitch = json.loads(respdata) + try: + 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.' + +def goturl(url): + request = urllib2.Request(url) + opener = urllib2.build_opener(SmartRedirectHandler()) try: - linetx = line.split(None, 3)[3][1:] - except IndexError: - linetx = '' - - if checkfor not in line: - return # doesn't concern us - - for p, h, c in url_regex.findall(linetx): - if checkfor in h: - url = 'http://api.justin.tv/api/stream/list.json?channel=%s' % c[1:] - respdata = urllib2.urlopen(url).read() - twitch = json.loads(respdata) - try: - bot.msg(line.split()[2], 'Twitch: %s (%s playing %s)' % (twitch[0]['channel']['status'], twitch[0]['channel']['login'], twitch[0]['channel']['meta_game'])) - except: - bot.msg(line.split()[2], 'Twitch: Channel offline.') + soup = BeautifulSoup(opener.open(request, timeout=2)) + return unescape('Title: %s' % (soup.title.string)) + except: + return None