Merge pull request #597 from lopezvg/master

Canales: cambios de estructura y otros varios

plugin.video.alfa/channels/elitetorrent.py

@@ -84,9 +84,9 @@ def submenu(item):
         itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 01: La Web no responde o ha cambiado de URL. Si la Web está activa, reportar el error con el log'))
         return itemlist                                                         #Algo no funciona, pintamos lo que tenemos
     
-    patron = '<div class="cab_menu">.*?<\/div>'                                 #Menú principal
+    patron = '<div class="cab_menu"\s*>.*?<\/div>'                                 #Menú principal
     data1 = scrapertools.find_single_match(data, patron)
-    patron = '<div id="menu_langen">.*?<\/div>'                                 #Menú de idiomas
+    patron = '<div id="menu_langen"\s*>.*?<\/div>'                                 #Menú de idiomas
     data1 += scrapertools.find_single_match(data, patron)
     
     patron = '<a href="(.*?)".*?title="(.*?)"'                                  #Encontrar todos los apartados
@@ -355,11 +355,11 @@ def findvideos(item):
         return item                                                             #... y nos vamos
     
     #Añadimos el tamaño para todos
-    size = scrapertools.find_single_match(item.quality, '\s\[(\d+,?\d*?\s\w\s?[b|B]s)\]')
+    size = scrapertools.find_single_match(item.quality, '\s\[(\d+,?\d*?\s\w\s*[b|B]s*)\]')
     if size:
-        item.title = re.sub('\s\[\d+,?\d*?\s\w[b|B]s\]', '', item.title)        #Quitamos size de título, si lo traía
+        item.title = re.sub('\s\[\d+,?\d*?\s\w\s*[b|B]s*\]', '', item.title)    #Quitamos size de título, si lo traía
         item.title = '%s [%s]' % (item.title, size)                             #Agregamos size al final del título
-        item.quality = re.sub('\s\[\d+,?\d*?\s\w\s?[b|B]s\]', '', item.quality) #Quitamos size de calidad, si lo traía
+        item.quality = re.sub('\s\[\d+,?\d*?\s\w\s*[b|B]s*\]', '', item.quality)    #Quitamos size de calidad, si lo traía
     
     if not link_torrent and not link_magnet:                                    #error
         item = generictools.web_intervenida(item, data)                         #Verificamos que no haya sido clausurada
@@ -385,8 +385,7 @@ def findvideos(item):
         size = generictools.get_torrent_size(link_torrent)                      #Buscamos el tamaño en el .torrent
     if size:
         item.quality = '%s [%s]' % (item.quality, size)                         #Agregamos size al final de calidad
-        item.quality = item.quality.replace("GB", "G B").replace("MB", "M B")   #Se evita la palabra reservada en Unify
+        item.quality = item.quality.replace("GB", "G B").replace("MB", "M B").replace("Gb", "G B").replace("Mb", "M B")                                                                        #Se evita la palabra reservada en Unify
-
     #Ahora pintamos el link del Torrent, si lo hay
     if link_torrent:		                                                    # Hay Torrent ?
         #Generamos una copia de Item para trabajar sobre ella

plugin.video.alfa/channels/newpct1.json

@@ -93,7 +93,7 @@
       "id": "clonenewpct1_channels_list",
       "type": "text",
       "label": "Lista de clones de NewPct1 y orden de uso",
-      "default": "('1', 'descargas2020', 'https://descargas2020.com/', 'movie, tvshow, season, episode', ''), ('1', 'tumejortorrent', 'https://tumejortorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentrapid', 'https://torrentrapid.com/', 'movie, tvshow, season, episode', 'serie_episodios'), ('1', 'pctnew', 'https://pctnew.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentlocura', 'http://torrentlocura.com/', 'movie, tvshow, season, episode', ''), ('1', 'tvsinpagar', 'http://www.tvsinpagar.com/', 'tvshow, season, episode', ''), ('1', 'planetatorrent', 'http://planetatorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'mispelisyseries', 'http://mispelisyseries.com/', 'movie', 'search, listado_busqueda')",
+      "default": "('1', 'descargas2020', 'https://descargas2020.com/', 'movie, tvshow, season, episode', ''), ('0', 'tumejortorrent', 'https://tumejortorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentrapid', 'https://torrentrapid.com/', 'movie, tvshow, season, episode', 'serie_episodios'), ('1', 'pctnew', 'https://pctnew.com/', 'movie, tvshow, season, episode', ''), ('1', 'torrentlocura', 'http://torrentlocura.com/', 'movie, tvshow, season, episode', ''), ('1', 'tvsinpagar', 'http://www.tvsinpagar.com/', 'tvshow, season, episode', ''), ('1', 'planetatorrent', 'http://planetatorrent.com/', 'movie, tvshow, season, episode', ''), ('1', 'mispelisyseries', 'http://mispelisyseries.com/', 'movie', 'search, listado_busqueda')",
       "enabled": true,
       "visible": false
     },
@@ -101,7 +101,7 @@
       "id": "intervenidos_channels_list",
       "type": "text",
       "label": "Lista de canales y clones de NewPct1 intervenidos y orden de sustitución de URLs",
-      "default": "('0', 'canal_org', 'canal_des', 'url_org', 'url_des', 'patron1', 'patron2', 'patron3', 'patron4', 'patron5', 'content_inc', 'content_exc', 'ow_force'), ('0', 'canal_org', 'canal_des', 'url_org', 'url_des', 'patron1', 'patron2', 'patron3', 'patron4', 'patron5', 'content_inc', 'content_exc', 'ow_force')",
+      "default": "('0', 'canal_org', 'canal_des', 'url_org', 'url_des', 'patron1', 'patron2', 'patron3', 'patron4', 'patron5', 'content_inc', 'content_exc', 'ow_force'), ('0', 'canal_org', 'canal_des', 'url_org', 'url_des', 'patron1', 'patron2', 'patron3', 'patron4', 'patron5', 'content_inc', 'content_exc', 'ow_force'), ('1', 'tumejortorrent', 'descargas2020', '://tumejortorrent.com/', '://descargas2020.com/', '', '', '', '', '', '*', '', 'no')",
       "enabled": true,
       "visible": false
     },

plugin.video.alfa/channels/newpct1.py

@@ -49,8 +49,6 @@ if host_index == 0:
     for active_clone, channel_clone, host_clone, contentType_clone, info_clone in clone_list:
         if i <= j and active_clone == "1":
             clone_list_random += [clone_list[i]]                            #... añadimos el clone activo "bueno" a la lista
-        else:
-            break
         i += 1
     if clone_list_random:                                                           #Si hay clones en la lista aleatoria...
         clone_list = [random.choice(clone_list_random)]                             #Seleccionamos un clone aleatorio

plugin.video.alfa/core/httptools.py

@@ -32,7 +32,6 @@ import urlparse
 from StringIO import StringIO
 from threading import Lock
 
-from core.cloudflare import Cloudflare
 from platformcode import config, logger
 from platformcode.logger import WebErrorException
 
@@ -76,21 +75,21 @@ def get_url_headers(url):
     return url + "|" + "&".join(["%s=%s" % (h, headers[h]) for h in headers])
 
 
-def load_cookies():
+def load_cookies(alfa_s=False):
     cookies_lock.acquire()
     if os.path.isfile(ficherocookies):
-        logger.info("Leyendo fichero cookies")
+        if not alfa_s: logger.info("Leyendo fichero cookies")
         try:
             cj.load(ficherocookies, ignore_discard=True)
         except:
-            logger.info("El fichero de cookies existe pero es ilegible, se borra")
+            if not alfa_s: logger.info("El fichero de cookies existe pero es ilegible, se borra")
             os.remove(ficherocookies)
     cookies_lock.release()
 
 
-def save_cookies():
+def save_cookies(alfa_s=False):
     cookies_lock.acquire()
-    logger.info("Guardando cookies...")
+    if not alfa_s: logger.info("Guardando cookies...")
     cj.save(ficherocookies, ignore_discard=True)
     cookies_lock.release()
 
@@ -99,7 +98,7 @@ load_cookies()
 
 
 def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=True, cookies=True, replace_headers=False,
-                 add_referer=False, only_headers=False, bypass_cloudflare=True, count_retries=0, count_retries_tot=5, random_headers=False, ignore_response_code=False, alfa_s=False, proxy=True, proxy_web=False, forced_proxy=None, proxy_retries=1):
+                 add_referer=False, only_headers=False, bypass_cloudflare=True, count_retries=0, count_retries_tot=5, random_headers=False, ignore_response_code=False, alfa_s=False, proxy=True, proxy_web=False, proxy_addr_forced=None,forced_proxy=None, proxy_retries=1):
     """
     Abre una url y retorna los datos obtenidos
 
@@ -174,19 +173,28 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
         proxy_CF_addr = ''
         proxy_web_name = ''
         proxy_log = ''
-        import proxytools
         
         try:
-            if (proxy or proxy_web) and (forced_proxy or proxytools.channel_proxy_list(url, forced_proxy=forced_proxy)):
+            if (proxy or proxy_web) and (forced_proxy or proxy_addr_forced or channel_proxy_list(url, forced_proxy=forced_proxy)):
+                import proxytools
                 proxy_addr, proxy_CF_addr, proxy_web_name, proxy_log = proxytools.get_proxy_addr(url, post=post, forced_proxy=forced_proxy)
+                if proxy_addr_forced and proxy_log:
+                    import scrapertools
+                    proxy_log = scrapertools.find_single_match(str(proxy_addr_forced), "{'http.*':\s*'(.*?)'}")
             
                 if proxy and proxy_addr:
+                    if proxy_addr_forced: proxy_addr = proxy_addr_forced
                     handlers.append(urllib2.ProxyHandler(proxy_addr))
                     proxy_stat = ', Proxy Direct ' + proxy_log
                 elif proxy and proxy_CF_addr:
+                    if proxy_addr_forced: proxy_CF_addr = proxy_addr_forced
                     handlers.append(urllib2.ProxyHandler(proxy_CF_addr))
                     proxy_stat = ', Proxy CF ' + proxy_log
-                elif proxy and not proxy_addr and not proxy_CF_addr:
+                elif proxy and proxy_addr_forced:
+                    proxy_addr = proxy_addr_forced
+                    handlers.append(urllib2.ProxyHandler(proxy_addr))
+                    proxy_stat = ', Proxy Direct ' + proxy_log
+                elif proxy and not proxy_addr and not proxy_CF_addr and not proxy_addr_forced:
                     proxy = False
                     if not proxy_web_name:
                         proxy_addr, proxy_CF_addr, proxy_web_name, proxy_log = proxytools.get_proxy_addr(url, forced_proxy='Total')
@@ -335,7 +343,7 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
                 raise WebErrorException(urlparse.urlparse(url)[1])
 
         if cookies:
-            save_cookies()
+            save_cookies(alfa_s=alfa_s)
 
         if not alfa_s:
             logger.info("Encoding: %s" % (response["headers"].get('content-encoding')))
@@ -362,6 +370,7 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
 
         # Anti Cloudflare
         if bypass_cloudflare and count_retries < count_retries_tot:
+            from core.cloudflare import Cloudflare
             cf = Cloudflare(response)
             if cf.is_cloudflare:
                 count_retries += 1
@@ -370,15 +379,15 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
                 auth_url = cf.get_url()
                 if not alfa_s:
                     logger.info("Autorizando... intento %d url: %s" % (count_retries, auth_url))
-                tt = downloadpage(auth_url, headers=request_headers, replace_headers=True, count_retries=count_retries, ignore_response_code=True, count_retries_tot=count_retries_tot, proxy=proxy, proxy_web=proxy_web)
+                tt = downloadpage(auth_url, headers=request_headers, replace_headers=True, count_retries=count_retries, ignore_response_code=True, count_retries_tot=count_retries_tot, proxy=proxy, proxy_web=proxy_web, forced_proxy=forced_proxy, proxy_addr_forced=proxy_addr_forced, alfa_s=alfa_s)
                 if tt.code == 403:
-                    tt = downloadpage(url, headers=request_headers, replace_headers=True, count_retries=count_retries, ignore_response_code=True, count_retries_tot=count_retries_tot, proxy=proxy, proxy_web=proxy_web)
+                    tt = downloadpage(url, headers=request_headers, replace_headers=True, count_retries=count_retries, ignore_response_code=True, count_retries_tot=count_retries_tot, proxy=proxy, proxy_web=proxy_web, forced_proxy=forced_proxy, proxy_addr_forced=proxy_addr_forced, alfa_s=alfa_s)
                 if tt.sucess:
                     if not alfa_s:
                         logger.info("Autorización correcta, descargando página")
                     resp = downloadpage(url=response["url"], post=post, headers=headers, timeout=timeout,
                                         follow_redirects=follow_redirects, count_retries=count_retries, 
-                                        cookies=cookies, replace_headers=replace_headers, add_referer=add_referer, proxy=proxy, proxy_web=proxy_web, count_retries_tot=count_retries_tot)
+                                        cookies=cookies, replace_headers=replace_headers, add_referer=add_referer, proxy=proxy, proxy_web=proxy_web, count_retries_tot=count_retries_tot, forced_proxy=forced_proxy, proxy_addr_forced=proxy_addr_forced, alfa_s=alfa_s)
                     response["sucess"] = resp.sucess
                     response["code"] = resp.code
                     response["error"] = resp.error
@@ -437,6 +446,30 @@ def random_useragent():
     return default_headers["User-Agent"]
     
     
+def channel_proxy_list(url, forced_proxy=None):
+    import base64
+    import ast
+    import scrapertools
+    
+    try:
+        proxy_channel_bloqued_str = base64.b64decode(config.get_setting('proxy_channel_bloqued')).decode('utf-8')
+        proxy_channel_bloqued = dict()
+        proxy_channel_bloqued = ast.literal_eval(proxy_channel_bloqued_str)
+    except:
+        logger.debug('Proxytools no inicializado correctamente')
+        return False
+
+    if not url.endswith('/'):
+        url += '/'
+    if scrapertools.find_single_match(url, '(?:http.*:\/\/)?([^\?|\/]+)(?:\?|\/)') in proxy_channel_bloqued:
+        if forced_proxy:
+            return True
+        if 'ON' in proxy_channel_bloqued[scrapertools.find_single_match(url, '(?:http.*:\/\/)?([^\?|\/]+)(?:\?|\/)')]:
+            return True
+    
+    return False
+
+
 class NoRedirectHandler(urllib2.HTTPRedirectHandler):
     def http_error_302(self, req, fp, code, msg, headers):
         infourl = urllib.addinfourl(fp, headers, req.get_full_url())

plugin.video.alfa/lib/generictools.py

@@ -1948,11 +1948,16 @@ def redirect_clone_newpct1(item, head_nfo=None, it=None, path=False, overwrite=F
 
     if lookup == True:
         overwrite = False                                                   #Solo avisamos si hay cambios
+    i = 0
     for activo, canal_org, canal_des, url_org, url_des, patron1, patron2, patron3, patron4, patron5, content_inc, content_exc, ow_force in intervencion_list:
+        i += 1
         opt = ''
         #Es esta nuestra entrada?
         if activo == '1' and (canal_org == channel_alt or canal_org == item.category.lower() or channel_alt == 'videolibrary' or ow_force == 'del' or ow_force == 'emerg'):     
             
+            if item.url:
+                logger.debug('INTERV. LIST: ' + str(intervencion_list[i-1]) + ' / CHANNEL: ' + str(channel_alt) + ' / URL: ' + str(item.url))
+            
             if ow_force == 'del' or ow_force == 'emerg':    #Si es un borrado de estructuras erroneas, hacemos un proceso aparte
                 canal_des_def = canal_des                   #Si hay canal de sustitución para item.library_urls, lo usamos
                 if not canal_des_def and canal_org in item.library_urls and len(item.library_urls) == 1:    #Si no, lo extraemos de la url

plugin.video.alfa/lib/quasar/daemon.py

@@ -275,6 +275,7 @@ def quasard_thread(monitor):
                     except IOError:
                         time.sleep(1)  # nothing to read, sleep
 
+            log.info("quasard: proc.return code: %s" % str(proc.returncode))
             if proc.returncode == 0 or xbmc.abortRequested:
                 break
 

plugin.video.alfa/platformcode/custom_code.py

@@ -57,6 +57,9 @@ def init():
     """
     
     try:
+        #Verifica si Kodi tiene algún achivo de Base de Datos de Vídeo de versiones anteriores, entonces los borra
+        verify_Kodi_video_DB()
+        
         #QUASAR: Preguntamos si se hacen modificaciones a Quasar
         if not filetools.exists(os.path.join(config.get_data_path(), "quasar.json")) and not config.get_setting('addon_quasar_update', default=False):
             question_update_external_addon("quasar")
@@ -187,3 +190,40 @@ def update_external_addon(addon_name):
             logger.error('Alguna carpeta no existe: Alfa: %s o %s: %s' % (alfa_addon_updates, addon_name, addon_path))
     
     return False
+    
+    
+def verify_Kodi_video_DB():
+    logger.info()
+    import random
+    
+    platform = {}
+    path = ''
+    db_files = []
+    
+    try:
+        path = filetools.join(xbmc.translatePath("special://masterprofile/"), "Database")
+        if filetools.exists(path):
+            platform = config.get_platform(full_version=True)
+            if platform:
+                db_files = filetools.walk(path)
+                if filetools.exists(filetools.join(path, platform['video_db'])):
+                    for root, folders, files in db_files:
+                        for file in files:
+                            if file != platform['video_db']:
+                                if file.startswith('MyVideos'):
+                                    randnum = str(random.randrange(1, 999999))
+                                    filetools.rename(filetools.join(path, file), 'OLD_' + randnum +'_' + file)
+                                    logger.error('BD obsoleta: ' + file)
+                    
+                else:
+                    logger.error('Video_DB: ' + str(platform['video_db']) + ' para versión Kodi ' + str(platform['num_version']) + ' NO EXISTE. Analizar carpeta: ' + str(db_files))
+            else:
+                logger.error('Estructura de get_platform(full_version=True) incorrecta')
+        else:
+            logger.error('Path a Userdata/Database (' + path + ') no encontrado')
+        
+    except:
+        logger.error('Platform: ' + str(platform) + ' / Path: ' + str(path) + ' / Files: ' + str(db_files))
+        logger.error(traceback.format_exc())
+        
+    return

plugin.video.alfa/platformcode/updater.py

@@ -106,12 +106,20 @@ def check_addon_updates(verbose=False):
             return False
 
         if os.path.exists(last_fix_json):
+            try:
+                lastfix =  {} 
                 lastfix = jsontools.load(filetools.read(last_fix_json))
                 if lastfix['addon_version'] == data['addon_version'] and lastfix['fix_version'] == data['fix_version']:
                     logger.info('Ya está actualizado con los últimos cambios. Versión %s.fix%d' % (data['addon_version'], data['fix_version']))
                     if verbose:
                         platformtools.dialog_notification('Alfa ya está actualizado', 'Versión %s.fix%d' % (data['addon_version'], data['fix_version']))
                     return False
+            except:
+                if lastfix:
+                    logger.error('last_fix.json: ERROR en: ' + str(lastfix))
+                else:
+                    logger.error('last_fix.json: ERROR desconocido')
+                lastfix =  {}
 
         # Descargar zip con las actualizaciones
         # -------------------------------------

plugin.video.alfa/platformcode/xbmc_videolibrary.py

@@ -342,6 +342,8 @@ def mark_content_as_watched_on_alfa(path):
     FOLDER_MOVIES = config.get_setting("folder_movies")
     FOLDER_TVSHOWS = config.get_setting("folder_tvshows")
     VIDEOLIBRARY_PATH = config.get_videolibrary_config_path()
+    if not VIDEOLIBRARY_PATH:
+        return
 
     # Solo podemos marcar el contenido como vista en la BBDD de Kodi si la BBDD es local,
     # en caso de compartir BBDD esta funcionalidad no funcionara

plugin.video.alfa/resources/settings.xml

@@ -132,6 +132,10 @@
         <setting type="sep"/>
         <setting label="Gestión de actualizaciones de otros addon relacionados con Alfa:" type="lsep"/>
         <setting id="addon_quasar_update" type="bool" label="¿Quiere actualizar Quasar para evitar errores?" default="false"/>
+        
+        <setting type="sep"/>
+        <setting label="Método alternativo de acceso a webs:" type="lsep"/>
+        <setting id="alternative_web_access" type="bool" label="¿Modo -en Demanda-: NO? ¿Modo -Forzado-: SÍ?" default="false"/>
     </category>
 
 </settings>

plugin.video.alfa/videolibrary_service.py

@@ -3,7 +3,7 @@
 # Service for updating new episodes on library series
 # ------------------------------------------------------------
 
-import datetime, imp, math, threading, traceback
+import datetime, imp, math, threading, traceback, sys