diff --git a/modules/radiofrance/backend.py b/modules/radiofrance/backend.py index 749b5d1d..bfad3402 100644 --- a/modules/radiofrance/backend.py +++ b/modules/radiofrance/backend.py @@ -100,6 +100,7 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo): ) _DIRECTJSON_RADIOS = ('lemouv', 'franceinter', ) + _LARGEDIRECTJSON_RADIOS = ('fip', ) _RSS_RADIOS = ('francemusique', ) def iter_resources(self, objs, split_path): @@ -149,8 +150,7 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo): def fill_radio(self, radio, fields): if 'current' in fields: - artist = None - title = None + artist = title = None if radio.id in self._PLAYERJS_RADIOS: artist, title = self.browser.get_current_playerjs(radio.id) if title.endswith(u'par %s' % artist): @@ -164,6 +164,12 @@ class RadioFranceBackend(BaseBackend, ICapRadio, ICapCollection, ICapVideo): title = "%s [%s]" % (dtitle, title) else: title = dtitle + elif radio.id in self._LARGEDIRECTJSON_RADIOS: + dartist, dtitle = self.browser.get_current_direct_large(radio.id) + if dartist: + artist = dartist + if dtitle: + title = dtitle if radio.id in self._RSS_RADIOS: title = self.browser.get_current_rss(radio.id) if title: diff --git a/modules/radiofrance/browser.py b/modules/radiofrance/browser.py index d5c6331f..db137082 100644 --- a/modules/radiofrance/browser.py +++ b/modules/radiofrance/browser.py @@ -159,6 +159,22 @@ class RadioFranceBrowser(BaseBrowser): title = unicode(title) if title else None return (artist, title) + def get_current_direct_large(self, _id): + json_data = self.openurl('http://%s/sites/default/files/direct-large.json?_=%s' % (self.id2domain(_id), int(time()))) + data = json.load(json_data) + + document = self.parser.parse(StringIO(data.get('html'))) + current = document.find('//div[@class="direct-current"]') + if current is not None: + artist = current.findtext('.//div[@class="artiste"]') + title = current.findtext('.//div[@class="titre"]') + artist = unicode(artist) if artist else None + title = unicode(title) if title else None + else: + artist = None + title = None + return (artist, title) + @id2url(RadioFranceVideo.id2url) def get_video(self, url): radio_domain = replay_id = None