Merge pull request #300 from miaowware/paths

Moved paths to pathlib
This commit is contained in:
0x5c 2020-10-30 08:58:16 -04:00 committed by GitHub
commit cd2503c953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View File

@ -19,7 +19,7 @@ import common as cmn
class FunCog(commands.Cog): class FunCog(commands.Cog):
def __init__(self, bot: commands.Bot): def __init__(self, bot: commands.Bot):
self.bot = bot self.bot = bot
with open("resources/words") as words_file: with open(cmn.paths.resources / "words") as words_file:
self.words = words_file.read().lower().splitlines() self.words = words_file.read().lower().splitlines()
@commands.command(name="xkcd", aliases=["x"], category=cmn.cat.fun) @commands.command(name="xkcd", aliases=["x"], category=cmn.cat.fun)

View File

@ -9,6 +9,7 @@ the GNU General Public License, version 2.
import threading import threading
from pathlib import Path
from ctyparser import BigCty from ctyparser import BigCty
@ -17,11 +18,14 @@ from discord.ext import commands, tasks
import common as cmn import common as cmn
cty_path = Path("./data/cty.json")
class LookupCog(commands.Cog): class LookupCog(commands.Cog):
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
try: try:
self.cty = BigCty("./data/cty.json") self.cty = BigCty(cty_path)
except OSError: except OSError:
self.cty = BigCty() self.cty = BigCty()
@ -67,7 +71,7 @@ class LookupCog(commands.Cog):
@tasks.loop(hours=24) @tasks.loop(hours=24)
async def _update_cty(self): async def _update_cty(self):
update = threading.Thread(target=run_update, args=(self.cty, "./data/cty.json")) update = threading.Thread(target=run_update, args=(self.cty, cty_path))
update.start() update.start()