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

AudioAddict: reverse radio.id naming scheme

Browse source 
radioName.network@audioaddict seems more readable than
network.radioName@audioaddict
This commit is contained in:
Pierre Mazière 2013-08-29 00:20:46 +02:00 • committed by Florent
commit 6c8f1ae1bd
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/audioaddict/backend.py
View file

@ -181,7 +181,7 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection):
for radio in self.RADIOS[network]: for radio in self.RADIOS[network]:
radio_dict = self.RADIOS[network][radio] radio_dict = self.RADIOS[network][radio]
if pattern in radio_dict['name'].lower() or pattern in radio_dict['description'].lower(): if pattern in radio_dict['name'].lower() or pattern in radio_dict['description'].lower():
yield self.get_radio(network+"."+radio) yield self.get_radio(radio+"."+network)
def iter_resources(self, objs, split_path): def iter_resources(self, objs, split_path):
self._fetch_radio_list() self._fetch_radio_list()
@ -190,7 +190,7 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection):
for network in self.config['networks'].get().split(): for network in self.config['networks'].get().split():
if split_path == [network]: if split_path == [network]:
for radio in self.RADIOS[network]: for radio in self.RADIOS[network]:
yield self.get_radio(network+"."+radio) yield self.get_radio(radio+"."+network)
return return
for network in self.config['networks'].get().split(): for network in self.config['networks'].get().split():
yield Collection([network],self.NETWORKS[network]['desc']) yield Collection([network],self.NETWORKS[network]['desc'])
@ -220,8 +220,8 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection):
if not isinstance(radio, Radio): if not isinstance(radio, Radio):
radio = Radio(radio) radio = Radio(radio)
network=radio.id[:radio.id.find(".")] network=radio.id[radio.id.find(".")+1:]
radioName=radio.id[radio.id.find(".")+1:] radioName=radio.id[:radio.id.find(".")]
if not radioName in self.RADIOS[network]: if not radioName in self.RADIOS[network]:
return None return None
@ -249,8 +249,8 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection):
def fill_radio(self, radio, fields): def fill_radio(self, radio, fields):
if 'current' in fields: if 'current' in fields:
network=radio.id[:radio.id.find(".")] network=radio.id[radio.id.find(".")+1:]
radioName=radio.id[radio.id.find(".")+1:] radioName=radio.id[:radio.id.find(".")]
radio.current = Emission(0) radio.current = Emission(0)
radio.current.artist, radio.current.title = self.get_current(network,radioName) radio.current.artist, radio.current.title = self.get_current(network,radioName)
return radio return radio

2
modules/audioaddict/test.py
View file

@ -32,7 +32,7 @@ class AudioAddictTest(BackendTest):
search = list(self.backend.iter_radios_search('classic')) search = list(self.backend.iter_radios_search('classic'))
self.assertTrue(len(search) > 0) self.assertTrue(len(search) > 0)
radio = self.backend.get_radio('RockRadio.classicrock') radio = self.backend.get_radio('classicrock.RockRadio')
self.assertTrue(radio.title) self.assertTrue(radio.title)
self.assertTrue(radio.description) self.assertTrue(radio.description)
self.assertTrue(radio.current.title) self.assertTrue(radio.current.title)