fix: minor fixes

This commit is contained in:
Terry Geng
2020-03-06 17:03:00 +08:00
parent 3bfc0ae5a9
commit 1f22d3b1a9
5 changed files with 23 additions and 13 deletions

View File

@ -83,7 +83,10 @@ def get_item_wrapper(bot, **kwargs):
def get_item_wrapper_by_id(bot, id, user):
item = var.library.get_item_by_id(bot, id)
return PlaylistItemWrapper(var.library, item.id, item.type, user)
if item:
return PlaylistItemWrapper(var.library, item.id, item.type, user)
else:
return None
def get_playlist(mode, _list=None, index=None):
if _list and index is None:

View File

@ -35,7 +35,7 @@ class URLItem(BaseItem):
def __init__(self, bot, url, from_dict=None):
self.validating_lock = threading.Lock()
if from_dict is None:
super().__init__(bot, "")
super().__init__(bot)
self.url = url if url[-1] != "/" else url[:-1]
self.title = ''
self.duration = 0

View File

@ -6,7 +6,7 @@ import hashlib
from media.item import item_builders, item_loaders, item_id_generators
from media.url import URLItem, url_item_id_generator
def get_playlist_info(bot, url, start_index=0, user=""):
def get_playlist_info(url, start_index=0, user=""):
items = []
ydl_opts = {
'extract_flat': 'in_playlist'
@ -36,13 +36,14 @@ def get_playlist_info(bot, url, start_index=0, user=""):
else "https://www.youtube.com/watch?v=" + info['entries'][j]['url']
print(info['entries'][j])
music = PlaylistURLItem(
bot,
item_url,
title,
url,
playlist_title
)
music = {
"type": "url_from_playlist",
"url": item_url,
"title": title,
"playlist_url": url,
"playlist_title": playlist_title,
"user": user
}
items.append(music)
except: