Merge branch 'master' of localhost:erebus

diff --git a/modules/youtube.py b/modules/youtube.py
index 98145b5b94e92c37cde688cbdb629cccf9050c85..c40bf177a6ee32b8e6f6ac92db307c321b202cff 100644 (file)
--- a/modules/youtube.py
+++ b/modules/youtube.py
@@ -18,12 +18,15 @@ modstop = lib.modstop
 
 # module code
 import re
+import json
 import urllib2
+import urlparse
 import HTMLParser
 from BeautifulSoup import BeautifulSoup
 
 checkfor = "youtube"
 url_regex = re.compile('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+')
+yturl_regex = re.compile('(http|ftp|https):\/\/([\w\-_]+(?:(?:\.[\w\-_]+)+))([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?')
 
 @lib.hooknum("PRIVMSG")
 def privmsg_hook(bot, line):
@@ -37,7 +40,17 @@ def privmsg_hook(bot, line):
 
        for url in url_regex.findall(linetx):
                if checkfor in url:
-                       html_parser = HTMLParser.HTMLParser()
-                       respdata = urllib2.urlopen(url).read()
-                       soup = BeautifulSoup(respdata)
-                       bot.msg(line.split()[2], BeautifulSoup(soup.title.string, convertEntities=BeautifulSoup.HTML_ENTITIES))
+                       url_data = urlparse.urlparse(url)
+                       query = urlparse.parse_qs(url_data.query)
+                       video = query["v"][0]
+                       api_url = 'http://gdata.youtube.com/feeds/api/videos/%s?alt=json&v=2' % video
+                       try:
+                               respdata = urllib2.urlopen(api_url).read()
+                               video_info = json.loads(respdata)
+
+                               title = video_info['entry']['title']["$t"]
+                               author = video_info['entry']['author'][0]['name']['$t']
+
+                               bot.msg(line.split()[2], "Youtube: %s (%s)" % (title, author))
+                       except:
+                               pass