From 6518c6b8d8aeabdac0df9039897ed543fd02ee86 Mon Sep 17 00:00:00 2001
From: Twentysix <Twentysix26@users.noreply.github.com>
Date: Thu, 11 Feb 2016 14:37:32 +0100
Subject: [PATCH] No comment

I don't want to talk about this
---
 cogs/audio.py   | 17 +++++++----------
 cogs/economy.py | 12 ++++--------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/cogs/audio.py b/cogs/audio.py
index 10ec54443..6c4a8ebc5 100644
--- a/cogs/audio.py
+++ b/cogs/audio.py
@@ -12,14 +12,11 @@ import glob
 import re
 import aiohttp
 from bs4 import BeautifulSoup
-import __main__
 import json
 
 if not discord.opus.is_loaded():
     discord.opus.load_opus('libopus-0.dll')
 
-main_path = os.path.dirname(os.path.realpath(__main__.__file__))
-
 youtube_dl_options = {
     'format': 'bestaudio/best',
     'extractaudio': True,
@@ -344,14 +341,14 @@ class Audio:
         else:
             await self.bot.say("Queue status can be either on or off.")
             return
-        fileIO(main_path + "/data/audio/settings.json", "save", self.settings)
+        fileIO("data/audio/settings.json", "save", self.settings)
 
     @audioset.command()
     async def maxlength(self, length : int):
         """Maximum track length for requested links"""
         self.settings["MAX_LENGTH"] = length
         await self.bot.say("Maximum length is now " + str(length) + " seconds.")
-        fileIO(main_path + "/data/audio/settings.json", "save", self.settings)
+        fileIO("data/audio/settings.json", "save", self.settings)
 
     @audioset.command()
     async def volume(self, level : float):
@@ -359,7 +356,7 @@ class Audio:
         if level >= 0 and level <= 1:
             self.settings["VOLUME"] = level
             await self.bot.say("Volume is now set at " + str(level) + ". It will take effect after the current track.")
-            fileIO(main_path + "/data/audio/settings.json", "save", self.settings)
+            fileIO("data/audio/settings.json", "save", self.settings)
         else:
             await self.bot.say("Volume must be between 0 and 1. Example: 0.40")
 
@@ -589,16 +586,16 @@ def check_files():
     
     settings = {"VOLUME" : 0.5, "MAX_LENGTH" : 3700, "QUEUE_MODE" : True}
 
-    if not os.path.isfile(main_path + "/data/audio/settings.json"):
+    if not os.path.isfile("data/audio/settings.json"):
         print("Creating default audio settings.json...")
-        fileIO(main_path + "/data/audio/settings.json", "save", settings)
+        fileIO("data/audio/settings.json", "save", settings)
 
     allowed = ["^(https:\/\/www\\.youtube\\.com\/watch\\?v=...........*)", "^(https:\/\/youtu.be\/...........*)",
               "^(https:\/\/youtube\\.com\/watch\\?v=...........*)", "^(https:\/\/soundcloud\\.com\/.*)"]
     
-    if not os.path.isfile(main_path + "/data/audio/accepted_links.json"):
+    if not os.path.isfile("data/audio/accepted_links.json"):
         print("Creating accepted_links.json...")
-        fileIO(main_path + "/data/audio/accepted_links.json", "save", allowed)
+        fileIO("data/audio/accepted_links.json", "save", allowed)
 
 def setup(bot):
     check_folders()
diff --git a/cogs/economy.py b/cogs/economy.py
index 5657cb540..b16fb170e 100644
--- a/cogs/economy.py
+++ b/cogs/economy.py
@@ -5,9 +5,6 @@ from .utils import checks
 from random import randint
 import os
 import time
-import __main__
-
-main_path = os.path.dirname(os.path.realpath(__main__.__file__))
 
 slot_payouts = """Slot machine payouts:
     :two: :two: :six: Bet * 5000
@@ -19,7 +16,6 @@ slot_payouts = """Slot machine payouts:
     Three symbols: +500
     Two symbols: Bet * 2"""
 
-
 class Economy:
     """Economy
 
@@ -154,28 +150,28 @@ class Economy:
         """Minimum slot machine bid"""
         self.settings["SLOT_MIN"] = bid
         await self.bot.say("Minimum bid is now " + str(bid) + " credits.")
-        fileIO(main_path + "/data/economy/settings.json", "save", self.settings)
+        fileIO("data/economy/settings.json", "save", self.settings)
 
     @economyset.command()
     async def slotmax(self, bid : int):
         """Maximum slot machine bid"""
         self.settings["SLOT_MAX"] = bid
         await self.bot.say("Maximum bid is now " + str(bid) + " credits.")
-        fileIO(main_path + "/data/economy/settings.json", "save", self.settings)
+        fileIO("data/economy/settings.json", "save", self.settings)
 
     @economyset.command()
     async def paydaytime(self, seconds : int):
         """Seconds between each payday"""
         self.settings["PAYDAY_TIME"] = seconds
         await self.bot.say("Value modified. At least " + str(seconds) + " seconds must pass between each payday.")
-        fileIO(main_path + "/data/economy/settings.json", "save", self.settings)
+        fileIO("data/economy/settings.json", "save", self.settings)
 
     @economyset.command()
     async def paydaycredits(self, credits : int):
         """Credits earned each payday"""
         self.settings["PAYDAY_CREDITS"] = credits
         await self.bot.say("Every payday will now give " + str(credits) + " credits.")
-        fileIO(main_path + "/data/economy/settings.json", "save", self.settings)
+        fileIO("data/economy/settings.json", "save", self.settings)
 
     def account_check(self, id):
         if id in self.bank: