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

channels.json

@@ -26,8 +26,8 @@
         "filmstreaming01": "https://filmstreaming01.com",
         "guardaserie_stream": "https://guardaserie.yoga",
         "guardaseriecam": "https://guardaserie.cam",
-        "guardaserieclick": "https://www.guardaserie.kim",
-        "guardaserieicu": "https://guardaserie.trade",
+        "guardaserieclick": "https://www.guardaserie.plus",
+        "guardaserieicu": "https://guardaserie.cloud",
         "hd4me": "https://hd4me.net",
         "ilcorsaronero": "https://ilcorsaronero.link",
         "ilgeniodellostreaming": "https://ilgeniodellostreaming.soy",

channels/mediasetplay.py

@@ -97,7 +97,7 @@ def mainlist(item):
 
 def search(item, text):
     itemlist = []
-    support.debug(text)
+    logger.debug(text)
     item.search = text
 
     try:
@@ -111,7 +111,7 @@ def search(item, text):
 
 
 def menu(item):
-    support.debug()
+    logger.debug()
     itemlist = []
     # itemlist = [item.clone(title=support.typo(item.args[0], 'bullet bold'), url='', action='peliculas')]
     if item.url:
@@ -141,7 +141,7 @@ def liveDict():
     return livedict
 
 def live(item):
-    support.debug()
+    logger.debug()
     itemlist = []
     for key, value in liveDict().items():
         itemlist.append(item.clone(title=support.typo(key, 'bold'),
@@ -157,7 +157,7 @@ def live(item):
 
 
 def peliculas(item):
-    support.debug()
+    logger.debug()
     itemlist = []
     titlelist = []
     contentType = ''
@@ -219,7 +219,7 @@ def peliculas(item):
 
 
 def epmenu(item):
-    support.debug()
+    logger.debug()
     itemlist = []
     if item.seriesid:
         seasons = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-tv-seasons?bySeriesId=' + item.seriesid).json()['entries']
@@ -246,11 +246,11 @@ def epmenu(item):
 
 
 def episodios(item):
-    support.debug()
+    logger.debug()
     itemlist = []
-    json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + item.url + '}').json()['entries']
+    json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{'
+                               + item.url + '}&range=0-10000').json()['entries']
 
- 
     for it in json:
         urls = []
         if 'media' in it:
@@ -283,13 +283,13 @@ def episodios(item):
 
 
 def findvideos(item):
-    support.debug()
+    logger.debug()
     itemlist = [support.Item(server='directo', title='Mediaset Play', url=item.urls, action='play')]
     return support.server(item, itemlist=itemlist, Download=False)
 
 
 def play(item):
-    support.debug()
+    logger.debug()
     if item.livefilter:
         d = liveDict()[item.livefilter]
         item = item.clone(title=support.typo(item.livefilter, 'bold'), fulltitle=item.livefilter, urls=d['urls'], plot=d['plot'], action='play', forcethumb=True, no_return=True)
@@ -314,14 +314,14 @@ def play(item):
 
 
 def subBrand(json):
-    support.debug()
+    logger.debug()
     subBrandId = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-brands?byCustomValue={brandId}{' + json + '}').json()['entries'][-1]['mediasetprogram$subBrandId']
     json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + subBrandId + '}').json()['entries']
     return json
 
 
 def get_from_id(item):
-    support.debug()
+    logger.debug()
     json = current_session.get(entry.format(id=item.url)).json()
     if 'components' in json:
         id = quote(",".join(json["components"]))
@@ -333,7 +333,7 @@ def get_from_id(item):
 
 def get_programs(item, ret=[], args={}):
     hasMore = False
-    support.debug('DICT=',item.url)
+    logger.debug('DICT=',item.url)
     url = ''
 
     if 'search' in item.args:

specials/community.py

@@ -298,7 +298,7 @@ def episodios(item, json ='', key='', itemlist =[]):
         if 'episodes_list' in json:
             json = json['episodes_list']
         elif 'seasons_list' in json:
-            item.url = json['episodes_list']
+            item.url = json['seasons_list']
             return get_seasons(item)
         elif 'tvshows_list' in json:
             return peliculas(item, json, 'tvshows_list')

specials/videolibrary.py

@@ -2,6 +2,7 @@
 
 #from builtins import str
 import sys
+from core import support
 
 PY3 = False
 if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
@@ -476,6 +477,13 @@ def findvideos(item):
 
             item_json = Item().fromjson(filetools.read(json_path))
             list_servers = []
+            # support.dbg()
+            try: from urllib.parse import urlsplit
+            except ImportError: from urlparse import urlsplit
+            try:
+                if urlsplit(item_json.url).netloc.split('.')[0] in channel.host:
+                    item_json.url = channel.host + urlsplit(item_json.url).path
+            except: pass
 
             try:
                 # FILTERTOOLS