From 7699d00fa96a26c9da832dcda1827364ee36c856 Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Sun, 12 Aug 2018 14:00:04 -0500 Subject: [PATCH] Code cleanup and logging improvements --- BotConfig.py | 2 +- DatabaseModels.py | 14 +++++++------- DiscordHelperFunctions.py | 1 + Geoffrey.py | 3 ++- MinecraftAccountInfoGrabber.py | 4 +++- bot.py | 20 +++++++++++++------- cogs/Add_Commands.py | 1 + cogs/Admin_Commands.py | 9 +++++---- cogs/Delete_Commands.py | 1 + cogs/Edit_Commands.py | 1 + cogs/Search_Commands.py | 1 + tests/test_commands.py | 3 +-- tests/test_geoffreyDatabase.py | 6 ++---- tests/test_get_nickname.py | 1 + tests/test_minecraftInfoGrabber.py | 2 +- 15 files changed, 41 insertions(+), 28 deletions(-) diff --git a/BotConfig.py b/BotConfig.py index aaf7c7e..b26d0c1 100644 --- a/BotConfig.py +++ b/BotConfig.py @@ -1,5 +1,5 @@ -import configparser import codecs +import configparser def create_config(config): diff --git a/DatabaseModels.py b/DatabaseModels.py index e8f5a4d..81b1740 100644 --- a/DatabaseModels.py +++ b/DatabaseModels.py @@ -1,16 +1,16 @@ -from sqlalchemy import Column, Integer, String, ForeignKey, Enum, create_engine, exists -from sqlalchemy.orm import relationship, column_property, sessionmaker -from sqlalchemy.exc import IntegrityError, DataError -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.sql import expression import enum from difflib import SequenceMatcher -from BotConfig import bot_config +from sqlalchemy import Column, Integer, String, ForeignKey, Enum, create_engine, exists +from sqlalchemy.exc import IntegrityError, DataError +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import relationship, column_property, sessionmaker +from sqlalchemy.sql import expression + +from BotConfig import bot_config from BotErrors import * from MinecraftAccountInfoGrabber import * - SQL_Base = declarative_base() diff --git a/DiscordHelperFunctions.py b/DiscordHelperFunctions.py index 1238825..918a3e0 100644 --- a/DiscordHelperFunctions.py +++ b/DiscordHelperFunctions.py @@ -1,4 +1,5 @@ from itertools import zip_longest + from BotConfig import bot_config diff --git a/Geoffrey.py b/Geoffrey.py index a40ecdd..37f4e04 100644 --- a/Geoffrey.py +++ b/Geoffrey.py @@ -6,9 +6,10 @@ Created by: Joey Hines (ZeroHD) """ import logging import logging.handlers as handlers +from sys import stdout + import bot from BotConfig import bot_config -from sys import stdout def setup_logging(): diff --git a/MinecraftAccountInfoGrabber.py b/MinecraftAccountInfoGrabber.py index 8d38f68..73553f1 100644 --- a/MinecraftAccountInfoGrabber.py +++ b/MinecraftAccountInfoGrabber.py @@ -1,5 +1,7 @@ -import requests from json import JSONDecodeError + +import requests + from BotErrors import UsernameLookupFailed uuid_lookup_url = 'https://api.mojang.com/users/profiles/minecraft/{}' diff --git a/bot.py b/bot.py index 4e9c5b4..9204f27 100644 --- a/bot.py +++ b/bot.py @@ -1,13 +1,16 @@ -from BotErrors import * -from DatabaseModels import Player -from Commands import Commands -from discord.ext import commands -from discord import Game -from MinecraftAccountInfoGrabber import * -from BotConfig import * import asyncio import logging +from discord import Game +from discord.ext import commands +from discord.utils import oauth_url + +from BotConfig import * +from BotErrors import * +from Commands import Commands +from DatabaseModels import Player +from MinecraftAccountInfoGrabber import * + logger = logging.getLogger(__name__) description = ''' @@ -38,6 +41,9 @@ extensions = ['cogs.Add_Commands', @bot.event async def on_ready(): logger.info("%s Online, ID: %s", bot.user.name, bot.user.id) + info = await bot.application_info() + url = oauth_url(info.id) + logger.info("Bot url: %s", url) await bot.change_presence(game=Game(name=bot_config.status)) diff --git a/cogs/Add_Commands.py b/cogs/Add_Commands.py index 71e644e..bcc2380 100644 --- a/cogs/Add_Commands.py +++ b/cogs/Add_Commands.py @@ -1,4 +1,5 @@ from discord.ext import commands + from BotErrors import * from DiscordHelperFunctions import * from bot import bot_commands diff --git a/cogs/Admin_Commands.py b/cogs/Admin_Commands.py index ecb051b..cd95f10 100644 --- a/cogs/Admin_Commands.py +++ b/cogs/Admin_Commands.py @@ -1,8 +1,9 @@ -from discord.ext import commands -from BotErrors import * -from BotConfig import bot_config -from bot import bot_commands from discord import Game +from discord.ext import commands + +from BotConfig import bot_config +from BotErrors import * +from bot import bot_commands def check_mod(user): diff --git a/cogs/Delete_Commands.py b/cogs/Delete_Commands.py index c16ff99..e26ff27 100644 --- a/cogs/Delete_Commands.py +++ b/cogs/Delete_Commands.py @@ -1,4 +1,5 @@ from discord.ext import commands + from BotErrors import * from DiscordHelperFunctions import * from bot import bot_commands diff --git a/cogs/Edit_Commands.py b/cogs/Edit_Commands.py index 40d0df7..defb37d 100644 --- a/cogs/Edit_Commands.py +++ b/cogs/Edit_Commands.py @@ -1,4 +1,5 @@ from discord.ext import commands + from BotErrors import * from DiscordHelperFunctions import * from bot import bot_commands diff --git a/cogs/Search_Commands.py b/cogs/Search_Commands.py index a88c039..ff0bfdd 100644 --- a/cogs/Search_Commands.py +++ b/cogs/Search_Commands.py @@ -1,4 +1,5 @@ from discord.ext import commands + from BotErrors import * from DiscordHelperFunctions import * from bot import bot_commands diff --git a/tests/test_commands.py b/tests/test_commands.py index 36c4c1c..105fc8a 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -1,7 +1,6 @@ from unittest import TestCase + from Commands import * -from BotErrors import * -from BotConfig import * class TestCommands(TestCase): diff --git a/tests/test_geoffreyDatabase.py b/tests/test_geoffreyDatabase.py index b9d77a6..bd90bd8 100644 --- a/tests/test_geoffreyDatabase.py +++ b/tests/test_geoffreyDatabase.py @@ -1,8 +1,6 @@ from unittest import TestCase -from Commands import * -from BotErrors import * -from MinecraftAccountInfoGrabber import * -from BotConfig import bot_config + +from DatabaseInterface import * class TestGeoffreyDatabase(TestCase): diff --git a/tests/test_get_nickname.py b/tests/test_get_nickname.py index 7fd9fd0..b4806c9 100644 --- a/tests/test_get_nickname.py +++ b/tests/test_get_nickname.py @@ -1,4 +1,5 @@ from unittest import TestCase + from DiscordHelperFunctions import get_nickname diff --git a/tests/test_minecraftInfoGrabber.py b/tests/test_minecraftInfoGrabber.py index a19df3e..3131ef5 100644 --- a/tests/test_minecraftInfoGrabber.py +++ b/tests/test_minecraftInfoGrabber.py @@ -1,6 +1,6 @@ from unittest import TestCase + from MinecraftAccountInfoGrabber import * -from BotErrors import UsernameLookupFailed class TestMinecraftInfoGrabber(TestCase):