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

radiofrance: Fix fetching FIP current, support replay

Browse source 
FIP now uses the same website as most Radio France radios.
As a consequence, it is able to support CapVideo.

There are a few differences between FIP and the other radios, but this
still allowed for less code, and the code should be more robust for
every radio.
This commit is contained in:
Laurent Bachelier 2012-03-14 16:25:02 +01:00
commit 184cabf345
3 changed files with 69 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/radiofrance/backend.py
View file

@ -96,11 +96,11 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo):
'franceculture',
'franceinfo',
'lemouv',
'fip',
)
_DIRECTJSON_RADIOS = ('lemouv', 'franceinter', )
_RSS_RADIOS = ('francemusique', )
_ANTENNA_RADIOS = ('fip', )
def iter_resources(self, objs, split_path):
if Radio in objs:
@ -152,9 +152,11 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo):
artist = None
title = None
if radio.id in self._PLAYERJS_RADIOS:
title = self.browser.get_current_playerjs(radio.id)
artist, title = self.browser.get_current_playerjs(radio.id)
if radio.id in self._DIRECTJSON_RADIOS:
artist, dtitle = self.browser.get_current_direct(radio.id)
dartist, dtitle = self.browser.get_current_direct(radio.id)
if dartist:
artist = dartist
if dtitle:
if title:
title = "%s [%s]" % (dtitle, title)
@ -162,8 +164,6 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo):
title = dtitle
if radio.id in self._RSS_RADIOS:
title = self.browser.get_current_rss(radio.id)
if radio.id in self._ANTENNA_RADIOS:
artist, title = self.browser.get_current_antenna(radio.id)
if title:
if not radio.current or radio.current is NotLoaded:
radio.current = Emission(0)