From 5426136e2aa6c492a36aa622f2c2eb2653e5fc24 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Wed, 10 Oct 2018 15:18:23 +0200 Subject: Move bot.py to __main__.py (Fixes #39) --- bot/__main__.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 bot/__main__.py (limited to 'bot/__main__.py') diff --git a/bot/__main__.py b/bot/__main__.py new file mode 100644 index 00000000..a40ed0d4 --- /dev/null +++ b/bot/__main__.py @@ -0,0 +1,39 @@ +from os import environ +from pathlib import Path +from sys import stderr +from traceback import print_exc, format_exc + +from discord.ext import commands +import logging + +HACKTOBERBOT_TOKEN = environ.get('HACKTOBERBOT_TOKEN') + +if HACKTOBERBOT_TOKEN: + token_dl = len(HACKTOBERBOT_TOKEN) // 8 + logging.info(f'Bot token loaded: {HACKTOBERBOT_TOKEN[:token_dl]}...{HACKTOBERBOT_TOKEN[-token_dl:]}') +else: + logging.error(f'Bot token not found: {HACKTOBERBOT_TOKEN}') + +ghost_unicode = "\N{GHOST}" +bot = commands.Bot(command_prefix=commands.when_mentioned_or(".", f"{ghost_unicode} ", ghost_unicode)) + +logging.info('Start loading extensions from ./cogs/') + + +if __name__ == '__main__': + # Scan for files in the /cogs/ directory and make a list of the file names. + cogs = [file.stem for file in Path('cogs').glob('*.py')] + for extension in cogs: + try: + bot.load_extension(f'cogs.{extension}') + logging.info(f'Successfully loaded extension: {extension}') + except Exception as e: + logging.error(f'Failed to load extension {extension}: {repr(e)} {format_exc()}') + # print(f'Failed to load extension {extension}.', file=stderr) + # print_exc() + +logging.info(f'Spooky Launch Sequence Initiated...') + +bot.run(HACKTOBERBOT_TOKEN) + +logging.info(f'HackBot has been slain!') \ No newline at end of file -- cgit v1.2.3 From 2e85819a1f155c0e098e8928a879b39d07e65048 Mon Sep 17 00:00:00 2001 From: Daniel Brown Date: Wed, 10 Oct 2018 09:13:57 -0500 Subject: Corrected linting errors. --- bot/__init__.py | 5 +++-- bot/__main__.py | 9 ++++----- bot/cogs/hacktoberstats.py | 4 +++- bot/cogs/halloweenify.py | 2 +- bot/cogs/movie.py | 8 +++++--- 5 files changed, 16 insertions(+), 12 deletions(-) (limited to 'bot/__main__.py') diff --git a/bot/__init__.py b/bot/__init__.py index 8cbcd121..1d320245 100644 --- a/bot/__init__.py +++ b/bot/__init__.py @@ -1,5 +1,6 @@ -import os import logging.handlers +import os + # set up logging @@ -27,4 +28,4 @@ logging.basicConfig(format='%(asctime)s - %(name)s %(levelname)s: %(message)s', level=logging.DEBUG, handlers=[console_handler, file_handler]) -logging.info('Logging Process Started') \ No newline at end of file +logging.info('Logging Process Started') diff --git a/bot/__main__.py b/bot/__main__.py index a40ed0d4..c40836c5 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -1,10 +1,10 @@ +import logging from os import environ from pathlib import Path -from sys import stderr -from traceback import print_exc, format_exc +from traceback import format_exc from discord.ext import commands -import logging + HACKTOBERBOT_TOKEN = environ.get('HACKTOBERBOT_TOKEN') @@ -19,7 +19,6 @@ bot = commands.Bot(command_prefix=commands.when_mentioned_or(".", f"{ghost_unico logging.info('Start loading extensions from ./cogs/') - if __name__ == '__main__': # Scan for files in the /cogs/ directory and make a list of the file names. cogs = [file.stem for file in Path('cogs').glob('*.py')] @@ -36,4 +35,4 @@ logging.info(f'Spooky Launch Sequence Initiated...') bot.run(HACKTOBERBOT_TOKEN) -logging.info(f'HackBot has been slain!') \ No newline at end of file +logging.info(f'HackBot has been slain!') diff --git a/bot/cogs/hacktoberstats.py b/bot/cogs/hacktoberstats.py index 4e896ae9..0a280443 100644 --- a/bot/cogs/hacktoberstats.py +++ b/bot/cogs/hacktoberstats.py @@ -95,7 +95,9 @@ class Stats: is_query = f"public+author:{username}" date_range = "2018-10-01..2018-10-31" per_page = "300" - query_url = f"{base_url}-label:{not_label}+type:{action_type}+is:{is_query}+created:{date_range}&per_page={per_page}" + query_url = ( + f"{base_url}-label:{not_label}+type:{action_type}+is:{is_query}+created:{date_range}&per_page={per_page}" + ) headers = {"user-agent": "Discord Python Hactoberbot"} async with aiohttp.ClientSession() as session: diff --git a/bot/cogs/halloweenify.py b/bot/cogs/halloweenify.py index 8a9db3df..201f6b95 100644 --- a/bot/cogs/halloweenify.py +++ b/bot/cogs/halloweenify.py @@ -1,5 +1,5 @@ -from pathlib import Path from json import load +from pathlib import Path from random import choice diff --git a/bot/cogs/movie.py b/bot/cogs/movie.py index bb6f8df8..647ee22a 100644 --- a/bot/cogs/movie.py +++ b/bot/cogs/movie.py @@ -1,8 +1,10 @@ -import requests import random from os import environ -from discord.ext import commands + +import requests from discord import Embed +from discord.ext import commands + TMDB_API_KEY = environ.get('TMDB_API_KEY') TMDB_TOKEN = environ.get('TMDB_TOKEN') @@ -72,7 +74,7 @@ class Movie: rating_count = movie.get('vote_average') / 2 rating = '' - for i in range(int(rating_count)): + for _ in range(int(rating_count)): rating += ':skull:' if (rating_count % 1) >= .5: -- cgit v1.2.3