Nuovi messaggi di errore, fix autoplay (wstream aveva sempre la priorità) e modifiche varie

core/filetools.py

@@ -8,7 +8,6 @@ from __future__ import division
 # from builtins import str
 import io
 
-from future.builtins import range
 from past.utils import old_div
 import sys
 PY3 = False

core/servertools.py

@@ -353,7 +353,7 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo
                         video_urls.extend(response)
                     except:
                         logger.error("Error getting url in free mode")
-                        error_messages.append(config.get_localized_string(60006) % server_name)
+                        error_messages.append(config.get_localized_string(60014))
                         import traceback
                         logger.error(traceback.format_exc())
 
@@ -370,10 +370,10 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo
                         elif response and response[0][0]:
                             error_messages.append(response[0][0])
                         else:
-                            error_messages.append(config.get_localized_string(60006) % server_name)
+                            error_messages.append(config.get_localized_string(60014))
                     except:
                         logger.error("Server errorr: %s" % opcion)
-                        error_messages.append(config.get_localized_string(60006) % server_name)
+                        error_messages.append(config.get_localized_string(60014))
                         import traceback
                         logger.error(traceback.format_exc())
 
@@ -394,7 +394,7 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo
 
             # If we do not have urls or error messages, we put a generic one
             elif not video_urls and not error_messages:
-                error_messages.append(config.get_localized_string(60006) % get_server_parameters(server)["name"])
+                error_messages.append(config.get_localized_string(60014))
 
     return video_urls, len(video_urls) > 0, "<br/>".join(error_messages)
 

core/support.py

@@ -385,7 +385,10 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
                 it.__setattr__(lg, match[lg])
 
             if 'itemHook' in args:
-                it = args['itemHook'](it)
+                try:
+                    it = args['itemHook'](it)
+                except:
+                    raise logger.ChannelScraperException
             itemlist.append(it)
 
     return itemlist, matches
@@ -407,7 +410,6 @@ def scrape(func):
         args = func(*args)
         function = func.__name__ if not 'actLike' in args else args['actLike']
         # info('STACK= ',inspect.stack()[1][3])
-
         item = args['item']
 
         action = args.get('action', 'findvideos')
@@ -469,23 +471,33 @@ def scrape(func):
                                        typeActionDict, blacklist, search, pag, function, lang, sceneTitle, group)
 
             if 'itemlistHook' in args:
-                itemlist = args['itemlistHook'](itemlist)
+                try:
+                    itemlist = args['itemlistHook'](itemlist)
+                except:
+                    raise logger.ChannelScraperException
 
             # if url may be changed and channel has findhost to update
             if 'findhost' in func.__globals__ and not itemlist:
                 info('running findhost ' + func.__module__)
                 ch = func.__module__.split('.')[-1]
-                host = config.get_channel_url(func.__globals__['findhost'], ch, True)
+                try:
+                    host = config.get_channel_url(func.__globals__['findhost'], ch, True)
 
-                parse = list(urlparse.urlparse(item.url))
-                parse[1] = scrapertools.get_domain_from_url(host)
-                item.url = urlparse.urlunparse(parse)
+                    parse = list(urlparse.urlparse(item.url))
+                    parse[1] = scrapertools.get_domain_from_url(host)
+                    item.url = urlparse.urlunparse(parse)
+                except:
+                    raise logger.ChannelScraperException
                 data = None
                 itemlist = []
                 matches = []
             else:
                 break
 
+        if not data:
+            from platformcode.logger import WebErrorException
+            raise WebErrorException(urlparse.urlparse(item.url)[1], item.channel)
+
         if group and item.grouped or args.get('groupExplode'):
             import copy
             nextArgs = copy.copy(args)
@@ -548,7 +560,10 @@ def scrape(func):
             itemlist = thumb(itemlist, genre=True)
 
         if 'fullItemlistHook' in args:
-            itemlist = args['fullItemlistHook'](itemlist)
+            try:
+                itemlist = args['fullItemlistHook'](itemlist)
+            except:
+                raise logger.ChannelScraperException
 
         # itemlist = filterLang(item, itemlist)   # causa problemi a newest