Merge pull request #87 from DuckBoss/development

Updates for v2.0.1

aliases/aliases.csv

@@ -2,16 +2,21 @@ alias,command
 sb_help,!sound_board_help
 yt_help,!youtube_help
 img_help,!images_help
+rand_help,!randomizer_help
 sbs,!sbstop
 sbl,!sblist
 sble,!sblist_echo
+imgl,!imglist
+imgle,!imglist_echo
 sbr,!sbreplay
 skip,!next
 v,!volume
 yt,!youtube
 q,!queue
 p,!play
+pl,!playlist
 rp,!replay
 restart,!reboot
 quit,!exit
 stream,!link
+streamfront,!linkfront

helpers/global_access.py

@@ -5,7 +5,7 @@
 
 class GlobalMods:
     # JJMumbleBot Version
-    version = "v2.0.0"
+    version = "v2.0.1"
     # Mumble instance
     mumble = None
     # Config Access

plugins/sound_board/sound_board.py

@@ -2,6 +2,7 @@
 from helpers.global_access import GlobalMods as GM
 from helpers.global_access import debug_print
 from plugins.sound_board.sound_board_helper import SoundBoardHelper as SBH
+from plugins.youtube.youtube_helper import YoutubeHelper as YH
 import plugins.sound_board.sound_board_helper as SBM
 import utils
 import privileges as pv
@@ -19,7 +20,7 @@ class Plugin(PluginBase):
                     <b>!sbstop/!sbs</b>: Stops the currently playing sound board track.<br>\
                     <b>!sbdownload 'youtube_url' 'file_name'</b>: Downloads a sound clip from a youtube link and adds it to the sound board.<br>\
                     <b>!sbdelete 'file_name.wav'</b>: Deletes a clip from the sound board storage. Be sure to specify the .wav extension."
-    plugin_version = "2.0.0"
+    plugin_version = "2.0.1"
     priv_path = "sound_board/sound_board_privileges.csv"
 
     youtube_plugin = None
@@ -119,7 +120,7 @@ def process_command(self, text):
         elif command == "sbreplay":
             if not pv.plugin_privilege_checker(text, command, self.priv_path):
                 return
-            if self.youtube_plugin.is_playing:
+            if YH.is_playing:
                 GM.gui.quick_gui("The youtube audio plugin is currently live. "
                                  "Use !stop before using the sound board plugin.",
                                  text_type='header', box_align='left')

tests/test_config.py

@@ -13,7 +13,7 @@ def setUp(self):
 
     def test_version(self):
         bot_version = GM.version
-        self.assertEqual(bot_version, "v2.0.0")
+        self.assertEqual(bot_version, "v2.0.1")
 
     def test_server_ip(self):
         server_ip = GM.cfg['Connection_Settings']['ServerIP']

tests/test_plugins.py

@@ -40,7 +40,7 @@ def test_version_youtube(self):
 
     def test_version_sound_board(self):
         cur_plugin = self.bot_plugins.get('sound_board')
-        self.assertEqual(cur_plugin.get_plugin_version(), "2.0.0")
+        self.assertEqual(cur_plugin.get_plugin_version(), "2.0.1")
 
     def test_version_images(self):
         cur_plugin = self.bot_plugins.get('images')