Merge remote-tracking branch 'origin/master'

channels/animeworld.py

@@ -9,8 +9,6 @@ __channel__ = "animeworld"
 host = support.config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
-IDIOMAS = {'Italiano': 'Italiano'}
-list_language = IDIOMAS.values()
 list_servers = ['animeworld', 'verystream', 'streamango', 'openload', 'directo']
 list_quality = ['default', '480p', '720p', '1080p']
 
@@ -130,6 +128,15 @@ def episodios(item):
         item.title += support.typo(item.fulltitle,'-- bold')
         return item
     action='findvideos'
+    def itemlistHook(itemlist):
+        if len(itemlist) == 0:
+            itemlist.append(
+                support.Item(
+                    channel=item.channel,
+                    title=support.typo('VVVVID NON SUPPORTATO','bold'),
+                    folder=False
+                    ))
+        return itemlist
     return locals()
 
 
@@ -146,23 +153,32 @@ def findvideos(item):
         ID = support.scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="' + (number if number else '1') + '"')
         support.log('ID= ',serverid)
         if id:
-            dataJson = support.httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, ID, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
+            if serverid == '26': # IF VVVVID
-            json = jsontools.load(dataJson)
-            videoData +='\n'+json['grabber']
-
-            if serverid == '28':
                 itemlist.append(
                     support.Item(
                         channel=item.channel,
-                        action="play",
+                        title=support.typo('VVVVID NON SUPPORTATO','bold'),
-                        title='diretto',
-                        quality='',
-                        url=json['grabber'],
-                        server='directo',
-                        fulltitle=item.fulltitle,
-                        show=item.show,
-                        contentType=item.contentType,
                         folder=False))
+                return itemlist
+
+            else:
+                dataJson = support.httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, ID, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
+                json = jsontools.load(dataJson)
+                videoData +='\n'+json['grabber']
+
+                if serverid == '28':
+                    itemlist.append(
+                        support.Item(
+                            channel=item.channel,
+                            action="play",
+                            title='diretto',
+                            quality='',
+                            url=json['grabber'],
+                            server='directo',
+                            fulltitle=item.fulltitle,
+                            show=item.show,
+                            contentType=item.contentType,
+                            folder=False))
 
     return support.server(item, videoData, itemlist)
 

core/support.py

@@ -281,8 +281,8 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
                 infoLabels=infolabels,
                 thumbnail=item.thumbnail if function == 'episodios' else scraped["thumb"] ,
                 args=item.args,
-                contentSerieName= title if item.contentType != 'movie' and function != 'episodios' else item.fulltitle if function == 'episodios' else '',
+                contentSerieName= title if item.contentType or CT != 'movie' and function != 'episodios' else item.fulltitle if function == 'episodios' else '',
-                contentTitle= title if item.contentType == 'movie' else '',
+                contentTitle= title if item.contentType or CT == 'movie' else '',
                 contentLanguage = lang,
                 ep=episode if episode else ''
             )
@@ -406,16 +406,18 @@ def scrape(func):
         if action != 'play' and function != 'episodios' and 'patronMenu' not in args:
             tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
+        from specials import autorenumber
         if anime:            
-            from specials import autorenumber
             if function == 'episodios' or item.action == 'episodios': autorenumber.renumber(itemlist, item, 'bold')
             else: autorenumber.renumber(itemlist)
-
+        if anime and autorenumber.check(item) == False:
-        if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
+            pass
-            # item.fulltitle = item.infoLabels["title"]
+        else:
-            videolibrary(itemlist, item, function=function)
+            if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
-        if config.get_setting('downloadenabled') and (function == 'episodios' or function == 'finvideos'):
+                # item.fulltitle = item.infoLabels["title"]
-            download(itemlist, item, function=function)
+                videolibrary(itemlist, item, function=function)
+            if config.get_setting('downloadenabled') and (function == 'episodios' or function == 'finvideos'):
+                download(itemlist, item, function=function)
 
         if 'patronMenu' in args:
             itemlist = thumb(itemlist, genre=True)

specials/autorenumber.py

@@ -387,3 +387,16 @@ def error(itemlist):
     heading = itemlist[0].fulltitle.strip()
     platformtools.dialog_notification(heading, message)
     return itemlist
+
+def check(item):
+    try:
+        dict_series = jsontools.get_node_from_file(item.channel, TAG_TVSHOW_RENUMERATE)
+        TITLE = item.fulltitle.rstrip()
+        ID = dict_series[TITLE][TAG_ID]
+        SEASON = dict_series[TITLE][TAG_SEASON]
+        EPISODE = dict_series[TITLE][TAG_EPISODE]
+        MODE = dict_series[TITLE][TAG_MODE]
+        exist = True
+    except:
+        exist = False
+    return exist