diff --git a/platformcode/config.py b/platformcode/config.py index 87ea5ea1..1a752590 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -94,31 +94,15 @@ def get_videolibrary_support(): return True def get_channel_url(name): - def json(): - try: - try: - import json - except: - import simplejson as json - ROOT_DIR = xbmc.translatePath(__settings__.getAddonInfo('Path')) - LOCAL_FILE = os.path.join(ROOT_DIR, "channels.json") - with open(LOCAL_FILE) as f: - data = json.load(f) - if data[name] is not None: - return data[name] - else: - return get_setting("channel_host", name) - except: - return get_setting("channel_host", name) - - if __settings__.getSetting("use_custom_url") == "true": - host = get_setting("channel_host", name) - if host: - return host - else: - return json() - else: - return json() + try: + import json + except: + import simplejson as json + ROOT_DIR = xbmc.translatePath(__settings__.getAddonInfo('Path')) + LOCAL_FILE = os.path.join(ROOT_DIR, "channels.json") + with open(LOCAL_FILE) as f: + data = json.load(f) + return data[name] def get_system_platform(): """ fonction: pour recuperer la platform que xbmc tourne """ diff --git a/resources/settings.xml b/resources/settings.xml index 89b0e9cb..e77fc16c 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -10,7 +10,6 @@ -