From 6c8f1ae1bdaafafb4432bd0c8746877cddd5388b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= Date: Thu, 29 Aug 2013 00:20:46 +0200 Subject: [PATCH] AudioAddict: reverse radio.id naming scheme radioName.network@audioaddict seems more readable than network.radioName@audioaddict --- modules/audioaddict/backend.py | 12 ++++++------ modules/audioaddict/test.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/audioaddict/backend.py b/modules/audioaddict/backend.py index 3ad396d8..f55fdde0 100644 --- a/modules/audioaddict/backend.py +++ b/modules/audioaddict/backend.py @@ -181,7 +181,7 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection): for radio in self.RADIOS[network]: radio_dict = self.RADIOS[network][radio] 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): self._fetch_radio_list() @@ -190,7 +190,7 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection): for network in self.config['networks'].get().split(): if split_path == [network]: for radio in self.RADIOS[network]: - yield self.get_radio(network+"."+radio) + yield self.get_radio(radio+"."+network) return for network in self.config['networks'].get().split(): yield Collection([network],self.NETWORKS[network]['desc']) @@ -220,8 +220,8 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection): if not isinstance(radio, Radio): radio = Radio(radio) - network=radio.id[:radio.id.find(".")] - radioName=radio.id[radio.id.find(".")+1:] + network=radio.id[radio.id.find(".")+1:] + radioName=radio.id[:radio.id.find(".")] if not radioName in self.RADIOS[network]: return None @@ -249,8 +249,8 @@ class AudioAddictBackend(BaseBackend, ICapRadio, ICapCollection): def fill_radio(self, radio, fields): if 'current' in fields: - network=radio.id[:radio.id.find(".")] - radioName=radio.id[radio.id.find(".")+1:] + network=radio.id[radio.id.find(".")+1:] + radioName=radio.id[:radio.id.find(".")] radio.current = Emission(0) radio.current.artist, radio.current.title = self.get_current(network,radioName) return radio diff --git a/modules/audioaddict/test.py b/modules/audioaddict/test.py index 36cfcac6..686afd3d 100644 --- a/modules/audioaddict/test.py +++ b/modules/audioaddict/test.py @@ -32,7 +32,7 @@ class AudioAddictTest(BackendTest): search = list(self.backend.iter_radios_search('classic')) 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.description) self.assertTrue(radio.current.title)