media/url_from_playlist.py

@@ -1,4 +1,3 @@
-import logging
 import youtube_dl
 from constants import tr_cli as tr
 import variables as var
@@ -6,10 +5,8 @@ from media.item import item_builders, item_loaders, item_id_generators
 from media.url import URLItem, url_item_id_generator
 
 
-log = logging.getLogger("bot")
-
-
 def get_playlist_info(url, start_index=0, user=""):
+    items = []
     ydl_opts = {
         'extract_flat': 'in_playlist',
         'verbose': var.config.getboolean('debug', 'youtube_dl')
@@ -26,7 +23,6 @@ def get_playlist_info(url, start_index=0, user=""):
     with youtube_dl.YoutubeDL(ydl_opts) as ydl:
         attempts = var.config.getint('bot', 'download_attempts', fallback=2)
         for i in range(attempts):
-            items = []
             try:
                 info = ydl.extract_info(url, download=False)
                 # # if url is not a playlist but a video
@@ -59,12 +55,10 @@ def get_playlist_info(url, start_index=0, user=""):
                     }
 
                     items.append(music)
+            except:  # todo need to be specified
+                pass
 
-            except Exception as ex:
-                log.exception(ex, exc_info=True)
-                continue
-
-            return items
+    return items
 
 
 def playlist_url_item_builder(**kwargs):

util.py

@@ -2,7 +2,6 @@
 # coding=utf-8
 
 import hashlib
-import html
 import magic
 import os
 import io
@@ -312,8 +311,7 @@ def get_url_from_input(string):
     match = re.search("(http|https)://(\S*)?/(\S*)", string, flags=re.IGNORECASE)
     if match:
         url = match[1].lower() + "://" + match[2].lower() + "/" + match[3]
-        # https://github.com/mumble-voip/mumble/issues/4999
-        return html.unescape(url)
+        return url
     else:
         return ""