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

* 'master' of github.com:kodiondemand/addon:
  VVVVID Fix Stagioni Multiple
  VVVVID Supporto Videoteca

channels/vvvvid.py

@@ -115,20 +115,30 @@ def episodios(item):
     itemlist = []
     json_file = current_session.get(item.url, headers=headers, params=payload).json()
     show_id = str(json_file['data'][0]['show_id'])
-    for key in json_file['data'][0]['episodes']:
+    episodes = []
-        itemlist.append(
+    for episode in json_file['data']:
-            Item(
+        episodes.append(episode['episodes'])
-                channel = item.channel,
+    for episode in episodes:
-                title = 'Episodio ' + str(key['number']) + ' - ' + key['title'],
+        for key in episode:
-                fulltitle= item.fulltitle,
+            if 'stagione' in key['title'].lower():
-                show= item.show,
+                match = support.match(key['title'].encode('ascii', 'replace'), r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)')[0][0]
-                url=  host + show_id + '/season/' + str(key['season_id']) + '/',
+                title = match[0]+'x'+match[1] + ' - ' + item.fulltitle
-                action= 'findvideos',
+            else:
-                video_id= key['video_id'],
+                title = 'Episodio ' + key['number'].encode('ascii', 'replace') + ' - ' + key['title'],
-                contentType = item.contentType
+            itemlist.append(
-            ))
+                Item(
+                    channel = item.channel,
+                    title = title,
+                    fulltitle= item.fulltitle,
+                    show= item.show,
+                    url=  host + show_id + '/season/' + str(key['season_id']) + '/',
+                    action= 'findvideos',
+                    video_id= key['video_id'],
+                    contentType = item.contentType
+                ))
     autorenumber.renumber(itemlist, item, 'bold')
-    support.videolibrary(itemlist,item)
+    if autorenumber.check(item) == True:
+        support.videolibrary(itemlist,item)
     return itemlist
 
 def findvideos(item):
@@ -154,7 +164,7 @@ def findvideos(item):
                          url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
                          server= 'directo')
                 )
-    return support.server(item, itemlist=itemlist)
+    return support.server(item, itemlist=itemlist, download=False)
 
 def make_itemlist(itemlist, item, data):
     search = item.search if item.search else ''

core/support.py

@@ -876,7 +876,7 @@ def pagination(itemlist, item, page, perpage, function_level=1):
                  thumbnail=thumb()))
     return itemlist
 
-def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True):
+def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, download=True):
 
     if not data:
         data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
@@ -927,7 +927,7 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True):
         autoplay.start(itemlist, item)
 
     if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3)
-    if get_setting('downloadenabled'): download(itemlist, item, function_level=3)
+    if get_setting('downloadenabled') and download == True: download(itemlist, item, function_level=3)
     return itemlist
 
 def filterLang(item, itemlist):

specials/autorenumber.py

@@ -262,7 +262,8 @@ def renumeration (itemlist, item, typography, dict_series, ID, SEASON, EPISODE,
         if len(EpisodeDict) >= len(itemlist):
             for item in itemlist:
                 number = scrapertoolsV2.find_single_match(item.title, r'\d+')
-                if number != '0': number.lstrip("0")
+                log('TIPO NUMBER= ', type(number))
+                number = int(number)
                 item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title
         else:
             make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE)