Merge pull request #66 from FurCode/python3.4

youtube.py - Updated for the v3 API (users will need a new API key to use this command)

Author: dmptrluke

config.default.json

@@ -79,7 +79,8 @@
         "wunderground": "",
         "googletranslate": "",
         "rdio_key": "",
-        "rdio_secret": ""
+        "rdio_secret": "",
+        "google_dev_key": ""
     },
     "database": "sqlite:///cloudbot.db",
     "plugin_loading": {

plugins/youtube.py

@@ -1,5 +1,6 @@
 import re
 import time
+import isodate
 
 import bs4
 import requests
@@ -11,109 +12,119 @@
 
 youtube_re = re.compile(r'(?:youtube.*?(?:v=|/v/)|youtu\.be/|yooouuutuuube.*?id=)([-_a-zA-Z0-9]+)', re.I)
 
-base_url = 'http://gdata.youtube.com/feeds/api/'
-api_url = base_url + 'videos/{}?v=2&alt=jsonc'
-search_api_url = base_url + 'videos?v=2&alt=jsonc&max-results=1'
+base_url = 'https://www.googleapis.com/youtube/v3/'
+api_url = base_url + 'videos?part=contentDetails%2C+snippet%2C+statistics&id={}&key={}'
+search_api_url = base_url + 'search?part=id&maxResults=1'
+playlist_api_url = base_url + 'playlists?part=snippet%2CcontentDetails%2Cstatus'
 video_url = "http://youtu.be/%s"
 
 
-def get_video_description(video_id):
-    json = requests.get(api_url.format(video_id)).json()
+def get_video_description(video_id, key):
+    json = requests.get(api_url.format(video_id, key)).json()
 
     if json.get('error'):
         return
 
-    data = json['data']
+    data = json['items']
+    snippet = data[0]['snippet']
+    statistics = data[0]['statistics']
+    content_details = data[0]['contentDetails']
 
-    out = '\x02{}\x02'.format(data['title'])
+    out = '\x02{}\x02'.format(snippet['title'])
 
-    if not data.get('duration'):
+    if not content_details.get('duration'):
         return out
 
-    length = data['duration']
-    out += ' - length \x02{}\x02'.format(timeformat.format_time(length, simple=True))
+    length = isodate.parse_duration(content_details['duration'])
+    out += ' - length \x02{}\x02'.format(timeformat.format_time(int(length.total_seconds()), simple=True))
+    totalvotes = float(statistics['likeCount']) + float(statistics['dislikeCount'])
 
-    if 'ratingCount' in data:
+    if totalvotes != 0:
         # format
-        likes = pluralize(int(data['likeCount']), "like")
-        dislikes = pluralize(data['ratingCount'] - int(data['likeCount']), "dislike")
+        likes = pluralize(int(statistics['likeCount']), "like")
+        dislikes = pluralize(int(statistics['dislikeCount']), "dislike")
 
-        percent = 100 * float(data['likeCount']) / float(data['ratingCount'])
+        percent = 100 * float(statistics['likeCount']) / totalvotes
         out += ' - {}, {} (\x02{:.1f}\x02%)'.format(likes,
                                                     dislikes, percent)
 
-    if 'viewCount' in data:
-        views = data['viewCount']
+    if 'viewCount' in statistics:
+        views = int(statistics['viewCount'])
         out += ' - \x02{:,}\x02 view{}'.format(views, "s"[views == 1:])
 
-    try:
-        json = requests.get(base_url + "users/{}?alt=json".format(data["uploader"])).json()
-        uploader = json["entry"]["author"][0]["name"][
-            "$t"]
-    except:
-        uploader = data["uploader"]
+    uploader = snippet['channelTitle']
 
-    upload_time = time.strptime(data['uploaded'], "%Y-%m-%dT%H:%M:%S.000Z")
+    upload_time = time.strptime(snippet['publishedAt'], "%Y-%m-%dT%H:%M:%S.000Z")
     out += ' - \x02{}\x02 on \x02{}\x02'.format(uploader,
                                                 time.strftime("%Y.%m.%d", upload_time))
 
-    if 'contentRating' in data:
+    if 'contentRating' in content_details:
         out += ' - \x034NSFW\x02'
 
     return out
 
 
+@hook.on_start()
+def load_key(bot):
+    global dev_key
+    dev_key = bot.config.get("api_keys", {}).get("google_dev_key")
+
+
 @hook.regex(youtube_re)
-def youtube_url(match):
-    return get_video_description(match.group(1))
+def youtube_url(match, bot):
+    return get_video_description(match.group(1), dev_key)
 
 
 @hook.command("youtube", "you", "yt", "y")
 def youtube(text):
     """youtube <query> -- Returns the first YouTube search result for <query>."""
-    json = requests.get(search_api_url, params={"q": text}).json()
+    json = requests.get(search_api_url, params={"q": text, "key": dev_key}).json()
 
     if 'error' in json:
-        return 'error performing search'
+        return 'Error performing search.'
 
-    if json['data']['totalItems'] == 0:
-        return 'no results found'
+    if json['pageInfo']['totalResults'] == 0:
+        return 'No results found.'
 
-    video_id = json['data']['items'][0]['id']
+    video_id = json['items'][0]['id']['videoId']
 
-    return get_video_description(video_id) + " - " + video_url % video_id
+    return get_video_description(video_id, dev_key) + " - " + video_url % video_id
 
 
 @hook.command("youtime", "ytime")
 def youtime(text):
     """youtime <query> -- Gets the total run time of the first YouTube search result for <query>."""
-    json = requests.get(search_api_url, params={"q": text}).json()
+    json = requests.get(search_api_url, params={"q": text, "key": dev_key}).json()
 
     if 'error' in json:
-        return 'error performing search'
+        return 'Error performing search.'
 
-    if json['data']['totalItems'] == 0:
-        return 'no results found'
+    if json['pageInfo']['totalResults'] == 0:
+        return 'No results found.'
 
-    video_id = json['data']['items'][0]['id']
-    json = requests.get(api_url.format(video_id)).json()
+    video_id = json['items'][0]['id']['videoId']
+    json = requests.get(api_url.format(video_id, dev_key)).json()
 
     if json.get('error'):
         return
-    data = json['data']
+    data = json['items']
+    snippet = data[0]['snippet']
+    content_details = data[0]['contentDetails']
+    statistics = data[0]['statistics']
 
-    if not data.get('duration'):
+    if not content_details.get('duration'):
         return
 
-    length = data['duration']
-    views = data['viewCount']
-    total = int(length * views)
+    length = isodate.parse_duration(content_details['duration'])
+    l_sec = int(length.total_seconds())
+    views = int(statistics['viewCount'])
+    total = int(l_sec * views)
 
-    length_text = timeformat.format_time(length, simple=True)
+    length_text = timeformat.format_time(l_sec, simple=True)
     total_text = timeformat.format_time(total, accuracy=8)
 
     return 'The video \x02{}\x02 has a length of {} and has been viewed {:,} times for ' \
-           'a total run time of {}!'.format(data['title'], length_text, views,
+           'a total run time of {}!'.format(snippet['title'], length_text, views,
                                             total_text)
 
 
@@ -123,13 +134,17 @@ def youtime(text):
 @hook.regex(ytpl_re)
 def ytplaylist_url(match):
     location = match.group(4).split("=")[-1]
-    try:
-        request = requests.get("https://www.youtube.com/playlist?list=" + location)
-        soup = bs4.BeautifulSoup(request.text, 'lxml')
-    except Exception:
-        return "\x034\x02Invalid response."
-    title = soup.find('title').text.split('-')[0].strip()
-    author = soup.find('img', {'class': 'channel-header-profile-image'})['title']
-    num_videos = soup.find('ul', {'class': 'header-stats'}).findAll('li')[0].text.split(' ')[0]
-    views = soup.find('ul', {'class': 'header-stats'}).findAll('li')[1].text.split(' ')[0]
-    return "\x02{}\x02 - \x02{}\x02 views - \x02{}\x02 videos - \x02{}\x02".format(title, views, num_videos, author)
+    json = requests.get(playlist_api_url, params={"id": location, "key": dev_key}).json()
+
+    if 'error' in json:
+        return 'Error looking up playlist.'
+
+    data = json['items']
+    snippet = data[0]['snippet']
+    content_details = data[0]['contentDetails']
+
+    title = snippet['title']
+    author = snippet['channelTitle']
+    num_videos = int(content_details['itemCount'])
+    count_videos = ' - \x02{:,}\x02 video{}'.format(num_videos, "s"[num_videos == 1:])
+    return "\x02{}\x02 {} - \x02{}\x02".format(title, count_videos, author)

requirements.txt

@@ -15,3 +15,4 @@ tweepy
 pyenchant
 pythonwhois
 imgurpython
+isodate