From ea4457fc73d8a9af3be5a465598440227cb902af Mon Sep 17 00:00:00 2001 From: Myned Date: Sun, 31 Dec 2017 22:11:37 -0500 Subject: [PATCH] Temporary fix for gapi errors --- src/cogs/music.py | 68 +++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/cogs/music.py b/src/cogs/music.py index 6f44964..7a77c81 100644 --- a/src/cogs/music.py +++ b/src/cogs/music.py @@ -9,9 +9,9 @@ import discord as d from discord import errors as err from discord.ext import commands as cmds from discord.ext.commands import errors as errext -import gmusicapi as gpm -import googleapiclient as gapic -import apiclient as apic +# import gmusicapi as gpm +# import googleapiclient as gapic +# import apiclient as apic from misc import exceptions as exc from misc import checks @@ -20,37 +20,37 @@ from utils import utils as u class Music: - def __init__(self, bot): - self.bot = bot - - self.yt_service = apic.discovery.build('youtube', 'v3', developerKey=u.secrets['client_secrets']['client_secret']) - - @cmds.group(aliases=['pl'], brief='(G) Play music', description='Play music from YouTube, Soundcloud, or Google Play Music') - async def play(self, ctx): - print(ctx.invoked_subcommand) - - @play.command(name='youtube', aliases=['you', 'tube', 'yt', 'y']) - async def _play_youtube(self, ctx, *videos): - try: - if not videos: - raise exc.MissingArgument - - vids = [] - - for video in videos: - if 'http' in video and 'youtube' in video: - vids.append(parse.parse_qs(parse.urlparse(video).query)['v'][0]) - else: - vids.append(video) - - print(vids) - - response = self.yt_service.videos().list(part='snippet', id=','.join(vids)).execute() - pprint(response) - - except exc.MissingArgument: - await ctx.send('**Invalid youtube url or ID**', delete_after=7) - await ctx.message.add_reaction('\N{CROSS MARK}') + # def __init__(self, bot): + # self.bot = bot + # + # self.yt_service = apic.discovery.build('youtube', 'v3', developerKey=u.secrets['client_secrets']['client_secret']) + # + # @cmds.group(aliases=['pl'], brief='(G) Play music', description='Play music from YouTube, Soundcloud, or Google Play Music') + # async def play(self, ctx): + # print(ctx.invoked_subcommand) + # + # @play.command(name='youtube', aliases=['you', 'tube', 'yt', 'y']) + # async def _play_youtube(self, ctx, *videos): + # try: + # if not videos: + # raise exc.MissingArgument + # + # vids = [] + # + # for video in videos: + # if 'http' in video and 'youtube' in video: + # vids.append(parse.parse_qs(parse.urlparse(video).query)['v'][0]) + # else: + # vids.append(video) + # + # print(vids) + # + # response = self.yt_service.videos().list(part='snippet', id=','.join(vids)).execute() + # pprint(response) + # + # except exc.MissingArgument: + # await ctx.send('**Invalid youtube url or ID**', delete_after=7) + # await ctx.message.add_reaction('\N{CROSS MARK}') @play.command(name='googleplaymusic', aliases=['googleplay', 'googlemusic', 'playmusic', 'play', 'gpm']) async def _play_googleplaymusic(self, ctx, query):