nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let user choose his Stream to use from Radio instance. Close #1291

Browse source 
Signed-off-by: Thomas Lecavelier <thomas-weboob@lecavelier.name>
This commit is contained in:
Thomas Lecavelier 2013-08-14 09:54:49 +02:00 • committed by Florent
commit 4fed28a308
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
weboob/applications/radioob/radioob.py
View file

@ -73,15 +73,20 @@ class Radioob(ReplApplication):
if len(args) == 2: if len(args) == 2:
return self._complete_object() return self._complete_object()
def do_play(self, _id): def do_play(self, line):
""" """
play ID play ID [stream_id]
Play a radio with a found player. Play a radio with a found player (optionnaly specify the wanted stream).
""" """
_id, _stream_id = self.parse_command_args(line, 2, 1)
if not _id: if not _id:
print >>sys.stderr, 'This command takes an argument: %s' % self.get_command_help('play', short=True) print >>sys.stderr, 'This command takes an argument: %s' % self.get_command_help('play', short=True)
return 2 return 2
try:
_stream_id = int(_stream_id)
except ValueError:
_stream_id = 0
radio = self.get_object(_id, 'get_radio', ['streams']) radio = self.get_object(_id, 'get_radio', ['streams'])
if not radio: if not radio:
@ -93,9 +98,9 @@ class Radioob(ReplApplication):
if not player_name: if not player_name:
self.logger.debug(u'You can set the media_player key to the player you prefer in the radioob ' self.logger.debug(u'You can set the media_player key to the player you prefer in the radioob '
'configuration file.') 'configuration file.')
self.player.play(radio.streams[0], player_name=player_name, player_args=media_player_args) self.player.play(radio.streams[int(_stream_id)], player_name=player_name, player_args=media_player_args)
except (InvalidMediaPlayer, MediaPlayerNotFound) as e: except (InvalidMediaPlayer, MediaPlayerNotFound) as e:
print '%s\nRadio URL: %s' % (e, radio.streams[0].url) print '%s\nRadio URL: %s' % (e, radio.streams[int(_stream_id)].url)
def complete_info(self, text, line, *ignored): def complete_info(self, text, line, *ignored):
args = line.split(' ') args = line.split(' ')