Merge remote-tracking branch 'refs/remotes/origin/master'

channels/autorenumber.py

@@ -44,11 +44,25 @@ def config_item(item):
     tvdb.find_and_set_infoLabels(item)
     data = ''
     data = add_season(data)
-    if not item.infoLabels['tvdb_id']:
-        heading = 'TVDB ID'
-        item.infoLabels['tvdb_id'] = platformtools.dialog_numeric(0, heading)
+    title = item.show
+    count = 0
+    
+    while not item.infoLabels['tvdb_id']:
+        try:
+            item.show = platformtools.dialog_input(default=item.show, heading=config.get_localized_string(30112))
+            tvdb.find_and_set_infoLabels(item)
+            count = count + 1
+        except:
+            heading = config.get_localized_string(70704)
+            item.infoLabels['tvdb_id'] = platformtools.dialog_numeric(0, heading)
     data.append(item.infoLabels['tvdb_id'])
-    write_data(item.from_channel, item.show, data)
+    if item.infoLabels['tvdb_id'] != 0:
+        write_data(item.from_channel, title, data)
+    else:
+        message = config.get_localized_string(60444)
+        heading = item.show.strip()
+        platformtools.dialog_notification(heading, message)
+
 
 
 def add_season(data=None):
@@ -59,6 +73,7 @@ def add_season(data=None):
     if season != "":
         heading = config.get_localized_string(70687)
         episode = platformtools.dialog_numeric(0, heading)
+
         if episode == "0":
             heading = config.get_localized_string(70688)
             special = platformtools.dialog_numeric(0, heading)
@@ -92,6 +107,8 @@ def write_data(channel, show, data):
     heading = show.strip()
     platformtools.dialog_notification(heading, message)
 
+
+
 def renumber(itemlist, item='', typography=''):    
     log()
 
@@ -118,7 +135,7 @@ def renumber(itemlist, item='', typography=''):
                             if E == 0: 
                                 epList.append([0, SP])
                                 E = 1
-                            if episodes['airedEpisodeNumber'] >= E:
+                            if episodes['airedEpisodeNumber'] >= E or episodes['airedSeason'] > S:
                                 epList.append([episodes['airedSeason'], episodes['airedEpisodeNumber']])
                     page = page + 1
                 else:

channels/eurostreaming.py

@@ -96,7 +96,7 @@ def episodios(item):
         logger.info("blocks log: %s" % ( blocks ))
         for block in blocks:
             season_n, episode_n = scrapertoolsV2.find_single_match(block, r'(\d+)(?:×|×)(\d+)') 
-            titolo = scrapertoolsV2.find_single_match(block, r'[&#;]\d+[ ](?:([a-zA-Z0-9;&#\s]+))[ ]?(?:[^<>])')
+            titolo = scrapertoolsV2.find_single_match(block, r'[&#;]\d+[ ]([a-zA-Z0-9;&#.\s]+)[ ]?[^<>]')
             logger.info("block log: %s" % ( block ))
                 
             titolo = re.sub(r'&#215;|×', "x", titolo).replace("&#8217;","'")
@@ -170,32 +170,4 @@ def findvideos(item):
     
     itemlist = support.server(item, item.url)
     
-
-    """
-        Questa parte funziona se non vanno bene le modifiche a support
-    """
-##    support.log()
-##    itemlist =[]
-##    data= ''
-##    logger.info("Url item.url: [%s] " % item.url)
-##    
-##    urls = scrapertoolsV2.find_multiple_matches(item.url, r'href="([^"]+)"')
-##    itemlist = servertools.find_video_items(data=str(urls))
-##
-##    for videoitem in itemlist:
-##        videoitem.title = item.title + ' - [COLOR limegreen][[/COLOR]'+ videoitem.title+ ' [COLOR limegreen]][/COLOR]'
-##        videoitem.fulltitle = item.fulltitle
-##        videoitem.thumbnail = item.thumbnail
-##        videoitem.show = item.show
-##        videoitem.plot = item.plot
-##        videoitem.channel = item.channel
-##        videoitem.contentType = item.contentType
-##                
-##    # Controlla se i link sono validi
-##    if __comprueba_enlaces__:
-##        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
-##        
-##    # richiesto per AutoPlay
-##    autoplay.start(itemlist, item)
-    
     return itemlist

channels/support.py

@@ -152,7 +152,7 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data=""
             title = scrapertoolsV2.decodeHtmlentities(scraped["title"]).strip()
             plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"]))
 
-            if (scraped["quality"] and scraped["episode"]): # by greko aggiunto episode
+            if scraped["quality"] and scraped["episode"]: # by greko aggiunto episode
                 longtitle = '[B]' + title + '[/B] - [B]' + scraped["episode"] + '[/B][COLOR blue][' + scraped["quality"] + '][/COLOR]' # by greko aggiunto episode
             elif scraped["episode"]: # by greko aggiunto episode
                 longtitle = '[B]' + title + '[/B] - [B]' + scraped["episode"] + '[/B]' # by greko aggiunto episode
@@ -450,16 +450,17 @@ def videolibrary(itemlist, item, typography=''):
         contentType = 'tvshow'
 
     title = typo(config.get_localized_string(30161) + ' ' + typography)
-    if config.get_videolibrary_support() and len(itemlist) > 0:
-        itemlist.append(
-            Item(channel=item.channel,
-                 title=title,
-                 contentType=contentType,
-                 contentSerieName=item.fulltitle if contentType == 'tvshow' else '',
-                 url=item.url,
-                 action=action,
-                 extra=extra,
-                 contentTitle=item.fulltitle))
+    if inspect.stack()[1][3] == 'findvideos' and contentType == 'movie' or inspect.stack()[1][3] != 'findvideos' and contentType != 'movie':
+        if config.get_videolibrary_support() and len(itemlist) > 0:
+            itemlist.append(
+                Item(channel=item.channel,
+                     title=title,
+                     contentType=contentType,
+                     contentSerieName=item.fulltitle if contentType == 'tvshow' else '',
+                     url=item.url,
+                     action=action,
+                     extra=extra,
+                     contentTitle=item.fulltitle))
 
 
 def nextPage(itemlist, item, data, patron, function_level=1):
@@ -493,12 +494,7 @@ def server(item, data='', headers='', AutoPlay=True, CheckLinks=True):
     if not data:
         data = httptools.downloadpage(item.url, headers=headers).data
     ## fix by greko
-    # se inviamo un blocco di url dove cercare i video
-    if type(data) == list:
-        data = str(item.url)
-    else:
-        # se inviamo un singolo url dove cercare il video
-        data = item.url
+    data = str(item.url)
     ## FINE fix by greko
         
     itemlist = servertools.find_video_items(data=data)