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

Merge pull request #16 from Jenkyrados/master

Browse source 
queue entire albums; fixes #7, thanks @Jenkyrados 

This also appears to work for YouTube mixes, which, oh my gosh, that can get kind of crazy. So maybe it would be good to enhance this support later to start playing as each file comes down, rather than waiting for the entire thing. But I'm happy with this as a start.
This commit is contained in:
Matt Behrens 2018-05-03 19:55:55 -04:00 committed by GitHub
commit f45ff83bc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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.'''