storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add youtube-dl options

Browse Source 
#258
This commit is contained in:
Azlux
2021-04-03 13:39:47 +02:00
parent 582b0b58da
commit ee5a54b33b
4 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/url.py
View File

@ -170,11 +170,19 @@ class URLItem(BaseItem):
'verbose': var.config.getboolean('debug', 'youtube_dl')
}
cookie = var.config.get('youtube_dl', 'cookiefile', fallback=None)
if cookie:
ydl_opts['cookiefile'] = var.config.get('youtube_dl', 'cookiefile', fallback=None)
user_agent = var.config.get('youtube_dl', 'user_agent', fallback=None)
if user_agent:
youtube_dl.utils.std_headers['User-Agent'] = var.config.get('youtube_dl', 'user_agent')
with youtube_dl.YoutubeDL(ydl_opts) as ydl:
attempts = var.config.getint('bot', 'download_attempts', fallback=2)
download_succeed = False
for i in range(attempts):
self.log.info("bot: download attempts %d / %d" % (i+1, attempts))
self.log.info("bot: download attempts %d / %d" % (i + 1, attempts))
try:
ydl.extract_info(self.url)
download_succeed = True
@ -232,9 +240,9 @@ class URLItem(BaseItem):
def format_song_string(self, user):
if self.ready in ['validated', 'yes']:
return tr("url_item",
title=self.title if self.title else "??",
url=self.url,
user=user)
title=self.title if self.title else "??",
url=self.url,
user=user)
return self.url
def format_current_playing(self, user):

44
media/url_from_playlist.py
View File

@ -8,8 +8,18 @@ from media.url import URLItem, url_item_id_generator
def get_playlist_info(url, start_index=0, user=""):
items = []
ydl_opts = {
'extract_flat': 'in_playlist'
'extract_flat': 'in_playlist',
'verbose': var.config.getboolean('debug', 'youtube_dl')
}
cookie = var.config.get('youtube_dl', 'cookiefile', fallback=None)
if cookie:
ydl_opts['cookiefile'] = var.config.get('youtube_dl', 'cookiefile', fallback=None)
user_agent = var.config.get('youtube_dl', 'user_agent', fallback=None)
if user_agent:
youtube_dl.utils.std_headers['User-Agent'] = var.config.get('youtube_dl', 'user_agent')
with youtube_dl.YoutubeDL(ydl_opts) as ydl:
attempts = var.config.getint('bot', 'download_attempts', fallback=2)
for i in range(attempts):
@ -36,16 +46,16 @@ def get_playlist_info(url, start_index=0, user=""):
print(info['entries'][j])
music = {
"type": "url_from_playlist",
"url": item_url,
"title": title,
"playlist_url": url,
"playlist_title": playlist_title,
"user": user
"type": "url_from_playlist",
"url": item_url,
"title": title,
"playlist_url": url,
"playlist_title": playlist_title,
"user": user
}
items.append(music)
except:
except: # todo need to be specified
pass
return items
@ -82,11 +92,11 @@ class PlaylistURLItem(URLItem):
self.type = "url_from_playlist"
def to_dict(self):
dict = super().to_dict()
dict['playlist_url'] = self.playlist_url
dict['playlist_title'] = self.playlist_title
tmp_dict = super().to_dict()
tmp_dict['playlist_url'] = self.playlist_url
tmp_dict['playlist_title'] = self.playlist_title
return dict
return tmp_dict
def format_debug_string(self):
return "[url] {title} ({url}) from playlist {playlist}".format(
@ -97,11 +107,11 @@ class PlaylistURLItem(URLItem):
def format_song_string(self, user):
return tr("url_from_playlist_item",
title=self.title,
url=self.url,
playlist_url=self.playlist_url,
playlist=self.playlist_title,
user=user)
title=self.title,
url=self.url,
playlist_url=self.playlist_url,
playlist=self.playlist_title,
user=user)
def format_current_playing(self, user):
display = tr("now_playing", item=self.format_song_string(user))