Added Youtube info support

1 files changed, 16 insertions, 13 deletions

diff --git a/src/modules/youtube.py b/src/modules/youtube.py
index f031760..916ef79 100644
--- a/src/modules/youtube.py
+++ b/src/modules/youtube.py
@@ -1,5 +1,4 @@
 import asyncio
-import json
 import re
 
 import discord
@@ -10,10 +9,10 @@ import main
 client = None
 config = None
 
-YOUTUBE_VIDEOS_LIST = "https://www.googleapis.com/youtube/v3/videos?part=snippet%2CcontentDetails%2Cstatistics&id=%s" \
-                      "&key="
+YOUTUBE_VIDEOS_LIST = "https://www.googleapis.com/youtube/v3/videos?part=snippet%2CcontentDetails%2Cstatistics&id={" \
+                      "}&key="
 
-YOUTUBE_CHANNEL = "https://www.googleapis.com/youtube/v3/channels?part=snippet&id=%s&fields=items%2Fsnippet" \
+YOUTUBE_CHANNEL = "https://www.googleapis.com/youtube/v3/channels?part=snippet&id={}&fields=items%2Fsnippet" \
                   "%2Fthumbnails&key="
 
 
@@ -30,24 +29,26 @@ def timeformat(seconds):
 @asyncio.coroutine
 def get_youtube_info(args, author, channel, message):
     print("IN HERE")
-    regex = re.compile(r"https?://(www\.)?(youtube\.com/watch/?\?v=|youtu\.be/)(?P<id>[a-z\-_]+)")
+    regex = re.compile(r"^https?://(www\.)?(youtube\.com/watch/?\?v=|youtu\.be/)(?P<id>[a-z\-_0-9]+)$", re.IGNORECASE)
     id = regex.search(args[0]).group("id")
-    json_data = json.loads(requests.get(YOUTUBE_VIDEOS_LIST % id))
+    json_data = requests.get(YOUTUBE_VIDEOS_LIST.format(id)).json()
+    print(json_data)
     entry = json_data['items'][0]
-    content_details = json_data['contentDetails']
+    content_details = entry['contentDetails']
+    statistics = entry['statistics']
     snippet = entry['snippet']
     title = snippet['title']
     published_at = snippet['publishedAt']
     uploaded_by = snippet['channelTitle']
     uploader_id = snippet['channelId']
-    uploader_json = json.loads(requests.get(YOUTUBE_CHANNEL % uploader_id))
+    uploader_json = requests.get(YOUTUBE_CHANNEL.format(uploader_id)).json()
     uploader_icon = uploader_json['items'][0]['snippet']['thumbnails']['default']
     keywords = ', '.join(snippet['tags'])
     description = snippet['description']
-    thumbnail = snippet['thumbnail']['default']['url']
-    likes = content_details['likeCount']
-    dislikes = content_details['dislikeCount']
-    views = content_details['viewCount']
+    thumbnail = snippet['thumbnails']['default']['url']
+    likes = statistics['likeCount']
+    dislikes = statistics['dislikeCount']
+    views = statistics['viewCount']
     duration = content_details['duration'].replace("PT", "").replace("S", "").replace("M", ":")
     url = args[0]
     embed = discord.Embed(title=title,
@@ -59,7 +60,7 @@ def get_youtube_info(args, author, channel, message):
     embed.add_field(name="Published at", value=published_at)
     embed.add_field(name="Keywords", value=keywords)
     embed.add_field(name="Duration", value=duration)
-    embed.add_field(name="Ratings", value="+%d;-%d;ratio %.2f" % (likes, dislikes, likes / dislikes))
+    embed.add_field(name="Ratings", value="+%s;-%s;ratio %.2f" % (likes, dislikes, int(likes) / int(dislikes)))
     embed.add_field(name="Views", value=str(views))
     yield from client.send_message(channel, embed=embed)
 
@@ -67,8 +68,10 @@ def get_youtube_info(args, author, channel, message):
 def setup(default_cmds, cclient, cconfig):
     global client
     global config
+    global YOUTUBE_CHANNEL
     global YOUTUBE_VIDEOS_LIST
     config = cconfig
     default_cmds += [get_youtube_info]
     client = cclient
     YOUTUBE_VIDEOS_LIST += config.google['developer-token']
+    YOUTUBE_CHANNEL += config.google['developer-token']