From 47243c1ade58be3d6fd60294e1d24ae932942211 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Thu, 3 Feb 2011 18:10:07 +0100 Subject: [PATCH] fix broken ouifm backend (to get current songs) --- weboob/backends/ouifm/browser.py | 10 +++++++--- weboob/backends/ouifm/pages.py | 10 +++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/weboob/backends/ouifm/browser.py b/weboob/backends/ouifm/browser.py index 0cb00aa0..416bce80 100644 --- a/weboob/backends/ouifm/browser.py +++ b/weboob/backends/ouifm/browser.py @@ -26,11 +26,15 @@ __all__ = ['OuiFMBrowser'] class OuiFMBrowser(BaseBrowser): DOMAIN = u'www.ouifm.fr' - PAGES = {r'.*ouifm.fr/scripts_player/decode_json.php': PlayerPage, + PAGES = {r'.*ouifm.fr/player/decode_json.*.php': PlayerPage, } def get_current(self, radio): - self.location('/scripts_player/decode_json.php') + if radio == 'general': + _radio = '' + else: + _radio = '_%s' % radio + self.location('/player/decode_json%s.php' % _radio) assert self.is_on_page(PlayerPage) - return self.page.get_current(radio) + return self.page.get_current() diff --git a/weboob/backends/ouifm/pages.py b/weboob/backends/ouifm/pages.py index 4a94844b..da54d575 100644 --- a/weboob/backends/ouifm/pages.py +++ b/weboob/backends/ouifm/pages.py @@ -24,11 +24,7 @@ __all__ = ['PlayerPage'] class PlayerPage(BasePage): - def get_current(self, radio): - if radio == 'general': - _radio = '' - else: - _radio = '_%s' % radio - title = select(self.document.getroot(), 'div#titre%s' % _radio, 1).text.strip() - artist = select(self.document.getroot(), 'div#artiste%s' % _radio, 1).text.strip() + def get_current(self): + title = select(self.document.getroot(), 'div#liste_titres span.titre', 1).text.strip() + artist = select(self.document.getroot(), 'div#liste_titres span.artiste', 1).text.strip() return unicode(artist), unicode(title)