From c00befeb105f5ec777ac1b359097543b7ab8479b Mon Sep 17 00:00:00 2001
From: Alex <aamlima123@gmail.com>
Date: Wed, 30 Aug 2017 14:00:02 -0300
Subject: [PATCH] Misc fixes (#53)

* Fix a Python3 compatibility

* Small fixes

* [requirements] bump to youtube-dl 2017.8.23
---
 disco/bot/parser.py     | 2 +-
 disco/voice/playable.py | 2 +-
 disco/voice/player.py   | 7 ++++---
 disco/voice/queue.py    | 2 ++
 setup.py                | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/disco/bot/parser.py b/disco/bot/parser.py
index 8283fc8..fe2d90c 100644
--- a/disco/bot/parser.py
+++ b/disco/bot/parser.py
@@ -11,7 +11,7 @@ BOOL_OPTS = {'yes': True, 'no': False, 'true': True, 'False': False, '1': True,
 TYPE_MAP = {
     'str': lambda ctx, data: str(data) if six.PY3 else unicode(data),
     'int': lambda ctx, data: int(data),
-    'float': lambda ctx, data: int(data),
+    'float': lambda ctx, data: float(data),
     'snowflake': lambda ctx, data: int(data),
 }
 
diff --git a/disco/voice/playable.py b/disco/voice/playable.py
index ff3ba04..12ed9ef 100644
--- a/disco/voice/playable.py
+++ b/disco/voice/playable.py
@@ -163,7 +163,7 @@ class YoutubeDLInput(FFmpegInput):
                 if self._url:
                     obj = ydl.extract_info(self._url, download=False, process=False)
                     if 'entries' in obj:
-                        self._ie_info = obj['entries'][0]
+                        self._ie_info = list(obj['entries'])[0]
                     else:
                         self._ie_info = obj
 
diff --git a/disco/voice/player.py b/disco/voice/player.py
index 56c023c..e09e28a 100644
--- a/disco/voice/player.py
+++ b/disco/voice/player.py
@@ -60,9 +60,10 @@ class Player(object):
         self.events.emit(self.Events.PAUSE_PLAY)
 
     def resume(self):
-        self.paused.set()
-        self.paused = None
-        self.events.emit(self.Events.RESUME_PLAY)
+        if self.paused:
+            self.paused.set()
+            self.paused = None
+            self.events.emit(self.Events.RESUME_PLAY)
 
     def play(self, item):
         # Grab the first frame before we start anything else, sometimes playables
diff --git a/disco/voice/queue.py b/disco/voice/queue.py
index 8670d14..eaa1baa 100644
--- a/disco/voice/queue.py
+++ b/disco/voice/queue.py
@@ -48,3 +48,5 @@ class PlayableQueue(BaseQueue):
 
     def __nonzero__(self):
         return True
+
+    __bool__ = __nonzero__
diff --git a/setup.py b/setup.py
index c602a9b..625067a 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ extras_require = {
     'voice': ['pynacl==1.1.2'],
     'http': ['flask==0.12.2'],
     'yaml': ['pyyaml==3.12'],
-    'music': ['youtube_dl==2017.4.26'],
+    'music': ['youtube_dl>=2017.8.23'],
     'performance': ['erlpack==0.3.2', 'ujson==1.35'],
     'sharding': ['gipc==0.6.0'],
     'docs': ['biblio==0.0.4'],