Mirrors/fediplug
1
0
Fork 0
mirror of https://github.com/nova-r/fediplug.git synced 2025-03-10 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue #7 (no downloading of full bandcamp albums)

Browse source 
This only works if YoutubeDL sends out a downloading status progress whenever it starts to download a new file. This is not guaranteed, however in practice it seems to be the case (and seems to be a reasonable assumption).
This commit is contained in:
Quentin Dauchy 2018-04-26 14:02:28 +00:00
parent 2a683ced56
commit 7eb9fb6673
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fediplay/queue.py
View file

@ -21,10 +21,10 @@ class Queue(object):
def add(self, url): def add(self, url):
'''Fetches the url and adds the resulting audio to the play queue.''' '''Fetches the url and adds the resulting audio to the play queue.'''
filename = Getter().get(url) filenames = Getter().get(url)
with self.lock: with self.lock:
self.queue.append(filename) self.queue.extend(filenames)
if not self.playing: if not self.playing:
self._play(self.queue.pop(0), self._play_finished) self._play(self.queue.pop(0), self._play_finished)
@ -54,11 +54,11 @@ class Getter(object):
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
def __init__(self): def __init__(self):
self.filename = None self.filenames = []
def _progress_hook(self, progress): def _progress_hook(self, progress):
if progress['status'] == 'finished': if progress['status'] == 'downloading' and progress['filename'] not in self.filenames:
self.filename = progress['filename'] self.filenames.append(progress['filename'])
def get(self, url): def get(self, url):
'''Fetches music from the given url.''' '''Fetches music from the given url.'''
@ -71,7 +71,7 @@ class Getter(object):
with YoutubeDL(options) as downloader: with YoutubeDL(options) as downloader:
downloader.download([url]) downloader.download([url])
return self.filename return self.filenames
def build_play_command(filename): def build_play_command(filename):
'''Builds a play command for the given filename.''' '''Builds a play command for the given filename.'''