Merge branch 'master' of https://github.com/kodiondemand/addon

core/channeltools.py

@@ -134,6 +134,8 @@ def get_channel_json(channel_name):
         channel_path = filetools.join(config.get_runtime_path(), "channels", channel_name + ".json")
         if not os.path.isfile(channel_path):
             channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json")
+            if not os.path.isfile(channel_path):
+                channel_path = filetools.join(config.get_runtime_path(), "servers", channel_name + ".json")
         if filetools.isfile(channel_path):
             # logger.info("channel_data=" + channel_path)
             channel_json = jsontools.load(filetools.read(channel_path))

servers/deltabit.py

@@ -30,6 +30,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     sources = scrapertools.find_single_match(data, 'sources: \[([^\]]+)\]')
     
     for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'):
+        media_url = media_url.replace('https:', 'http:')
         ext = scrapertools.get_filename_from_url(media_url)[-4:]
         video_urls.append(["%s [deltabit]" % (ext), media_url])    
     return video_urls

specials/side_menu.py

@@ -85,7 +85,7 @@ def get_start_page():
         config.get_localized_string(59976): 'latino',
         config.get_localized_string(70171): 'torrent',
     }
-    category = dictCategory[config.get_setting("category")]
+    category = dictCategory[config.get_localized_string(config.get_setting("category"))]
 
     custom_start= config.get_setting("custom_start")
     #if category != 'definido':