From bf4be8a23def27ebe660f374969b521d2518c8cb Mon Sep 17 00:00:00 2001
From: Aioxas <axioras@gmail.com>
Date: Fri, 4 Nov 2016 08:16:30 -0500
Subject: [PATCH] [Audio] fileIO -> dataIO conversion (#435)

---
 cogs/audio.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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