From 1f794ffd6fe4755cb8f3e9f3c41bd0ac92f98bff Mon Sep 17 00:00:00 2001 From: Myned Date: Thu, 12 Oct 2017 22:27:21 -0400 Subject: [PATCH] autopep8 and isort --- src/main/cogs/tools.py | 58 ++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/src/main/cogs/tools.py b/src/main/cogs/tools.py index 875b88d..ace1ba5 100644 --- a/src/main/cogs/tools.py +++ b/src/main/cogs/tools.py @@ -1,29 +1,33 @@ import asyncio import datetime as dt -import discord -import httplib2 import mimetypes import os -import requests_oauthlib as ro import tempfile -import traceback +import traceback as tb import webbrowser + +import discord +import httplib2 +import requests_oauthlib as ro +from apiclient import http +from apiclient.discovery import build from discord.ext import commands +from oauth2client.client import flow_from_clientsecrets + #from run import config from cogs import booru -from misc import checks from misc import exceptions as exc +from misc import checks +from utils import utils as u from utils import formatter -from apiclient.discovery import build -from apiclient import http -from oauth2client.client import flow_from_clientsecrets youtube = None tempfile.tempdir = os.getcwd() command_dict = {} + class Utils: def __init__(self, bot): @@ -32,35 +36,25 @@ class Utils: @commands.command(name='last', aliases=['l', ','], brief='Reinvokes last command', description='Reinvokes previous command executed', hidden=True) async def last_command(self, ctx): global command_dict - try: - if command_dict.get(str(ctx.message.author.id), {}).get('args', None) is not None: - args = command_dict.get(str(ctx.message.author.id), {})['args'] - print(command_dict) - await ctx.invoke(command_dict.get(str(ctx.message.author.id), {}).get('command', None), args) - except Exception: - await ctx.send(exc.base + '\n```' + traceback.format_exc(limit=1) + '```') - traceback.print_exc(limit=1) + + if command_dict.get(str(ctx.message.author.id), {}).get('args', None) is not None: + args = command_dict.get(str(ctx.message.author.id), {})['args'] + print(command_dict) + await ctx.invoke(command_dict.get(str(ctx.message.author.id), {}).get('command', None), args) # [prefix]ping -> Pong! @commands.command(aliases=['p'], brief='Pong!', description='Returns latency from bot to Discord servers, not to user') @checks.del_ctx() async def ping(self, ctx): global command_dict - try: - await ctx.send(ctx.message.author.mention + ' 🏓 `' + str(int(self.bot.latency * 1000)) + 'ms`', delete_after=5) - except Exception: - await ctx.send(exc.base + '\n```' + traceback.format_exc(limit=1) + '```') - traceback.print_exc(limit=1) + + await ctx.send(ctx.message.author.mention + ' 🏓 `' + str(int(self.bot.latency * 1000)) + 'ms`', delete_after=5) command_dict.setdefault(str(ctx.message.author.id), {}).update({'command': ctx.command}) @commands.command(aliases=['pre'], brief='List bot prefixes', description='Shows all used prefixes') @checks.del_ctx() async def prefix(self, ctx): - try: - await ctx.send('**Prefix:** `,`') - except Exception: - await ctx.send(exc.base + '\n```' + traceback.format_exc(limit=1) + '```') - traceback.print_exc(limit=1) + await ctx.send('**Prefix:** `{}`'.format(u.config['prefix'])) @commands.group(name=',send', aliases=[',s'], hidden=True) @commands.is_owner() @@ -71,6 +65,7 @@ class Utils: @send.command(name='guild', aliases=['g', 'server', 's']) async def send_guild(self, ctx, guild, channel, *message): await discord.utils.get(self.bot.get_all_channels(), guild__name=guild, name=channel).send(formatter.tostring(message)) + @send.command(name='user', aliases=['u', 'member', 'm']) async def send_user(self, ctx, user, *message): await discord.utils.get(self.bot.get_all_members(), id=int(user)).send(formatter.tostring(message)) @@ -78,12 +73,14 @@ class Utils: @commands.command(aliases=['authenticateupload', 'authupload', 'authup', 'auth']) async def authenticate_upload(self, ctx): global youtube - flow = flow_from_clientsecrets('client_secrets.json', scope='https://www.googleapis.com/auth/youtube.upload', login_hint='botmyned@gmail.com', redirect_uri='urn:ietf:wg:oauth:2.0:oob') + flow = flow_from_clientsecrets('client_secrets.json', scope='https://www.googleapis.com/auth/youtube.upload', + login_hint='botmyned@gmail.com', redirect_uri='urn:ietf:wg:oauth:2.0:oob') flow.params['access_type'] = 'offline' webbrowser.open_new_tab(flow.step1_get_authorize_url()) credentials = flow.step2_exchange(input('Authorization code: ')) youtube = build('youtube', 'v3', http=credentials.authorize(http.build_http())) print('Service built.') + @commands.command(aliases=['up', 'u', 'vid', 'v']) @checks.is_listed() async def upload(self, ctx): @@ -100,16 +97,15 @@ class Utils: await attachments[0].save(temp) else: raise exc.InvalidVideoFile(mime) - print('https://www.youtube.com/watch?v=' + youtube.videos().insert(part='snippet', body={'categoryId': '24', 'title': 'Test'}, media_body=http.MediaFileUpload(temp.name, chunksize=-1))) + print('https://www.youtube.com/watch?v=' + youtube.videos().insert(part='snippet', + body={'categoryId': '24', 'title': 'Test'}, media_body=http.MediaFileUpload(temp.name, chunksize=-1))) except exc.InvalidVideoFile as e: await ctx.send('❌ `' + str(e) + '` **not valid video type.**', delete_after=10) except exc.TooManyAttachments as e: await ctx.send('❌ `' + str(e) + '` **too many attachments.** Only one attachment is permitted to upload.', delete_after=10) except exc.MissingAttachment: await ctx.send('❌ **Missing attachment.**', delete_after=10) - except Exception: - await ctx.send(exc.base + '\n```' + traceback.format_exc(limit=1) + '```') - traceback.print_exc(limit=1) + @upload.error async def upload_error(self, ctx, error): pass