From 83820acb4a98e498b44ffa1119993d52c28cce68 Mon Sep 17 00:00:00 2001 From: snipe <72265661+notsniped@users.noreply.github.com> Date: Fri, 30 Jun 2023 21:31:43 +0530 Subject: [PATCH 1/2] Remove all references of `wdir` Looks like linux subsystem doesn't need them :smile: --- cogs/automod.py | 6 +++--- cogs/economy.py | 13 ++++++------- cogs/isobank.py | 3 +-- cogs/levelling.py | 5 ++--- cogs/minigames.py | 1 - main.py | 1 - 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/cogs/automod.py b/cogs/automod.py index 8f6c68fd..2cbb2dcb 100644 --- a/cogs/automod.py +++ b/cogs/automod.py @@ -8,13 +8,13 @@ from discord.ext import commands # Variables -wdir = os.getcwd() + color = discord.Color.random() -with open(f'{wdir}/database/automod.json', 'r', encoding="utf-8") as f: automod_config = json.load(f) +with open('database/automod.json', 'r', encoding="utf-8") as f: automod_config = json.load(f) def save(): - with open(f'{wdir}/database/automod.json', 'w+', encoding="utf-8") as f: json.dump(automod_config, f, indent=4) + with open('database/automod.json', 'w+', encoding="utf-8") as f: json.dump(automod_config, f, indent=4) # Commands class Automod(commands.Cog): diff --git a/cogs/economy.py b/cogs/economy.py index 3923a13c..88e03a41 100644 --- a/cogs/economy.py +++ b/cogs/economy.py @@ -31,10 +31,9 @@ def get_item_names(self) -> list: return json_list # Variables -wdir = os.getcwd() color = discord.Color.random() currency = framework.isobot.currency.CurrencyAPI("database/currency.json", "logs/currency.log") -shop_data = ShopData(f"{wdir}/config/shop.json") +shop_data = ShopData("config/shop.json") all_item_ids = shop_data.get_item_ids() jobs = [ "Discord mod", @@ -46,13 +45,13 @@ def get_item_names(self) -> list: "Doctor" ] -with open(f"{wdir}/database/items.json", 'r') as f: items = json.load(f) -with open(f"{wdir}/config/shop.json", 'r') as f: shopitem = json.load(f) -with open(f"{wdir}/database/user_data.json", 'r') as f: userdat = json.load(f) +with open("database/items.json", 'r') as f: items = json.load(f) +with open("config/shop.json", 'r') as f: shopitem = json.load(f) +with open("database/user_data.json", 'r') as f: userdat = json.load(f) def save(): - with open(f"{wdir}/database/items.json", 'w+') as f: json.dump(items, f, indent=4) - with open(f"{wdir}/database/user_data.json", 'w+') as f: json.dump(userdat, f, indent=4) + with open("database/items.json", 'w+') as f: json.dump(items, f, indent=4) + with open("database/user_data.json", 'w+') as f: json.dump(userdat, f, indent=4) # Functions def new_userdat(id: int): diff --git a/cogs/isobank.py b/cogs/isobank.py index 9f82995f..149a3a71 100644 --- a/cogs/isobank.py +++ b/cogs/isobank.py @@ -10,11 +10,10 @@ import framework.isobank.manager # Variables -wdir = os.getcwd() color = discord.Color.random() # Isobot Framework -isobankauth = framework.isobank.authorize.IsobankAuth(f"{wdir}/database/isobank/auth.json", f"{wdir}/database/isobank/accounts.json") +isobankauth = framework.isobank.authorize.IsobankAuth("database/isobank/auth.json", "database/isobank/accounts.json") # Commands class IsoBank(commands.Cog): diff --git a/cogs/levelling.py b/cogs/levelling.py index 4b134f82..e69e8c75 100644 --- a/cogs/levelling.py +++ b/cogs/levelling.py @@ -8,13 +8,12 @@ from discord.ext import commands # Variables -wdir = os.getcwd() color = discord.Color.random() -with open(f"{wdir}/database/levels.json", 'r', encoding="utf-8") as f: levels = json.load(f) +with open("database/levels.json", 'r', encoding="utf-8") as f: levels = json.load(f) def save(): - with open(f"{wdir}/database/levels.json", 'w+', encoding="utf-8") as f: json.dump(levels, f, indent=4) + with open("database/levels.json", 'w+', encoding="utf-8") as f: json.dump(levels, f, indent=4) # Functions def get_xp(id: int) -> int: diff --git a/cogs/minigames.py b/cogs/minigames.py index 2f7b6083..06cc4a38 100644 --- a/cogs/minigames.py +++ b/cogs/minigames.py @@ -9,7 +9,6 @@ from discord.ext import commands # Variables -wdir = os.getcwd() color = discord.Color.random() currency = framework.isobot.currency.CurrencyAPI("database/currency.json", "logs/currency.log") diff --git a/main.py b/main.py index fb638dca..9ab4dd68 100644 --- a/main.py +++ b/main.py @@ -26,7 +26,6 @@ #Variables client = discord.Bot() color = discord.Color.random() -wdir = os.getcwd() with open('database/items.json', 'r', encoding="utf-8") as f: items = json.load(f) with open('config/shop.json', 'r', encoding="utf-8") as f: shopitem = json.load(f) with open('database/presence.json', 'r', encoding="utf-8") as f: presence = json.load(f) From e9e0dab59278a33275a4afc4f766826cc48b1333 Mon Sep 17 00:00:00 2001 From: snipe <72265661+notsniped@users.noreply.github.com> Date: Fri, 30 Jun 2023 21:35:10 +0530 Subject: [PATCH 2/2] Remove redundant `os` imports --- cogs/automod.py | 1 - cogs/economy.py | 1 - cogs/isobank.py | 1 - cogs/levelling.py | 1 - cogs/minigames.py | 1 - 5 files changed, 5 deletions(-) diff --git a/cogs/automod.py b/cogs/automod.py index 2cbb2dcb..4cc8e4cd 100644 --- a/cogs/automod.py +++ b/cogs/automod.py @@ -3,7 +3,6 @@ # Imports import discord import json -import os from discord import option, ApplicationContext from discord.ext import commands diff --git a/cogs/economy.py b/cogs/economy.py index 88e03a41..f9f3e804 100644 --- a/cogs/economy.py +++ b/cogs/economy.py @@ -2,7 +2,6 @@ # Imports import discord -import os.path import json import random import math diff --git a/cogs/isobank.py b/cogs/isobank.py index 149a3a71..8c6a0fc2 100644 --- a/cogs/isobank.py +++ b/cogs/isobank.py @@ -4,7 +4,6 @@ # Imports import discord import json -import os.path from discord import option, ApplicationContext from discord.ext import commands import framework.isobank.manager diff --git a/cogs/levelling.py b/cogs/levelling.py index e69e8c75..1964537f 100644 --- a/cogs/levelling.py +++ b/cogs/levelling.py @@ -3,7 +3,6 @@ # Imports import discord import json -import os.path from discord import option, ApplicationContext from discord.ext import commands diff --git a/cogs/minigames.py b/cogs/minigames.py index 06cc4a38..aff1ed7c 100644 --- a/cogs/minigames.py +++ b/cogs/minigames.py @@ -2,7 +2,6 @@ # Imports import discord -import os.path import framework.isobot.currency from random import randint from discord import ApplicationContext