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

[radiofrance] handle new francebleu website, retrieve the good player url when default player is the video player

Browse source
This commit is contained in:
Bezleputh 2015-09-15 10:46:18 +02:00
commit 5f302d3e09
4 changed files with 159 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/radiofrance/browser.py
View file

@ -25,17 +25,24 @@ __all__ = ['RadioFranceBrowser']
class RadioFranceBrowser(PagesBrowser): class RadioFranceBrowser(PagesBrowser):
json_page = URL('sites/default/files/(?P<json_url>.*).json', json_page = URL('sites/default/files/(?P<json_url>.*).json',
'player-json/reecoute/(?P<json_url_fip>.*)', JsonPage) 'player-json/reecoute/(?P<json_url_fip>.*)',
'station/(?P<fbplayer>.*)', JsonPage)
podcast_page = URL('podcast09/rss_(?P<podcast_id>.*)\.xml', PodcastPage) podcast_page = URL('podcast09/rss_(?P<podcast_id>.*)\.xml', PodcastPage)
radio_page = URL('(?P<page>.*)', RadioPage) radio_page = URL('(?P<page>.*)', RadioPage)
def get_radio_url(self, radio, player): def get_radio_url(self, radio, player):
self.BASEURL = 'http://www.%s.fr/' % radio self.BASEURL = 'http://www.%s.fr/' % radio
return self.radio_page.go(page=player).get_url() if radio == 'francebleu':
return self.json_page.go(fbplayer=player).get_fburl()
else:
return self.radio_page.go(page=player).get_url()
def get_current(self, radio, json_url): def get_current(self, radio, url):
self.BASEURL = 'http://www.%s.fr/' % radio self.BASEURL = 'http://www.%s.fr/' % radio
return self.json_page.go(json_url=json_url).get_current() if radio == 'francebleu':
return self.radio_page.go(page=url).get_current()
else:
return self.json_page.go(json_url=url).get_current()
def get_selection(self, radio_url, json_url, radio_id): def get_selection(self, radio_url, json_url, radio_id):
self.BASEURL = 'http://www.%s.fr/' % radio_url self.BASEURL = 'http://www.%s.fr/' % radio_url

260
modules/radiofrance/module.py
View file

@ -61,9 +61,8 @@ class RadioFranceModule(Module, CapRadio, CapCollection, CapAudio):
u'podcast': u'programmes-chroniques/podcasts', u'podcast': u'programmes-chroniques/podcasts',
u'selection': u'lecteur_commun_json/reecoute-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))}, u'selection': u'lecteur_commun_json/reecoute-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbidf': {u'title': u'France Bleu Île-de-France (Paris)', 'fbidf': {u'title': u'France Bleu Île-de-France (Paris)',
u'player': u'player/france-bleu-107-1', u'player': u'107-1',
u'live': u'lecteur_commun_json/timeline-9753', u'live': u'grid/107-1'},
u'selection': u'lecteur_commun_json/reecoute-9753-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fipradio': {u'title': u'FIP', 'fipradio': {u'title': u'FIP',
u'player': u'player', u'player': u'player',
u'live': 'import_si/si_titre_antenne/FIP_player_current', u'live': 'import_si/si_titre_antenne/FIP_player_current',
@ -79,181 +78,137 @@ class RadioFranceModule(Module, CapRadio, CapCollection, CapAudio):
u'podcast': u'podcasts', u'podcast': u'podcasts',
u'selection': u'lecteur_commun_json/reecoute-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))}, u'selection': u'lecteur_commun_json/reecoute-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbalsace': {u'title': u'France Bleu Alsace (Strasbourg)', 'fbalsace': {u'title': u'France Bleu Alsace (Strasbourg)',
u'player': u'player/station/france-bleu-alsace', u'player': u'alsace',
u'live': u'lecteur_commun_json/timeline-13085', u'live': u'grid/alsace'},
u'selection': u'lecteur_commun_json/reecoute-13085-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbarmorique': {u'title': u'France Bleu Armorique (Rennes)', 'fbarmorique': {u'title': u'France Bleu Armorique (Rennes)',
u'player': u'player/station/france-bleu-armorique', u'player': u'armorique',
u'live': u'lecteur_commun_json/timeline-13087', u'live': u'grid/armorique'},
u'selection': u'lecteur_commun_json/reecoute-13087-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbauxerre': {u'title': u'France Bleu Auxerre', 'fbauxerre': {u'title': u'France Bleu Auxerre',
u'player': u'player/station/france-bleu-auxerre', u'player': u'auxerre',
u'live': u'lecteur_commun_json/timeline-11219', u'live': u'grid/auxerre'},
u'selection': u'lecteur_commun_json/reecoute-11219-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbazur': {u'title': u'France Bleu Azur (Nice)', 'fbazur': {u'title': u'France Bleu Azur (Nice)',
u'player': u'player/station/france-bleu-azur', u'player': u'azur',
u'live': u'lecteur_commun_json/timeline-13089', u'live': u'grid/azur'},
u'selection': u'lecteur_commun_json/reecoute-13089-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbbassenormandie': {u'title': u'France Bleu Basse Normandie (Caen)', 'fbbassenormandie': {u'title': u'France Bleu Basse Normandie (Caen)',
u'player': u'player/station/france-bleu-bassenormandie', u'player': u'basse-normandie',
u'live': u'lecteur_commun_json/timeline-13091', u'live': u'grid/basse-normandie'},
u'selection': u'lecteur_commun_json/reecoute-13091-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbbearn': {u'title': u'France Bleu Bearn (Pau)', 'fbbearn': {u'title': u'France Bleu Bearn (Pau)',
u'player': u'player/station/france-bleu-bearn', u'player': u'bearn',
u'live': u'lecteur_commun_json/timeline-13093', u'live': u'grid/bearn'},
u'selection': u'lecteur_commun_json/reecoute-13093-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbbelfort': {u'title': u'France Bleu Belfort', 'fbbelfort': {u'title': u'France Bleu Belfort',
u'player': u'player/station/france-bleu-belfort', u'player': u'belfort-montbeliard',
u'live': u'lecteur_commun_json/timeline-13095', u'live': u'grid/belfort-montbeliard'},
u'selection': u'lecteur_commun_json/reecoute-13095-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbberry': {u'title': u'France Bleu Berry (Châteauroux)', 'fbberry': {u'title': u'France Bleu Berry (Châteauroux)',
u'player': u'player/station/france-bleu-berry', u'player': u'berry',
u'live': u'lecteur_commun_json/timeline-11223', u'live': u'grid/berry'},
u'selection': u'lecteur_commun_json/reecoute-11223-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbbesancon': {u'title': u'France Bleu Besancon', 'fbbesancon': {u'title': u'France Bleu Besancon',
u'player': u'player/station/france-bleu-besancon', u'player': u'besancon',
u'live': u'lecteur_commun_json/timeline-13097', u'live': u'grid/besancon'},
u'selection': u'lecteur_commun_json/reecoute-13097-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbbourgogne': {u'title': u'France Bleu Bourgogne (Dijon)', 'fbbourgogne': {u'title': u'France Bleu Bourgogne (Dijon)',
u'player': u'player/station/france-bleu-bourgogne', u'player': u'bourgogne',
u'live': u'lecteur_commun_json/timeline-13099', u'live': u'grid/bourgogne'},
u'selection': u'lecteur_commun_json/reecoute-13099-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))}, 'fbbreihzizel': {u'title': u'France Bleu Breizh Izel (Quimper)',
'fbbreizizel': {u'title': u'France Bleu Breiz Izel (Quimper)', u'player': u'breizh-izel',
u'player': u'player/station/france-bleu-breizizel', u'live': u'grid/breizh-izel'},
u'live': u'lecteur_commun_json/timeline-13101',
u'selection': u'lecteur_commun_json/reecoute-13101-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbchampagne': {u'title': u'France Bleu Champagne (Reims)', 'fbchampagne': {u'title': u'France Bleu Champagne (Reims)',
u'player': u'player/station/france-bleu-champagne', u'player': u'champagne-ardenne',
u'live': u'lecteur_commun_json/timeline-13103', u'live': u'grid/champagne-ardenne'},
u'selection': u'lecteur_commun_json/reecoute-13103-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbcotentin': {u'title': u'France Bleu Cotentin (Cherbourg)', 'fbcotentin': {u'title': u'France Bleu Cotentin (Cherbourg)',
u'player': u'player/station/france-bleu-cotentin', u'player': u'cotentin',
u'live': u'lecteur_commun_json/timeline-13105', u'live': u'grid/cotentin'},
u'selection': u'lecteur_commun_json/reecoute-13105-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbcreuse': {u'title': u'France Bleu Creuse (Gueret)', 'fbcreuse': {u'title': u'France Bleu Creuse (Gueret)',
u'player': u'player/station/france-bleu-creuse', u'player': u'creuse',
u'live': u'lecteur_commun_json/timeline-13107', u'live': u'grid/creuse'},
u'selection': u'lecteur_commun_json/reecoute-13107-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbdromeardeche': {u'title': u'France Bleu Drome Ardeche (Valence)', 'fbdromeardeche': {u'title': u'France Bleu Drome Ardeche (Valence)',
u'player': u'player/station/france-bleu-dromeardeche', u'player': u'drome-ardeche',
u'live': u'lecteur_commun_json/timeline-13109', u'live': u'grid/drome-ardeche'},
u'selection': u'lecteur_commun_json/reecoute-13109-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbelsass': {u'title': u'France Bleu Elsass', 'fbelsass': {u'title': u'France Bleu Elsass',
u'player': 'player/station/france-bleu-elsass', u'player': 'elsass',
u'live': u'lecteur_commun_json/timeline-19370', u'live': u'grid/elsass'},
u'selection': u'lecteur_commun_json/reecoute-19370-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbgardlozere': {u'title': u'France Bleu Gard Lozère (Nîmes)', 'fbgardlozere': {u'title': u'France Bleu Gard Lozère (Nîmes)',
u'player': u'player/station/france-bleu-gardlozere', u'player': u'gard-lozere',
u'live': u'lecteur_commun_json/timeline-13111', u'live': u'grid/gard-lozere'},
u'selection': u'lecteur_commun_json/reecoute-13111-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbgascogne': {u'title': u'France Bleu Gascogne (Mont-de-Marsan)', 'fbgascogne': {u'title': u'France Bleu Gascogne (Mont-de-Marsan)',
u'player': u'player/station/france-bleu-gascogne', u'player': u'gascogne',
u'live': u'lecteur_commun_json/timeline-13113', u'live': u'grid/gascogne'},
u'selection': u'lecteur_commun_json/reecoute-13113-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbgironde': {u'title': u'France Bleu Gironde (Bordeaux)', 'fbgironde': {u'title': u'France Bleu Gironde (Bordeaux)',
u'player': u'player/station/france-bleu-gironde', u'player': u'gironde',
u'live': u'lecteur_commun_json/timeline-13115', u'live': u'grid/gironde'},
u'selection': u'lecteur_commun_json/reecoute-13115-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbhautenormandie': {u'title': u'France Bleu Haute Normandie (Rouen)', 'fbhautenormandie': {u'title': u'France Bleu Haute Normandie (Rouen)',
u'player': u'player/station/france-bleu-hautenormandie', u'player': u'haute-normandie',
u'live': u'lecteur_commun_json/timeline-13117', u'live': u'grid/haute-normandie'},
u'selection': u'lecteur_commun_json/reecoute-13117-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbherault': {u'title': u'France Bleu Hérault (Montpellier)', 'fbherault': {u'title': u'France Bleu Hérault (Montpellier)',
u'player': u'player/station/france-bleu-herault', u'player': u'herault',
u'live': u'lecteur_commun_json/timeline-11231', u'live': u'grid/herault'},
u'selection': u'lecteur_commun_json/reecoute-11231-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbisere': {u'title': u'France Bleu Isère (Grenoble)', 'fbisere': {u'title': u'France Bleu Isère (Grenoble)',
u'player': u'player/station/france-bleu-isere', u'player': u'isere',
u'live': u'lecteur_commun_json/timeline-13119', u'live': u'grid/isere'},
u'selection': u'lecteur_commun_json/reecoute-13119-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fblarochelle': {u'title': u'France Bleu La Rochelle', 'fblarochelle': {u'title': u'France Bleu La Rochelle',
u'player': u'player/station/france-bleu-larochelle', u'player': u'la-rochelle',
u'live': u'lecteur_commun_json/timeline-13121', u'live': u'grid/la-rochelle'},
u'selection': u'lecteur_commun_json/reecoute-13121-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fblimousin': {u'title': u'France Bleu Limousin (Limoges)', 'fblimousin': {u'title': u'France Bleu Limousin (Limoges)',
u'player': u'player/station/france-bleu-limousin', u'player': u'limousin',
u'live': u'lecteur_commun_json/timeline-13123', u'live': u'grid/limousin'},
u'selection': u'lecteur_commun_json/reecoute-13123-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbloireocean': {u'title': u'France Bleu Loire Océan (Nantes)', 'fbloireocean': {u'title': u'France Bleu Loire Océan (Nantes)',
u'player': u'player/station/france-bleu-loireocean', u'player': u'loire-ocean',
u'live': u'lecteur_commun_json/timeline-13125', u'live': u'grid/loire-ocean'},
u'selection': u'lecteur_commun_json/reecoute-13125-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fblorrainenord': {u'title': u'France Bleu Lorraine Nord (Metz)', 'fblorrainenord': {u'title': u'France Bleu Lorraine Nord (Metz)',
u'player': u'player/station/france-bleu-lorrainenord', u'player': u'lorraine-nord',
u'live': u'lecteur_commun_json/timeline-13127', u'live': u'grid/lorraine-nord'},
u'selection': u'lecteur_commun_json/reecoute-13127-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbmaine': {u'title': u'France Bleu Maine', 'fbmaine': {u'title': u'France Bleu Maine',
u'player': 'player/station/france-bleu-maine', u'player': 'maine',
u'live': u'lecteur_commun_json/timeline-13129', u'live': u'grid/maine'},
u'selection': u'lecteur_commun_json/reecoute-13129-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbmayenne': {u'title': u'France Bleu Mayenne (Laval)', 'fbmayenne': {u'title': u'France Bleu Mayenne (Laval)',
u'player': u'player/station/france-bleu-mayenne', u'player': u'mayenne',
u'live': u'lecteur_commun_json/timeline-13131', u'live': u'grid/mayenne'},
u'selection': u'lecteur_commun_json/reecoute-13131-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbnord': {u'title': u'France Bleu Nord (Lille)', 'fbnord': {u'title': u'France Bleu Nord (Lille)',
u'player': u'player/station/france-bleu-nord', u'player': u'nord',
u'live': u'lecteur_commun_json/timeline-11235', u'live': u'grid/nord'},
u'selection': u'lecteur_commun_json/reecoute-11235-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fborleans': {u'title': u'France Bleu Orléans', 'fborleans': {u'title': u'France Bleu Orléans',
u'player': u'player/station/france-bleu-orleans', u'player': u'orleans',
u'live': u'lecteur_commun_json/timeline-13133', u'live': u'grid/orleans'},
u'selection': u'lecteur_commun_json/reecoute-13133-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbpaysbasque': {u'title': u'France Bleu Pays Basque (Bayonne)', 'fbpaysbasque': {u'title': u'France Bleu Pays Basque (Bayonne)',
u'player': u'player/station/france-bleu-paysbasque', u'player': u'pays-basque',
u'live': u'lecteur_commun_json/timeline-13135', u'live': u'grid/pays-basque'},
u'selection': u'lecteur_commun_json/reecoute-13135-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbpaysdauvergne': {u'title': u'France Bleu Pays d\'Auvergne (Clermont-Ferrand)', 'fbpaysdauvergne': {u'title': u'France Bleu Pays d\'Auvergne (Clermont-Ferrand)',
u'player': u'player/station/france-bleu-paysdauvergne', u'player': u'pays-d-auvergne',
u'live': u'lecteur_commun_json/timeline-11237', u'live': u'grid/pays-d-auvergne'},
u'selection': u'lecteur_commun_json/reecoute-11237-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbpaysdesavoie': {u'title': u'France Bleu Pays de Savoie (Chambery)', 'fbpaysdesavoie': {u'title': u'France Bleu Pays de Savoie (Chambery)',
u'player': u'player/station/france-bleu-paysdesavoie', u'player': u'pays-de-savoie',
u'live': u'lecteur_commun_json/timeline-11239', u'live': u'grid/pays-de-savoie'},
u'selection': u'lecteur_commun_json/reecoute-11239-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbperigord': {u'title': u'France Bleu Périgord (Périgueux)', 'fbperigord': {u'title': u'France Bleu Périgord (Périgueux)',
u'player': u'player/station/france-bleu-perigord', u'player': u'perigord',
u'live': u'lecteur_commun_json/timeline-13137', u'live': u'grid/perigord'},
u'selection': u'lecteur_commun_json/reecoute-13137-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbpicardie': {u'title': u'France Bleu Picardie (Amiens)', 'fbpicardie': {u'title': u'France Bleu Picardie (Amiens)',
u'player': u'player/station/france-bleu-picardie', u'player': u'picardie',
u'live': u'lecteur_commun_json/timeline-13139', u'live': u'grid/picardie'},
u'selection': u'lecteur_commun_json/reecoute-13139-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbpoitou': {u'title': u'France Bleu Poitou (Poitiers)', 'fbpoitou': {u'title': u'France Bleu Poitou (Poitiers)',
u'player': u'player/station/france-bleu-poitou', u'player': u'poitou',
u'live': u'lecteur_commun_json/timeline-13141', u'live': u'grid/poitou'},
u'selection': u'lecteur_commun_json/reecoute-13141-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbprovence': {u'title': u'France Bleu Provence (Aix-en-Provence)', 'fbprovence': {u'title': u'France Bleu Provence (Aix-en-Provence)',
u'player': u'player/station/france-bleu-provence', u'player': u'provence',
u'live': u'lecteur_commun_json/timeline-11241', u'live': u'grid/provence'},
u'selection': u'lecteur_commun_json/reecoute-11241-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbrcfm': {u'title': u'France Bleu RCFM', 'fbrcfm': {u'title': u'France Bleu RCFM',
u'player': u'player/station/france-bleu-rcfm', u'player': u'rcfm',
u'live': u'lecteur_commun_json/timeline-13143', u'live': u'grid/rcfm'},
u'selection': u'lecteur_commun_json/reecoute-13143-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbsaintetienneloire': {u'title': u'France Bleu Saint-Etienne Loire', 'fbsaintetienneloire': {u'title': u'France Bleu Saint-Etienne Loire',
u'player': u'player/station/france-bleu-saint-etienne-loire', u'player': u'saint-etienne-loire',
u'live': u'lecteur_commun_json/timeline-60434', u'live': u'grid/saint-etienne-loire'},
u'selection': u'lecteur_commun_json/reecoute-60434-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbroussillon': {u'title': u'France Bleu Roussillon', 'fbroussillon': {u'title': u'France Bleu Roussillon',
u'player': u'player/station/france-bleu-roussillon', u'player': u'roussillon',
u'live': u'lecteur_commun_json/timeline-11243', u'live': u'grid/roussillon'},
u'selection': u'lecteur_commun_json/reecoute-11243-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbsudlorraine': {u'title': u'France Bleu Sud Lorraine (Nancy)', 'fbsudlorraine': {u'title': u'France Bleu Sud Lorraine (Nancy)',
u'player': u'player/station/france-bleu-sudlorraine', u'player': u'sud-lorraine',
u'live': u'lecteur_commun_json/timeline-13145', u'live': u'grid/sud-lorraine'},
u'selection': u'lecteur_commun_json/reecoute-13145-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbtoulouse': {u'title': u'France Bleu Toulouse', 'fbtoulouse': {u'title': u'France Bleu Toulouse',
u'player': u'player/station/france-bleu-toulouse', u'player': u'toulouse',
u'live': u'lecteur_commun_json/timeline-13147', u'live': u'grid/toulouse'},
u'selection': u'lecteur_commun_json/reecoute-13147-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbtouraine': {u'title': u'France Bleu Touraine (Tours)', 'fbtouraine': {u'title': u'France Bleu Touraine (Tours)',
u'player': u'player/station/france-bleu-touraine', u'player': u'touraine',
u'live': u'lecteur_commun_json/timeline-13149', u'live': u'grid/touraine'},
u'selection': u'lecteur_commun_json/reecoute-13149-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
'fbvaucluse': {u'title': u'France Bleu Vaucluse (Avignon)', 'fbvaucluse': {u'title': u'France Bleu Vaucluse (Avignon)',
u'player': u'player/station/france-bleu-vaucluse', u'player': u'vaucluse',
u'live': u'lecteur_commun_json/timeline-13151', u'live': u'grid/vaucluse'},
u'selection': u'lecteur_commun_json/reecoute-13151-%s' % int(time.mktime(datetime.now().replace(hour=14, minute=0, second=0).timetuple()))},
} }
def iter_resources(self, objs, split_path): def iter_resources(self, objs, split_path):
@ -272,6 +227,7 @@ class RadioFranceModule(Module, CapRadio, CapCollection, CapAudio):
elif len(split_path) > 1 and split_path[1] in self._RADIOS: elif len(split_path) > 1 and split_path[1] in self._RADIOS:
if len(split_path) == 2: if len(split_path) == 2:
yield Collection([split_path[0], u'direct'], u'Direct') yield Collection([split_path[0], u'direct'], u'Direct')
if 'selection' in self._RADIOS[split_path[1]]:
yield Collection([split_path[0], u'selection'], u'Selection') yield Collection([split_path[0], u'selection'], u'Selection')
elif len(split_path) == 3 and split_path[2] == 'selection': elif len(split_path) == 3 and split_path[2] == 'selection':
@ -287,17 +243,19 @@ class RadioFranceModule(Module, CapRadio, CapCollection, CapAudio):
elif len(split_path) == 1: elif len(split_path) == 1:
yield Collection([split_path[0], u'direct'], u'Direct') yield Collection([split_path[0], u'direct'], u'Direct')
yield Collection([split_path[0], u'selection'], u'Selection') if 'selection' in self._RADIOS[split_path[0]]:
yield Collection([split_path[0], u'selection'], u'Selection')
if 'podcast' in self._RADIOS[split_path[0]]: if 'podcast' in self._RADIOS[split_path[0]]:
yield Collection([split_path[0], u'podcasts'], u'Podcast') yield Collection([split_path[0], u'podcasts'], u'Podcast')
elif len(split_path) == 2 and split_path[1] == 'selection': elif len(split_path) == 2 and split_path[1] == 'selection':
for _id, item in sorted(self._RADIOS.iteritems()): for _id, item in sorted(self._RADIOS.iteritems()):
if _id == split_path[0]: if _id == split_path[0]:
selection_url = self._RADIOS[_id]['selection'] if 'selection' in self._RADIOS[_id]:
for item in self.browser.get_selection(_id, selection_url, _id): selection_url = self._RADIOS[_id]['selection']
yield item for item in self.browser.get_selection(_id, selection_url, _id):
break yield item
break
elif len(split_path) == 2 and split_path[1] == 'podcasts': elif len(split_path) == 2 and split_path[1] == 'podcasts':
for item in self.browser.get_podcast_emissions(split_path[0], for item in self.browser.get_podcast_emissions(split_path[0],
@ -353,9 +311,9 @@ class RadioFranceModule(Module, CapRadio, CapCollection, CapAudio):
def fill_radio(self, radio, fields): def fill_radio(self, radio, fields):
if 'current' in fields: if 'current' in fields:
title = self._RADIOS[radio.id]['title'] title = self._RADIOS[radio.id]['title']
json_url = self._RADIOS[radio.id]['live'] live_url = self._RADIOS[radio.id]['live']
radio_name = radio.id if not radio.id.startswith('fb') else 'francebleu' radio_name = radio.id if not radio.id.startswith('fb') else 'francebleu'
artist, title = self.browser.get_current(radio_name, json_url) artist, title = self.browser.get_current(radio_name, live_url)
if not radio.current or radio.current is NotLoaded: if not radio.current or radio.current is NotLoaded:
radio.current = StreamInfo(0) radio.current = StreamInfo(0)
radio.current.what = title radio.current.what = title
@ -375,17 +333,19 @@ class RadioFranceModule(Module, CapRadio, CapCollection, CapAudio):
def search_audio(self, pattern, sortby=CapAudio.SEARCH_RELEVANCE): def search_audio(self, pattern, sortby=CapAudio.SEARCH_RELEVANCE):
for radio in self._RADIOS: for radio in self._RADIOS:
selection_url = self._RADIOS[radio]['selection'] if 'selection' in self._RADIOS[radio]:
radio_url = radio if not radio.startswith('fb') else 'francebleu' selection_url = self._RADIOS[radio]['selection']
for item in self.browser.search_audio(pattern, radio_url, selection_url, radio): radio_url = radio if not radio.startswith('fb') else 'francebleu'
yield item for item in self.browser.search_audio(pattern, radio_url, selection_url, radio):
yield item
def get_audio(self, _id): def get_audio(self, _id):
radio = self.get_radio_id(_id) radio = self.get_radio_id(_id)
if radio in self._RADIOS: if radio in self._RADIOS:
selection_url = self._RADIOS[radio]['selection'] if 'selection' in self._RADIOS[radio]:
radio_url = radio if not radio.startswith('fb') else 'francebleu' selection_url = self._RADIOS[radio]['selection']
return self.browser.get_audio(_id, radio_url, selection_url, radio) radio_url = radio if not radio.startswith('fb') else 'francebleu'
return self.browser.get_audio(_id, radio_url, selection_url, radio)
elif radio == 'podcast': elif radio == 'podcast':
m = re.match('audio\.podcast\.(\d*)-.*', _id) m = re.match('audio\.podcast\.(\d*)-.*', _id)
if m: if m:

31
modules/radiofrance/pages.py
View file

@ -20,14 +20,14 @@
from weboob.browser.elements import ItemElement, DictElement, ListElement, method from weboob.browser.elements import ItemElement, DictElement, ListElement, method
from weboob.browser.pages import HTMLPage, JsonPage, XMLPage from weboob.browser.pages import HTMLPage, JsonPage, XMLPage
from weboob.browser.filters.json import Dict from weboob.browser.filters.json import Dict
from weboob.browser.filters.standard import Format, CleanText, Join, Env, Regexp, Duration from weboob.browser.filters.standard import Format, CleanText, Join, Env, Regexp, Duration, Time
from weboob.capabilities.audio import BaseAudio from weboob.capabilities.audio import BaseAudio
from weboob.tools.capabilities.audio.audio import BaseAudioIdFilter from weboob.tools.capabilities.audio.audio import BaseAudioIdFilter
from weboob.capabilities.image import BaseImage from weboob.capabilities.image import BaseImage
from weboob.capabilities.collection import Collection from weboob.capabilities.collection import Collection
import time import time
from datetime import timedelta from datetime import timedelta, datetime, date
class PodcastPage(XMLPage): class PodcastPage(XMLPage):
@ -64,7 +64,10 @@ class PodcastPage(XMLPage):
class RadioPage(HTMLPage): class RadioPage(HTMLPage):
def get_url(self): def get_url(self):
return CleanText('//a[@id="player"][1]/@href')(self.doc) url = Regexp(CleanText('//script'), '.*liveUrl: \'(.*)\', timeshiftUrl.*', default=None)(self.doc)
if not url:
url = CleanText('//a[@id="player"][1]/@href')(self.doc)
return url
def get_france_culture_podcasts_url(self): def get_france_culture_podcasts_url(self):
return Regexp(CleanText('//a[@class="lien-rss"][1]/@href'), return Regexp(CleanText('//a[@class="lien-rss"][1]/@href'),
@ -176,6 +179,20 @@ class RadioPage(HTMLPage):
'http://radiofrance-podcast.net/podcast09/rss_(.*).xml') 'http://radiofrance-podcast.net/podcast09/rss_(.*).xml')
obj_title = CleanText('./h2/a') obj_title = CleanText('./h2/a')
def get_current(self):
now = datetime.now()
today = date.today()
emission_title = u''
for el in self.doc.xpath('//li[@class="chronique clear"]'):
emission_time = Time(CleanText('./div[@class="quand"]',
replace=[(u'à', '')]))(el)
emission_datetime = datetime.combine(today, emission_time)
if emission_datetime > now:
return u'', emission_title
emission_title = CleanText('./h3[@class="titre"]')(el)
return u'', u''
class JsonPage(JsonPage): class JsonPage(JsonPage):
@method @method
@ -222,7 +239,8 @@ class JsonPage(JsonPage):
now = int(time.time()) now = int(time.time())
for item in self.doc['diffusions']: for item in self.doc['diffusions']:
if item['debut'] < now and item['fin'] > now: if item['debut'] < now and item['fin'] > now:
title = u'%s: %s' % (item['title_emission'], item['title_diff']) title = u'%s: %s' % (item['title_emission'],
item['title_diff'] if 'title_diff' in item else '')
person = u'' person = u''
return person, title return person, title
return u'', u'' return u'', u''
@ -243,3 +261,8 @@ class JsonPage(JsonPage):
person = u','.join(item['personnes']) person = u','.join(item['personnes'])
return person, title return person, title
return u'', u'' return u'', u''
def get_fburl(self):
for el in self.doc['url']:
if el['type'] == 'live' and el['bitrate'] == 128:
return Dict('url')(el)

17
modules/radiofrance/test.py
View file

@ -47,12 +47,17 @@ class RadioFranceTest(BackendTest):
streams = self.backend.get_radio(radio.split_path[-1]).streams streams = self.backend.get_radio(radio.split_path[-1]).streams
self.assertTrue(len(streams) > 0) self.assertTrue(len(streams) > 0)
l_sel = list(self.backend.iter_resources(objs=[BaseAudio], l_sel1 = list(self.backend.iter_resources(objs=[BaseAudio],
split_path=['francebleu', split_path=['francebleu',
radio.split_path[-1], radio.split_path[-1]]))
'selection']))
if len(l_sel) > 0: if 'Selection' in [el.title for el in l_sel1]:
self.assertTrue(len(l_sel[0].url) > 0) l_sel = list(self.backend.iter_resources(objs=[BaseAudio],
split_path=['francebleu',
radio.split_path[-1],
'selection']))
if len(l_sel) > 0:
self.assertTrue(len(l_sel[0].url) > 0)
def test_podcasts(self): def test_podcasts(self):
for key, item in self.backend._RADIOS.iteritems(): for key, item in self.backend._RADIOS.iteritems():