CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Audio] fileIO -> dataIO conversion (#435)

Browse Source
This commit is contained in:
Aioxas 2016-11-04 08:16:30 -05:00 committed by Twentysix
parent c3a372c794
commit bf4be8a23d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cogs/audio.py
View File

@ -3,7 +3,7 @@ from discord.ext import commands
import threading import threading
import os import os
from random import shuffle, choice from random import shuffle, choice
from cogs.utils.dataIO import fileIO from cogs.utils.dataIO import dataIO
from cogs.utils import checks from cogs.utils import checks
from __main__ import send_cmd_help, settings from __main__ import send_cmd_help, settings
import re import re
@ -160,7 +160,7 @@ class Playlist:
self.save() self.save()
def save(self): def save(self):
fileIO(self.path, "save", self.to_json()) dataIO.save_json(self.path, self.to_json())
@property @property
def sid(self): def sid(self):
@ -236,7 +236,7 @@ class Audio:
self.bot = bot self.bot = bot
self.queue = {} # add deque's, repeat self.queue = {} # add deque's, repeat
self.downloaders = {} # sid: object self.downloaders = {} # sid: object
self.settings = fileIO("data/audio/settings.json", 'load') self.settings = dataIO.load_json("data/audio/settings.json")
self.server_specific_setting_keys = ["VOLUME", "VOTE_ENABLED", self.server_specific_setting_keys = ["VOLUME", "VOTE_ENABLED",
"VOTE_THRESHOLD"] "VOTE_THRESHOLD"]
self.cache_path = "data/audio/cache" self.cache_path = "data/audio/cache"
@ -619,7 +619,7 @@ class Audio:
f = os.path.join(f, server, name + ".txt") f = os.path.join(f, server, name + ".txt")
else: else:
f = os.path.join(f, name + ".txt") f = os.path.join(f, name + ".txt")
kwargs = fileIO(f, 'load') kwargs = dataIO.load_json(f)
kwargs['path'] = f kwargs['path'] = f
kwargs['main_class'] = self kwargs['main_class'] = self
@ -811,7 +811,7 @@ class Audio:
f = os.path.join(f, name + ".txt") f = os.path.join(f, name + ".txt")
log.debug('checking for {}'.format(f)) log.debug('checking for {}'.format(f))
return fileIO(f, 'check') return dataIO.is_valid_json(f)
def _playlist_exists_local(self, server, name): def _playlist_exists_local(self, server, name):
try: try:
@ -823,7 +823,7 @@ class Audio:
f = os.path.join(f, server, name + ".txt") f = os.path.join(f, server, name + ".txt")
log.debug('checking for {}'.format(f)) log.debug('checking for {}'.format(f))
return fileIO(f, 'check') return dataIO.is_valid_json(f)
def _remove_queue(self, server): def _remove_queue(self, server):
if server.id in self.queue: if server.id in self.queue:
@ -852,7 +852,7 @@ class Audio:
log.debug("saving playlist '{}' to {}:\n\t{}".format(name, f, log.debug("saving playlist '{}' to {}:\n\t{}".format(name, f,
playlist)) playlist))
fileIO(f, 'save', playlist) dataIO.save_json(f, playlist)
def _shuffle_queue(self, server): def _shuffle_queue(self, server):
shuffle(self.queue[server.id]["QUEUE"]) shuffle(self.queue[server.id]["QUEUE"])
@ -1976,7 +1976,7 @@ class Audio:
pass pass
def save_settings(self): def save_settings(self):
fileIO('data/audio/settings.json', 'save', self.settings) dataIO.save_json('data/audio/settings.json', self.settings)
def set_server_setting(self, server, key, value): def set_server_setting(self, server, key, value):
if server.id not in self.settings["SERVERS"]: if server.id not in self.settings["SERVERS"]:
@ -2042,16 +2042,16 @@ def check_files():
if not os.path.isfile(settings_path): if not os.path.isfile(settings_path):
print("Creating default audio settings.json...") print("Creating default audio settings.json...")
fileIO(settings_path, "save", default) dataIO.save_json(settings_path, default)
else: # consistency check else: # consistency check
current = fileIO(settings_path, "load") current = dataIO.load_json(settings_path)
if current.keys() != default.keys(): if current.keys() != default.keys():
for key in default.keys(): for key in default.keys():
if key not in current.keys(): if key not in current.keys():
current[key] = default[key] current[key] = default[key]
print( print(
"Adding " + str(key) + " field to audio settings.json") "Adding " + str(key) + " field to audio settings.json")
fileIO(settings_path, "save", current) dataIO.save_json(settings_path, current)
def setup(bot): def setup(bot):