From bfd30bb6b16f5fcbfff6572b5ee37d2532ccdc54 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 11:23:05 +0200
Subject: [PATCH 01/27] =?UTF-8?q?A=C3=B1adidas=20funciones=20para=20compro?=
 =?UTF-8?q?bar=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Una función principal: check_list_links y un par de funciones auxiliares: check_video_link, get_url_play.
Para los canales dónde se quiera implementar la verificación de enlaces, llamar a check_list_links después de obtener la lista de enlaces itemlist, en la función findvideos del canal.
---
 plugin.video.alfa/core/servertools.py | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/plugin.video.alfa/core/servertools.py b/plugin.video.alfa/core/servertools.py
index da799696..c59ad44a 100644
--- a/plugin.video.alfa/core/servertools.py
+++ b/plugin.video.alfa/core/servertools.py
@@ -705,3 +705,54 @@ def filter_servers(servers_list):
             servers_list = servers_list_filter
 
     return servers_list
+
+def check_list_links(itemlist):
+    """
+    Comprueba una lista de enlaces a videos y la devuelve modificando el titulo con la verificacion.
+    """
+    for it in itemlist:
+        if it.server != '' and it.url != '':
+            verificacion = check_video_link(it.url, it.server)
+            it.title = verificacion + ', ' + it.title.strip()
+    return itemlist
+
+def check_video_link(url, server):
+    """
+    Comprueba si el enlace a un video es valido y devuelve un string de 2 posiciones con la verificacion.
+    :param url, server: Link y servidor
+    :return: str(2) '??':No se ha podido comprobar. 'Ok':Parece que el link funciona. 'NO':Parece que no funciona.
+    """
+    try:
+        server = server.lower()
+        server_module = __import__('servers.%s' % server, None, None, ["servers.%s" % server])
+    except:
+        server_module = None
+        logger.info("[check_video_link] No se puede importar el servidor! %s" % server)
+        return "??"
+        
+    if hasattr(server_module, 'test_video_exists'):
+        try:
+            urlcheck = url if server == 'netutv' else get_url_play(url, server)
+            video_exists, message = server_module.test_video_exists(page_url=urlcheck)
+            if not video_exists:
+                logger.info("[check_video_link] No existe! %s %s %s" % (message, server, url))
+                return "NO"
+            else:
+                logger.info("[check_video_link] comprovacion OK %s %s" % (server, url))
+                return "Ok"
+        except:
+            logger.info("[check_video_link] No se puede comprobar ahora! %s %s" % (server, url))
+            return "??"
+
+    logger.info("[check_video_link] No hay test_video_exists para servidor: %s" % server)
+    return "??"
+
+def get_url_play(url, server):
+    """
+    Obtener url que sirva para comprobar si el video existe
+    """
+    url = url.replace("http://miracine.tv/n/?etu=", "http://hqq.tv/player/embed_player.php?vid=")
+    url = url.replace("streamcloud.eu/embed-", "streamcloud.eu/")
+    enlaces = findvideosbyserver(url, server)[0]
+    
+    return enlaces[1]

From 98756c7650e47a4cb50ebbcfaf20fdc2a135f733 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 11:25:27 +0200
Subject: [PATCH 02/27] =?UTF-8?q?A=C3=B1adido=20par=C3=A1metro=20comprueba?=
 =?UTF-8?q?=5Fenlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Para poder activar/desactivar la comprobación de enlaces
---
 plugin.video.alfa/channels/cinefox.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugin.video.alfa/channels/cinefox.json b/plugin.video.alfa/channels/cinefox.json
index 17b3228f..19c3898e 100755
--- a/plugin.video.alfa/channels/cinefox.json
+++ b/plugin.video.alfa/channels/cinefox.json
@@ -67,6 +67,14 @@
       "enabled": true,
       "visible": true
     },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": true,
+      "enabled": true,
+      "visible": true
+    },
     {
       "id": "perfil",
       "type": "list",

From ee513872b2cddf73aa244bbc9fc72c67f3312092 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 11:29:39 +0200
Subject: [PATCH 03/27] =?UTF-8?q?A=C3=B1adir=20verificaci=C3=B3n=20de=20en?=
 =?UTF-8?q?laces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Llamada a servertools.check_list_links(itemlist) si el parámetro comprueba_enlaces lo requiere
---
 plugin.video.alfa/channels/cinefox.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin.video.alfa/channels/cinefox.py b/plugin.video.alfa/channels/cinefox.py
index 115e5d89..4eea0b7a 100644
--- a/plugin.video.alfa/channels/cinefox.py
+++ b/plugin.video.alfa/channels/cinefox.py
@@ -25,6 +25,7 @@ list_servers = ['openload', 'powvideo', 'rapidvideo', 'streamango', 'streamcloud
 __modo_grafico__ = config.get_setting('modo_grafico', 'cinefox')
 __perfil__ = int(config.get_setting('perfil', "cinefox"))
 __menu_info__ = config.get_setting('menu_info', 'cinefox')
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cinefox')
 
 # Fijar perfil de color            
 perfil = [['0xFFFFE6CC', '0xFFFFCE9C', '0xFF994D00', '0xFFFE2E2E', '0xFF088A08'],
@@ -685,6 +686,9 @@ def findvideos(item):
 
         autoplay.start(itemlist, item)
 
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist)
+
     return itemlist
 
 

From 6aa7b5da2a2b110510c3147072b1bce1ca6d3805 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 11:33:13 +0200
Subject: [PATCH 04/27] =?UTF-8?q?A=C3=B1adido=20comprueba=5Fenlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/peliculasdk.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/peliculasdk.json
index 2fed6d4d..60510ed3 100755
--- a/plugin.video.alfa/channels/peliculasdk.json
+++ b/plugin.video.alfa/channels/peliculasdk.json
@@ -26,6 +26,14 @@
       "default": true,
       "enabled": true,
       "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": true,
+      "enabled": true,
+      "visible": true
     }
   ]
-}
\ No newline at end of file
+}

From b3f77519d263a0ff17f87be0b676f9cf6028afcf Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 11:34:56 +0200
Subject: [PATCH 05/27] =?UTF-8?q?A=C3=B1adido=20verificaci=C3=B3n=20de=20e?=
 =?UTF-8?q?nlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/peliculasdk.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin.video.alfa/channels/peliculasdk.py b/plugin.video.alfa/channels/peliculasdk.py
index 24b596da..a194b54f 100644
--- a/plugin.video.alfa/channels/peliculasdk.py
+++ b/plugin.video.alfa/channels/peliculasdk.py
@@ -11,6 +11,8 @@ from platformcode import logger
 from platformcode import config
 from core import tmdb
 
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'peliculasdk')
+
 host = "http://www.peliculasdk.com"
 
 def mainlist(item):
@@ -183,6 +185,8 @@ def findvideos(item):
                          language=idioma, quality=calidad))
     tmdb.set_infoLabels(itemlist)
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist)
     if item.library and config.get_videolibrary_support() and len(itemlist) > 0:
         infoLabels = {'tmdb_id': item.infoLabels['tmdb_id'],
                       'title': item.fulltitle}

From 22783c6c61a713dd7979112536ecd88a87a1ee86 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 12:16:52 +0200
Subject: [PATCH 06/27] =?UTF-8?q?A=C3=B1adido=20comprueba=5Fenlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/newpct.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/newpct.json b/plugin.video.alfa/channels/newpct.json
index 9a3b8e8d..8b3fe8d9 100755
--- a/plugin.video.alfa/channels/newpct.json
+++ b/plugin.video.alfa/channels/newpct.json
@@ -20,6 +20,14 @@
       "default": false,
       "enabled": true,
       "visible": true
+    },
+    {
+      "id": "comprueba_enlaces",
+      "type": "bool",
+      "label": "Verificar si los enlaces existen",
+      "default": true,
+      "enabled": true,
+      "visible": true
     }
   ]
-}
\ No newline at end of file
+}

From 8034c67651e81f45f9fc29b59b0ec62b15add910 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Tue, 3 Apr 2018 12:18:12 +0200
Subject: [PATCH 07/27] =?UTF-8?q?A=C3=B1adido=20verificaci=C3=B3n=20de=20e?=
 =?UTF-8?q?nlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/newpct.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugin.video.alfa/channels/newpct.py b/plugin.video.alfa/channels/newpct.py
index 22bf446e..25abeb2d 100755
--- a/plugin.video.alfa/channels/newpct.py
+++ b/plugin.video.alfa/channels/newpct.py
@@ -10,6 +10,9 @@ from core.item import Item
 from platformcode import logger
 from core import httptools
 
+from platformcode import config
+__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'newpct')
+
 Host='http://www.tvsinpagar.com'
 
 
@@ -97,4 +100,6 @@ def findvideos(item):
     itemlist.extend(new_item)
     for it in itemlist:
         it.channel = item.channel
+    if __comprueba_enlaces__:
+        itemlist = servertools.check_list_links(itemlist)
     return itemlist

From 21ee98ceb077b978ab85f397ea115c93f15e18e0 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Wed, 4 Apr 2018 08:41:54 +0200
Subject: [PATCH 08/27] =?UTF-8?q?A=C3=B1adir=20funci=C3=B3n=20test=5Fvideo?=
 =?UTF-8?q?=5Fexists?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/servers/netutv.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin.video.alfa/servers/netutv.py b/plugin.video.alfa/servers/netutv.py
index e17c0fec..6e401fad 100755
--- a/plugin.video.alfa/servers/netutv.py
+++ b/plugin.video.alfa/servers/netutv.py
@@ -8,6 +8,15 @@ from core import jsontools
 from core import scrapertools
 from platformcode import logger
 
+def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
+
+    data = httptools.downloadpage(page_url).data
+
+    if "var userid = '';" in data.lower():
+        return False, "[netutv] El archivo no existe o  ha sido borrado"
+
+    return True, ""
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url=" + page_url)

From 701fd163286e106a28ad4beb9559ce8015d779c5 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 18:56:54 +0200
Subject: [PATCH 09/27] =?UTF-8?q?Cambio=20en=20la=20verificaci=C3=B3n=20de?=
 =?UTF-8?q?=20enlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

La función check_list_links recibe tb un parámetro con el número de enlaces a comprobar, y se eliminan las excepciones de servidores que había en check_video_link.
---
 plugin.video.alfa/core/servertools.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/plugin.video.alfa/core/servertools.py b/plugin.video.alfa/core/servertools.py
index c59ad44a..f280145c 100644
--- a/plugin.video.alfa/core/servertools.py
+++ b/plugin.video.alfa/core/servertools.py
@@ -706,14 +706,17 @@ def filter_servers(servers_list):
 
     return servers_list
 
-def check_list_links(itemlist):
+def check_list_links(itemlist, numero):
     """
     Comprueba una lista de enlaces a videos y la devuelve modificando el titulo con la verificacion.
+    El segundo parametro (numero) indica cuantos enlaces hay que verificar (0:5, 1:10, 2:15, 3:20)
     """
+    numero = ((int(numero) + 1) * 5) if numero != '' else 10
     for it in itemlist:
-        if it.server != '' and it.url != '':
+        if numero > 0 and it.server != '' and it.url != '':
             verificacion = check_video_link(it.url, it.server)
             it.title = verificacion + ', ' + it.title.strip()
+            numero -= 1
     return itemlist
 
 def check_video_link(url, server):
@@ -723,7 +726,6 @@ def check_video_link(url, server):
     :return: str(2) '??':No se ha podido comprobar. 'Ok':Parece que el link funciona. 'NO':Parece que no funciona.
     """
     try:
-        server = server.lower()
         server_module = __import__('servers.%s' % server, None, None, ["servers.%s" % server])
     except:
         server_module = None
@@ -732,8 +734,7 @@ def check_video_link(url, server):
         
     if hasattr(server_module, 'test_video_exists'):
         try:
-            urlcheck = url if server == 'netutv' else get_url_play(url, server)
-            video_exists, message = server_module.test_video_exists(page_url=urlcheck)
+            video_exists, message = server_module.test_video_exists(page_url=url)
             if not video_exists:
                 logger.info("[check_video_link] No existe! %s %s %s" % (message, server, url))
                 return "NO"
@@ -746,13 +747,3 @@ def check_video_link(url, server):
 
     logger.info("[check_video_link] No hay test_video_exists para servidor: %s" % server)
     return "??"
-
-def get_url_play(url, server):
-    """
-    Obtener url que sirva para comprobar si el video existe
-    """
-    url = url.replace("http://miracine.tv/n/?etu=", "http://hqq.tv/player/embed_player.php?vid=")
-    url = url.replace("streamcloud.eu/embed-", "streamcloud.eu/")
-    enlaces = findvideosbyserver(url, server)[0]
-    
-    return enlaces[1]

From f730a16ffa47c9f2cdb38711589291d6c14a2f95 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:00:23 +0200
Subject: [PATCH 10/27] Cambio en test_video_exists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ir directamente a la página donde se redirige
---
 plugin.video.alfa/servers/netutv.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin.video.alfa/servers/netutv.py b/plugin.video.alfa/servers/netutv.py
index 6e401fad..df396157 100755
--- a/plugin.video.alfa/servers/netutv.py
+++ b/plugin.video.alfa/servers/netutv.py
@@ -11,6 +11,9 @@ from platformcode import logger
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
 
+    # http://netu.tv/watch_video.php=XX solo contiene una redireccion, ir directamente a http://hqq.tv/player/embed_player.php?vid=XX
+    page_url = page_url.replace("http://netu.tv/watch_video.php?v=", "http://hqq.tv/player/embed_player.php?vid=")
+
     data = httptools.downloadpage(page_url).data
 
     if "var userid = '';" in data.lower():

From add730aa6070488f2bb46cfdc72f70b0e0562285 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:03:03 +0200
Subject: [PATCH 11/27] =?UTF-8?q?A=C3=B1adir=20comprueba=5Fenlaces=5Fnum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Añadido parámetro para limitar los enlaces a verificar. Comprobación de enlaces por defecto desactivada.
---
 plugin.video.alfa/channels/cinefox.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/cinefox.json b/plugin.video.alfa/channels/cinefox.json
index 19c3898e..2edcc04a 100755
--- a/plugin.video.alfa/channels/cinefox.json
+++ b/plugin.video.alfa/channels/cinefox.json
@@ -71,10 +71,19 @@
       "id": "comprueba_enlaces",
       "type": "bool",
       "label": "Verificar si los enlaces existen",
-      "default": true,
+      "default": false,
       "enabled": true,
       "visible": true
     },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
+    },
     {
       "id": "perfil",
       "type": "list",

From e649fa9b9cf50fad8d0f6fbf966cfd59f4ec6426 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:09:04 +0200
Subject: [PATCH 12/27] =?UTF-8?q?Cambios=20en=20la=20verificaci=C3=B3n=20d?=
 =?UTF-8?q?e=20enlaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Añadido parámetro con el número de enlaces a verificar. Llamada a normalizar_url para comprobar enlaces, para forzar la llamada a findvideosbyserver y tener la url standard que permite ser comprobada.
---
 plugin.video.alfa/channels/cinefox.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/cinefox.py b/plugin.video.alfa/channels/cinefox.py
index 4eea0b7a..b6a67f85 100644
--- a/plugin.video.alfa/channels/cinefox.py
+++ b/plugin.video.alfa/channels/cinefox.py
@@ -26,6 +26,7 @@ __modo_grafico__ = config.get_setting('modo_grafico', 'cinefox')
 __perfil__ = int(config.get_setting('perfil', "cinefox"))
 __menu_info__ = config.get_setting('menu_info', 'cinefox')
 __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cinefox')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'cinefox')
 
 # Fijar perfil de color            
 perfil = [['0xFFFFE6CC', '0xFFFFCE9C', '0xFF994D00', '0xFFFE2E2E', '0xFF088A08'],
@@ -687,10 +688,22 @@ def findvideos(item):
         autoplay.start(itemlist, item)
 
     if __comprueba_enlaces__:
-        itemlist = servertools.check_list_links(itemlist)
+        for it in itemlist:
+            if it.server != '' and it.url != '':
+                it.url = normalizar_url(it.url, it.server)
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
 
     return itemlist
 
+def normalizar_url(url, server):
+    # Pasar por findvideosbyserver para para obtener url a partir de los pattern/url de los json de servidores
+    # Excepciones copiadas de la funcion play
+    url = url.replace("http://miracine.tv/n/?etu=", "http://hqq.tv/player/embed_player.php?vid=")
+    url = url.replace("streamcloud.eu/embed-", "streamcloud.eu/")
+    enlaces = findvideosbyserver(url, server)[0]
+    if enlaces[1] != '':
+        return enlaces[1]
+    return url
 
 def get_enlaces(item, url, type):
     itemlist = []

From a944cadfe6b2823ab0ceea008f360cf19aa2ebb5 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:10:04 +0200
Subject: [PATCH 13/27] =?UTF-8?q?A=C3=B1adir=20comprueba=5Fenlaces=5Fnum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/newpct.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/newpct.json b/plugin.video.alfa/channels/newpct.json
index 8b3fe8d9..d9d4943f 100755
--- a/plugin.video.alfa/channels/newpct.json
+++ b/plugin.video.alfa/channels/newpct.json
@@ -25,9 +25,18 @@
       "id": "comprueba_enlaces",
       "type": "bool",
       "label": "Verificar si los enlaces existen",
-      "default": true,
+      "default": false,
       "enabled": true,
       "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
     }
   ]
 }

From 1f61946f9725b1e2217d3aec8c4ff2db6afc9dbc Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:11:11 +0200
Subject: [PATCH 14/27] =?UTF-8?q?A=C3=B1adir=20comprueba=5Fenlaces=5Fnum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/peliculasdk.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/peliculasdk.json
index 60510ed3..8f52c17e 100755
--- a/plugin.video.alfa/channels/peliculasdk.json
+++ b/plugin.video.alfa/channels/peliculasdk.json
@@ -31,9 +31,18 @@
       "id": "comprueba_enlaces",
       "type": "bool",
       "label": "Verificar si los enlaces existen",
-      "default": true,
+      "default": false,
       "enabled": true,
       "visible": true
+    },
+    {
+      "id": "comprueba_enlaces_num",
+      "type": "list",
+      "label": "Número de enlaces a verificar",
+      "default": 1,
+      "enabled": true,
+      "visible": "eq(-1,true)",
+      "lvalues": [ "5", "10", "15", "20" ]
     }
   ]
 }

From a12e9edb765f2eb3be19770f2d3f0f70254f19c2 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:12:51 +0200
Subject: [PATCH 15/27] =?UTF-8?q?Tener=20en=20cuenta=20el=20n=C3=BAmero=20?=
 =?UTF-8?q?de=20enlaces=20a=20verificar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/newpct.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/newpct.py b/plugin.video.alfa/channels/newpct.py
index 25abeb2d..b6833ac6 100755
--- a/plugin.video.alfa/channels/newpct.py
+++ b/plugin.video.alfa/channels/newpct.py
@@ -12,6 +12,7 @@ from core import httptools
 
 from platformcode import config
 __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'newpct')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'newpct')
 
 Host='http://www.tvsinpagar.com'
 
@@ -101,5 +102,5 @@ def findvideos(item):
     for it in itemlist:
         it.channel = item.channel
     if __comprueba_enlaces__:
-        itemlist = servertools.check_list_links(itemlist)
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
     return itemlist

From f0fe6723d859ae04cd36992358598a366710f0ee Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Thu, 5 Apr 2018 19:14:12 +0200
Subject: [PATCH 16/27] =?UTF-8?q?Tratar=20n=C3=BAmero=20de=20enlaces=20a?=
 =?UTF-8?q?=20verificar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/channels/peliculasdk.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/peliculasdk.py b/plugin.video.alfa/channels/peliculasdk.py
index a194b54f..546cdf52 100644
--- a/plugin.video.alfa/channels/peliculasdk.py
+++ b/plugin.video.alfa/channels/peliculasdk.py
@@ -12,6 +12,7 @@ from platformcode import config
 from core import tmdb
 
 __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'peliculasdk')
+__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'peliculasdk')
 
 host = "http://www.peliculasdk.com"
 
@@ -186,7 +187,7 @@ def findvideos(item):
     tmdb.set_infoLabels(itemlist)
     itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     if __comprueba_enlaces__:
-        itemlist = servertools.check_list_links(itemlist)
+        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
     if item.library and config.get_videolibrary_support() and len(itemlist) > 0:
         infoLabels = {'tmdb_id': item.infoLabels['tmdb_id'],
                       'title': item.fulltitle}

From d1443913936719685582839035a28ccdb8116cc2 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Sat, 7 Apr 2018 18:47:52 +0200
Subject: [PATCH 17/27] =?UTF-8?q?Evitar=20recursi=C3=B3n=20infinita=20si?=
 =?UTF-8?q?=20falla=20Cloudflare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Añadido parámetro bypass_cloudflare=False en el downloadpage interior cuando hay bypass_cloudflare, para evitar bucle infinito si falla el acceso a Cloudflare.
---
 plugin.video.alfa/core/httptools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.video.alfa/core/httptools.py b/plugin.video.alfa/core/httptools.py
index d1a553e2..e7f9683c 100755
--- a/plugin.video.alfa/core/httptools.py
+++ b/plugin.video.alfa/core/httptools.py
@@ -240,7 +240,7 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
             logger.info("cloudflare detectado, esperando %s segundos..." % cf.wait_time)
             auth_url = cf.get_url()
             logger.info("Autorizando... url: %s" % auth_url)
-            if downloadpage(auth_url, headers=request_headers, replace_headers=True).sucess:
+            if downloadpage(auth_url, headers=request_headers, replace_headers=True, bypass_cloudflare=False).sucess:
                 logger.info("Autorización correcta, descargando página")
                 resp = downloadpage(url=response["url"], post=post, headers=headers, timeout=timeout,
                                     follow_redirects=follow_redirects,

From 504d9a151b4680997f2e46375a4710a87f57ab46 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Sat, 7 Apr 2018 18:56:05 +0200
Subject: [PATCH 18/27] Cambio en el decode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Añadir una rutina diferente para hacer el decode y redondear jschl_answer, simulando lo que hace la rutina javascript de la protección cloudflare.
---
 plugin.video.alfa/core/cloudflare.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/plugin.video.alfa/core/cloudflare.py b/plugin.video.alfa/core/cloudflare.py
index 356eb310..2c1605d2 100755
--- a/plugin.video.alfa/core/cloudflare.py
+++ b/plugin.video.alfa/core/cloudflare.py
@@ -62,12 +62,13 @@ class Cloudflare:
     def get_url(self):
         # Metodo #1 (javascript)
         if self.js_data.get("wait", 0):
-            jschl_answer = self.decode(self.js_data["value"])
+            jschl_answer = self.decode2(self.js_data["value"])
 
             for op, v in self.js_data["op"]:
-                jschl_answer = eval(str(jschl_answer) + op + str(self.decode(v)))
+                jschl_answer = eval(str(jschl_answer) + op + str(self.decode2(v)))
 
-            self.js_data["params"]["jschl_answer"] = jschl_answer + len(self.domain)
+            jschl_answer += 0.00000000005 if jschl_answer >= 0 else -0.00000000005
+            self.js_data["params"]["jschl_answer"] = round(jschl_answer, 10) + len(self.domain)
 
             response = "%s://%s%s?%s" % (
             self.protocol, self.domain, self.js_data["auth_url"], urllib.urlencode(self.js_data["params"]))
@@ -85,6 +86,27 @@ class Cloudflare:
 
             return response
 
+    def decode2(self, data):
+        data = re.sub("\!\+\[\]", "1", data)
+        data = re.sub("\!\!\[\]", "1", data)
+        data = re.sub("\[\]", "0", data)
+        
+        pos = data.find("/")
+        numerador = data[:pos]
+        denominador = data[pos+1:]
+        
+        aux = re.compile('\(([0-9\+]+)\)').findall(numerador)
+        num1 = ""
+        for n in aux:
+            num1 += str(eval(n))
+
+        aux = re.compile('\(([0-9\+]+)\)').findall(denominador)
+        num2 = ""
+        for n in aux:
+            num2 += str(eval(n))
+
+        return float(num1) / float(num2)
+
     def decode(self, data):
         t = time.time()
         timeout = False

From cf59ba461d1c592543ce0915a3017802a95c38c7 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Sun, 8 Apr 2018 11:03:16 +0200
Subject: [PATCH 19/27] Correcciones decimales
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Todavía no es 100% fiable pq hay cálculos en coma flotante de javascript que no dan igual que en python, pero con esta modifiación se acerca un poco más a lo que debería dar.
---
 plugin.video.alfa/core/cloudflare.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugin.video.alfa/core/cloudflare.py b/plugin.video.alfa/core/cloudflare.py
index 2c1605d2..0398ec94 100755
--- a/plugin.video.alfa/core/cloudflare.py
+++ b/plugin.video.alfa/core/cloudflare.py
@@ -9,7 +9,7 @@ import urllib
 import urlparse
 
 from platformcode import logger
-
+from decimal import Decimal, ROUND_UP
 
 class Cloudflare:
     def __init__(self, response):
@@ -65,9 +65,16 @@ class Cloudflare:
             jschl_answer = self.decode2(self.js_data["value"])
 
             for op, v in self.js_data["op"]:
-                jschl_answer = eval(str(jschl_answer) + op + str(self.decode2(v)))
+                #jschl_answer = eval(str(jschl_answer) + op + str(self.decode2(v)))
+                if op == '+':
+                    jschl_answer = jschl_answer + self.decode2(v)
+                elif op == '-':
+                    jschl_answer = jschl_answer - self.decode2(v)
+                elif op == '*':
+                    jschl_answer = jschl_answer * self.decode2(v)
+                elif op == '/':
+                    jschl_answer = jschl_answer / self.decode2(v)
 
-            jschl_answer += 0.00000000005 if jschl_answer >= 0 else -0.00000000005
             self.js_data["params"]["jschl_answer"] = round(jschl_answer, 10) + len(self.domain)
 
             response = "%s://%s%s?%s" % (
@@ -105,7 +112,8 @@ class Cloudflare:
         for n in aux:
             num2 += str(eval(n))
 
-        return float(num1) / float(num2)
+        #return float(num1) / float(num2)
+        return Decimal(Decimal(num1) / Decimal(num2)).quantize(Decimal('.0000000000000001'), rounding=ROUND_UP)
 
     def decode(self, data):
         t = time.time()

From 52fed32251f16dc115adcd02c45fdb455a86f8a3 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Sun, 8 Apr 2018 13:14:40 +0200
Subject: [PATCH 20/27] Quitado ROUND_UP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No cambia mucho, es casi igual, pero parece un poquito más aproximado
---
 plugin.video.alfa/core/cloudflare.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/core/cloudflare.py b/plugin.video.alfa/core/cloudflare.py
index 0398ec94..b4948b71 100755
--- a/plugin.video.alfa/core/cloudflare.py
+++ b/plugin.video.alfa/core/cloudflare.py
@@ -113,7 +113,8 @@ class Cloudflare:
             num2 += str(eval(n))
 
         #return float(num1) / float(num2)
-        return Decimal(Decimal(num1) / Decimal(num2)).quantize(Decimal('.0000000000000001'), rounding=ROUND_UP)
+        #return Decimal(Decimal(num1) / Decimal(num2)).quantize(Decimal('.0000000000000001'), rounding=ROUND_UP)
+        return Decimal(Decimal(num1) / Decimal(num2)).quantize(Decimal('.0000000000000001'))
 
     def decode(self, data):
         t = time.time()

From b746cf65db16d8d7ac253481be90b644674c34f2 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Sun, 8 Apr 2018 13:40:21 +0200
Subject: [PATCH 21/27] Bug en normalizar_url
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Añadido prefijo servertools.
---
 plugin.video.alfa/channels/cinefox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/cinefox.py b/plugin.video.alfa/channels/cinefox.py
index b6a67f85..264afbd2 100644
--- a/plugin.video.alfa/channels/cinefox.py
+++ b/plugin.video.alfa/channels/cinefox.py
@@ -700,7 +700,7 @@ def normalizar_url(url, server):
     # Excepciones copiadas de la funcion play
     url = url.replace("http://miracine.tv/n/?etu=", "http://hqq.tv/player/embed_player.php?vid=")
     url = url.replace("streamcloud.eu/embed-", "streamcloud.eu/")
-    enlaces = findvideosbyserver(url, server)[0]
+    enlaces = servertools.findvideosbyserver(url, server)[0]
     if enlaces[1] != '':
         return enlaces[1]
     return url

From 320171eea5dc5cd9b06a22879312a2bb00350f7a Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Sun, 8 Apr 2018 18:14:01 +0200
Subject: [PATCH 22/27] Limitar recursiones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cuando falla la autorización cloudflare, limitar el número de reintentos para evitar un posible bucle infinito de peticiones.
---
 plugin.video.alfa/core/httptools.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugin.video.alfa/core/httptools.py b/plugin.video.alfa/core/httptools.py
index e7f9683c..8e1217c9 100755
--- a/plugin.video.alfa/core/httptools.py
+++ b/plugin.video.alfa/core/httptools.py
@@ -68,7 +68,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):
+                 add_referer=False, only_headers=False, bypass_cloudflare=True, count_retries=0):
     """
     Abre una url y retorna los datos obtenidos
 
@@ -234,13 +234,14 @@ def downloadpage(url, post=None, headers=None, timeout=None, follow_redirects=Tr
             logger.info("No se ha podido descomprimir")
 
     # Anti Cloudflare
-    if bypass_cloudflare:
+    if bypass_cloudflare and count_retries < 5:
         cf = Cloudflare(response)
         if cf.is_cloudflare:
+            count_retries += 1
             logger.info("cloudflare detectado, esperando %s segundos..." % cf.wait_time)
             auth_url = cf.get_url()
-            logger.info("Autorizando... url: %s" % auth_url)
-            if downloadpage(auth_url, headers=request_headers, replace_headers=True, bypass_cloudflare=False).sucess:
+            logger.info("Autorizando... intento %d url: %s" % (count_retries, auth_url))
+            if downloadpage(auth_url, headers=request_headers, replace_headers=True, count_retries=count_retries).sucess:
                 logger.info("Autorización correcta, descargando página")
                 resp = downloadpage(url=response["url"], post=post, headers=headers, timeout=timeout,
                                     follow_redirects=follow_redirects,

From 2576ebcac1d4e4f87e7db846fa75c538f35e2cc6 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Mon, 9 Apr 2018 16:24:16 +0200
Subject: [PATCH 23/27] =?UTF-8?q?Eliminado=20c=C3=B3digo=20obsoleto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/core/cloudflare.py | 70 +++-------------------------
 1 file changed, 7 insertions(+), 63 deletions(-)

diff --git a/plugin.video.alfa/core/cloudflare.py b/plugin.video.alfa/core/cloudflare.py
index b4948b71..5fd485f7 100755
--- a/plugin.video.alfa/core/cloudflare.py
+++ b/plugin.video.alfa/core/cloudflare.py
@@ -9,7 +9,7 @@ import urllib
 import urlparse
 
 from platformcode import logger
-from decimal import Decimal, ROUND_UP
+from decimal import Decimal
 
 class Cloudflare:
     def __init__(self, response):
@@ -62,18 +62,17 @@ class Cloudflare:
     def get_url(self):
         # Metodo #1 (javascript)
         if self.js_data.get("wait", 0):
-            jschl_answer = self.decode2(self.js_data["value"])
+            jschl_answer = self.decode(self.js_data["value"])
 
             for op, v in self.js_data["op"]:
-                #jschl_answer = eval(str(jschl_answer) + op + str(self.decode2(v)))
                 if op == '+':
-                    jschl_answer = jschl_answer + self.decode2(v)
+                    jschl_answer = jschl_answer + self.decode(v)
                 elif op == '-':
-                    jschl_answer = jschl_answer - self.decode2(v)
+                    jschl_answer = jschl_answer - self.decode(v)
                 elif op == '*':
-                    jschl_answer = jschl_answer * self.decode2(v)
+                    jschl_answer = jschl_answer * self.decode(v)
                 elif op == '/':
-                    jschl_answer = jschl_answer / self.decode2(v)
+                    jschl_answer = jschl_answer / self.decode(v)
 
             self.js_data["params"]["jschl_answer"] = round(jschl_answer, 10) + len(self.domain)
 
@@ -93,7 +92,7 @@ class Cloudflare:
 
             return response
 
-    def decode2(self, data):
+    def decode(self, data):
         data = re.sub("\!\+\[\]", "1", data)
         data = re.sub("\!\!\[\]", "1", data)
         data = re.sub("\[\]", "0", data)
@@ -112,59 +111,4 @@ class Cloudflare:
         for n in aux:
             num2 += str(eval(n))
 
-        #return float(num1) / float(num2)
-        #return Decimal(Decimal(num1) / Decimal(num2)).quantize(Decimal('.0000000000000001'), rounding=ROUND_UP)
         return Decimal(Decimal(num1) / Decimal(num2)).quantize(Decimal('.0000000000000001'))
-
-    def decode(self, data):
-        t = time.time()
-        timeout = False
-
-        while not timeout:
-            data = re.sub("\[\]", "''", data)
-            data = re.sub("!\+''", "+1", data)
-            data = re.sub("!''", "0", data)
-            data = re.sub("!0", "1", data)
-
-            if "(" in data:
-                x, y = data.rfind("("), data.find(")", data.rfind("(")) + 1
-                part = data[x + 1:y - 1]
-            else:
-                x = 0
-                y = len(data)
-                part = data
-
-            val = ""
-
-            if not part.startswith("+"): part = "+" + part
-
-            for i, ch in enumerate(part):
-                if ch == "+":
-                    if not part[i + 1] == "'":
-                        if val == "": val = 0
-                        if type(val) == str:
-                            val = val + self.get_number(part, i + 1)
-                        else:
-                            val = val + int(self.get_number(part, i + 1))
-                    else:
-                        val = str(val)
-                        val = val + self.get_number(part, i + 1) or "0"
-
-            if type(val) == str: val = "'%s'" % val
-            data = data[0:x] + str(val) + data[y:]
-
-            timeout = time.time() - t > self.timeout
-
-            if not "+" in data and not "(" in data and not ")" in data:
-                return int(self.get_number(data))
-
-    def get_number(self, str, start=0):
-        ret = ""
-        for chr in str[start:]:
-            try:
-                int(chr)
-            except:
-                if ret: break
-            else:
-                ret += chr
-        return ret

From bf9c3a5a8a6b642eb805f1210f1570a8f73271c4 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Wed, 11 Apr 2018 12:08:38 +0200
Subject: [PATCH 24/27] =?UTF-8?q?Correcci=C3=B3n=20decode=20powvideo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/servers/powvideo.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py
index efaf6d4b..43489cb2 100755
--- a/plugin.video.alfa/servers/powvideo.py
+++ b/plugin.video.alfa/servers/powvideo.py
@@ -33,16 +33,22 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     if 'Video is processing now' in data:
         return "El vídeo está siendo procesado, intentalo de nuevo mas tarde"
 
-    var = scrapertools.find_single_match(data, 'var _0x[0-f]{4}=(\[[^;]+\]);')
+    #var = scrapertools.find_single_match(data, 'var _0x[0-f]{4}=(\[[^;]+\]);')
 
     packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
     unpacked = jsunpack.unpack(packed)
 
     url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
-    itemlist.append([".mp4" + " [powvideo]", S(var).decode(url)])
+    #itemlist.append([".mp4" + " [powvideo]", S(var).decode(url)])
+    itemlist.append([".mp4" + " [powvideo]", decode_powvideo_url(url)])
     itemlist.sort(key=lambda x: x[0], reverse=True)
     return itemlist
 
+def decode_powvideo_url(url):
+    tria = re.compile('[0-9a-z]{40,}', re.IGNORECASE).findall(url)[0]
+    gira = tria[::-1]
+    x = gira[:2] + gira[3:]
+    return re.sub(tria, x, url)
 
 class S:
     def __init__(self, var):

From ebf093a74456c54f641af134cd9cd89c29bd8b99 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Wed, 11 Apr 2018 17:25:27 +0200
Subject: [PATCH 25/27] Cambios en el decode para streamplay

Mismos cambios que en powvideo
---
 plugin.video.alfa/servers/streamplay.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/servers/streamplay.py b/plugin.video.alfa/servers/streamplay.py
index 427762b3..ae8231bd 100644
--- a/plugin.video.alfa/servers/streamplay.py
+++ b/plugin.video.alfa/servers/streamplay.py
@@ -36,14 +36,20 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
     unpacked = jsunpack.unpack(packed)
-    var = scrapertools.find_single_match(data, 'var _0x[0-f]+=(\[[^;]+\]);')
+    #var = scrapertools.find_single_match(data, 'var _0x[0-f]+=(\[[^;]+\]);')
 
     url = scrapertools.find_single_match(unpacked, '(http[^,]+\.mp4)')
-    itemlist.append([".mp4" + " [streamplay]", S(var).decode(url)])
+    #itemlist.append([".mp4" + " [streamplay]", S(var).decode(url)])
+    itemlist.append([".mp4" + " [streamplay]", decode_video_url(url)])
     itemlist.sort(key=lambda x: x[0], reverse=True)
 
     return itemlist
 
+def decode_video_url(url):
+    tria = re.compile('[0-9a-z]{40,}', re.IGNORECASE).findall(url)[0]
+    gira = tria[::-1]
+    x = gira[:2] + gira[3:]
+    return re.sub(tria, x, url)
 
 class S:
     def __init__(self, var):

From 2fe38e7a286c578326c76cd71a878e2eca073ea7 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Wed, 11 Apr 2018 17:36:53 +0200
Subject: [PATCH 26/27] =?UTF-8?q?Quitar=20c=C3=B3digo=20obsoleto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/servers/streamplay.py | 366 ------------------------
 1 file changed, 366 deletions(-)

diff --git a/plugin.video.alfa/servers/streamplay.py b/plugin.video.alfa/servers/streamplay.py
index ae8231bd..9ceae02b 100644
--- a/plugin.video.alfa/servers/streamplay.py
+++ b/plugin.video.alfa/servers/streamplay.py
@@ -36,10 +36,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
     unpacked = jsunpack.unpack(packed)
-    #var = scrapertools.find_single_match(data, 'var _0x[0-f]+=(\[[^;]+\]);')
 
     url = scrapertools.find_single_match(unpacked, '(http[^,]+\.mp4)')
-    #itemlist.append([".mp4" + " [streamplay]", S(var).decode(url)])
     itemlist.append([".mp4" + " [streamplay]", decode_video_url(url)])
     itemlist.sort(key=lambda x: x[0], reverse=True)
 
@@ -50,367 +48,3 @@ def decode_video_url(url):
     gira = tria[::-1]
     x = gira[:2] + gira[3:]
     return re.sub(tria, x, url)
-
-class S:
-    def __init__(self, var):
-        self.r = None
-        self.s = None
-        self.k = None
-        self.n = None
-        self.c = None
-        self.b = None
-        self.d = None
-
-        var = eval(var)
-        for x in range(0xf8, 0, -1):
-            var.append(var.pop(0))
-
-        self.var = var
-
-        self.t(
-            self.decode_index('0xb') +
-            self.decode_index('0xc') +
-            self.decode_index('0xd') +
-            self.decode_index('0xe'),
-            self.decode_index('0xf')
-        )
-
-    def decode_index(self, index, key=None):
-        b64_data = self.var[int(index, 16)]
-        result = ''
-        _0xb99338 = 0x0
-        _0x25e3f4 = 0x0
-
-        data = base64.b64decode(b64_data)
-        data = urllib.unquote(data).decode('utf8')
-
-        if key:
-            _0x5da081 = [x for x in range(0x100)]
-
-            for x in range(0x100):
-                _0xb99338 = (_0xb99338 + _0x5da081[x] + ord(key[x % len(key)])) % 0x100
-                _0x139847 = _0x5da081[x]
-                _0x5da081[x] = _0x5da081[_0xb99338]
-                _0x5da081[_0xb99338] = _0x139847
-
-            _0xb99338 = 0x0
-
-            for _0x11ebc5 in range(len(data)):
-                _0x25e3f4 = (_0x25e3f4 + 0x1) % 0x100
-                _0xb99338 = (_0xb99338 + _0x5da081[_0x25e3f4]) % 0x100
-                _0x139847 = _0x5da081[_0x25e3f4]
-                _0x5da081[_0x25e3f4] = _0x5da081[_0xb99338]
-                _0x5da081[_0xb99338] = _0x139847
-                result += chr(ord(data[_0x11ebc5]) ^ _0x5da081[(_0x5da081[_0x25e3f4] + _0x5da081[_0xb99338]) % 0x100])
-
-            return result
-        else:
-            return data
-
-    def decode(self, url):
-        _hash = re.compile('[A-z0-9_-]{40,}', re.DOTALL).findall(url)[0]
-        return url.replace(_hash, self.p(_hash))
-
-    def t(self, t, i):
-        self.r = 20
-        self.s = [1634760805, 857760878, 2036477234, 1797285236]
-        self.k = []
-        self.n = [0, 0]
-        self.c = [0, 0]
-        self.b = [None] * 64
-        self.d = 64
-
-        self.sk(self.sa(t))
-        self.sn(self.sa(i))
-
-    def e(self, t):
-        s = self.gb(len(t))
-        i = [s[h] ^ t[h] for h in range(len(t))]
-        return i
-
-    def p(self, t):
-        import base64
-        t += "=" * (4 - len(t) % 4)
-        t = base64.b64decode(t.replace('-', '+').replace('_', '/'))
-        return self._as(self.e(self.sa(t)))
-
-    @staticmethod
-    def sa(t):
-        s = [ord(t[i]) for i in range(len(t))]
-        return s
-
-    @staticmethod
-    def _as(t):
-        s = [chr(t[i]) for i in range(len(t))]
-        return ''.join(s)
-
-    def sk(self, t):
-        s = 0
-        for i in range(8):
-            self.k.append(
-                255 & t[s] | self.lshift((255 & t[s + 1]), 8) | self.lshift((255 & t[s + 2]), 16) | self.lshift(
-                    (255 & t[s + 3]), 24))
-            s += 4
-        self._r()
-
-    def sn(self, t):
-        self.n[0] = 255 & t[0] | self.lshift((255 & t[1]), 8) | self.lshift((255 & t[2]), 16) | self.lshift(
-            (255 & t[3]), 24)
-        self.n[1] = 255 & t[4] | self.lshift((255 & t[5]), 8) | self.lshift((255 & t[6]), 16) | self.lshift(
-            (255 & t[7]), 24)
-        self._r()
-
-    def gb(self, t):
-        i = [None] * t
-
-        for s in range(t):
-            if 64 == self.d:
-                self._g()
-                self._i()
-                self.d = 0
-
-            i[s] = self.b[self.d]
-            self.d += 1
-
-        return i
-
-    def gh(self, t):
-        i = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f']
-        h = self.gb(t)
-        s = [i[self.rshift(h[b], 4) & 15] for b in range(len(h))]
-        s.append(i[15 & h[len(h)]])
-        return ''.join(s)
-
-    def _r(self):
-        self.c[0] = 0
-        self.c[1] = 0
-        self.d = 64
-
-    def _i(self):
-        self.c[0] = self.c[0] + 1 & 4294967295
-        if 0 == self.c[0]:
-            self.c[1] = self.c[1] + 1 & 4294967295
-
-    def _g(self):
-        i = self.s[0]
-        s = self.k[0]
-        h = self.k[1]
-        b = self.k[2]
-        r = self.k[3]
-        n = self.s[1]
-        o = self.n[0]
-        e = self.n[1]
-        c = self.c[0]
-        p = self.c[1]
-        a = self.s[2]
-        f = self.k[4]
-        u = self.k[5]
-        g = self.k[6]
-        y = self.k[7]
-        k = self.s[3]
-        l = i
-        d = s
-        v = h
-        _ = b
-        A = r
-        w = n
-        C = o
-        S = e
-        j = c
-        m = p
-        q = a
-        x = f
-        z = u
-        B = g
-        D = y
-        E = k
-
-        for F in range(0, self.r, 2):
-            # 0
-            t = l + z
-            A ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = A + l
-            j ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = j + A
-            z ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = z + j
-            l ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 1
-            t = w + d
-            m ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = m + w
-            B ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = B + m
-            d ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = d + B
-            w ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 2
-            t = q + C
-            D ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = D + q
-            v ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = v + D
-            C ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = C + v
-            q ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 3
-            t = E + x
-            _ ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = _ + E
-            S ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = S + _
-            x ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = x + S
-            E ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 4
-            t = l + _
-            d ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = d + l
-            v ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = v + d
-            _ ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = _ + v
-            l ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 5
-            t = w + A
-            C ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = C + w
-            S ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = S + C
-            A ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = A + S
-            w ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 6
-            t = q + m
-            x ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = x + q
-            j ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = j + x
-            m ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = m + j
-            q ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 7
-            t = E + D
-            z ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = z + E
-            B ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = B + z
-            D ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = D + B
-            E ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-        l += i
-        d += s
-        v += h
-        _ += b
-        A += r
-        w += n
-        C += o
-        S += e
-        j += c
-        m += p
-        q += a
-        x += f
-        z += u
-        B += g
-        D += y
-        E += k
-
-        self.b[0] = self.bshift(l, 0) & 255
-        self.b[1] = self.bshift(l, 8) & 255
-        self.b[2] = self.bshift(l, 16) & 255
-        self.b[3] = self.bshift(l, 24) & 255
-        self.b[4] = self.bshift(d, 0) & 255
-        self.b[5] = self.bshift(d, 8) & 255
-        self.b[6] = self.bshift(d, 16) & 255
-        self.b[7] = self.bshift(d, 24) & 255
-        self.b[8] = self.bshift(v, 0) & 255
-        self.b[9] = self.bshift(v, 8) & 255
-        self.b[10] = self.bshift(v, 16) & 255
-        self.b[11] = self.bshift(v, 24) & 255
-        self.b[12] = self.bshift(_, 0) & 255
-        self.b[13] = self.bshift(_, 8) & 255
-        self.b[14] = self.bshift(_, 16) & 255
-        self.b[15] = self.bshift(_, 24) & 255
-        self.b[16] = self.bshift(A, 0) & 255
-        self.b[17] = self.bshift(A, 8) & 255
-        self.b[18] = self.bshift(A, 16) & 255
-        self.b[19] = self.bshift(A, 24) & 255
-        self.b[20] = self.bshift(w, 0) & 255
-        self.b[21] = self.bshift(w, 8) & 255
-        self.b[22] = self.bshift(w, 16) & 255
-        self.b[23] = self.bshift(w, 24) & 255
-        self.b[24] = self.bshift(C, 0) & 255
-        self.b[25] = self.bshift(C, 8) & 255
-        self.b[26] = self.bshift(C, 16) & 255
-        self.b[27] = self.bshift(C, 24) & 255
-        self.b[28] = self.bshift(S, 0) & 255
-        self.b[29] = self.bshift(S, 8) & 255
-        self.b[30] = self.bshift(S, 16) & 255
-        self.b[31] = self.bshift(S, 24) & 255
-        self.b[32] = self.bshift(j, 0) & 255
-        self.b[33] = self.bshift(j, 8) & 255
-        self.b[34] = self.bshift(j, 16) & 255
-        self.b[35] = self.bshift(j, 24) & 255
-        self.b[36] = self.bshift(m, 0) & 255
-        self.b[37] = self.bshift(m, 8) & 255
-        self.b[38] = self.bshift(m, 16) & 255
-        self.b[39] = self.bshift(m, 24) & 255
-        self.b[40] = self.bshift(q, 0) & 255
-        self.b[41] = self.bshift(q, 8) & 255
-        self.b[42] = self.bshift(q, 16) & 255
-        self.b[43] = self.bshift(q, 24) & 255
-        self.b[44] = self.bshift(x, 0) & 255
-        self.b[45] = self.bshift(x, 8) & 255
-        self.b[46] = self.bshift(x, 16) & 255
-        self.b[47] = self.bshift(x, 24) & 255
-        self.b[48] = self.bshift(z, 0) & 255
-        self.b[49] = self.bshift(z, 8) & 255
-        self.b[50] = self.bshift(z, 16) & 255
-        self.b[51] = self.bshift(z, 24) & 255
-        self.b[52] = self.bshift(B, 0) & 255
-        self.b[53] = self.bshift(B, 8) & 255
-        self.b[54] = self.bshift(B, 16) & 255
-        self.b[55] = self.bshift(B, 24) & 255
-        self.b[56] = self.bshift(D, 0) & 255
-        self.b[57] = self.bshift(D, 8) & 255
-        self.b[58] = self.bshift(D, 16) & 255
-        self.b[59] = self.bshift(D, 24) & 255
-        self.b[60] = self.bshift(E, 0) & 255
-        self.b[61] = self.bshift(E, 8) & 255
-        self.b[62] = self.bshift(E, 16) & 255
-        self.b[63] = self.bshift(E, 24) & 255
-
-    def lshift(self, num, other):
-        lnum = self.ToInt32(num)
-        rnum = self.ToUint32(other)
-        shift_count = rnum & 0x1F
-        return self.ToInt32(lnum << shift_count)
-
-    def rshift(self, num, other):
-        lnum = self.ToInt32(num)
-        rnum = self.ToUint32(other)
-        shift_count = rnum & 0x1F
-        return self.ToInt32(lnum >> shift_count)
-
-    def bshift(self, num, other):
-        lnum = self.ToUint32(num)
-        rnum = self.ToUint32(other)
-        shift_count = rnum & 0x1F
-        return self.ToUint32(lnum >> shift_count)
-
-    @staticmethod
-    def ToInt32(num):
-        int32 = num % 2 ** 32
-        return int32 - 2 ** 32 if int32 >= 2 ** 31 else int32
-
-    @staticmethod
-    def ToUint32(num):
-        return num % 2 ** 32

From a3118619ed8624a8c48e017e8693625d6b11f308 Mon Sep 17 00:00:00 2001
From: pipcat <pip@pipcat.com>
Date: Wed, 11 Apr 2018 17:37:48 +0200
Subject: [PATCH 27/27] =?UTF-8?q?Quitar=20c=C3=B3digo=20obsoleto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.video.alfa/servers/powvideo.py | 367 --------------------------
 1 file changed, 367 deletions(-)

diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py
index 43489cb2..c82961ec 100755
--- a/plugin.video.alfa/servers/powvideo.py
+++ b/plugin.video.alfa/servers/powvideo.py
@@ -33,13 +33,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     if 'Video is processing now' in data:
         return "El vídeo está siendo procesado, intentalo de nuevo mas tarde"
 
-    #var = scrapertools.find_single_match(data, 'var _0x[0-f]{4}=(\[[^;]+\]);')
-
     packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
     unpacked = jsunpack.unpack(packed)
 
     url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
-    #itemlist.append([".mp4" + " [powvideo]", S(var).decode(url)])
     itemlist.append([".mp4" + " [powvideo]", decode_powvideo_url(url)])
     itemlist.sort(key=lambda x: x[0], reverse=True)
     return itemlist
@@ -49,367 +46,3 @@ def decode_powvideo_url(url):
     gira = tria[::-1]
     x = gira[:2] + gira[3:]
     return re.sub(tria, x, url)
-
-class S:
-    def __init__(self, var):
-        self.r = None
-        self.s = None
-        self.k = None
-        self.n = None
-        self.c = None
-        self.b = None
-        self.d = None
-
-        var = eval(var)
-        for x in range(0xd3, 0, -1):
-            var.append(var.pop(0))
-
-        self.var = var
-
-        self.t(
-            self.decode_index('0xc') +
-            self.decode_index('0d') +
-            self.decode_index('0xe') +
-            self.decode_index('0xf'),
-            self.decode_index('0x10')
-        )
-
-    def decode_index(self, index, key=None):
-        b64_data = self.var[int(index, 16)]
-        result = ''
-        _0xb99338 = 0x0
-        _0x25e3f4 = 0x0
-
-        data = base64.b64decode(b64_data)
-        data = urllib.unquote(data).decode('utf8')
-
-        if key:
-            _0x5da081 = [x for x in range(0x100)]
-
-            for x in range(0x100):
-                _0xb99338 = (_0xb99338 + _0x5da081[x] + ord(key[x % len(key)])) % 0x100
-                _0x139847 = _0x5da081[x]
-                _0x5da081[x] = _0x5da081[_0xb99338]
-                _0x5da081[_0xb99338] = _0x139847
-
-            _0xb99338 = 0x0
-
-            for _0x11ebc5 in range(len(data)):
-                _0x25e3f4 = (_0x25e3f4 + 0x1) % 0x100
-                _0xb99338 = (_0xb99338 + _0x5da081[_0x25e3f4]) % 0x100
-                _0x139847 = _0x5da081[_0x25e3f4]
-                _0x5da081[_0x25e3f4] = _0x5da081[_0xb99338]
-                _0x5da081[_0xb99338] = _0x139847
-                result += chr(ord(data[_0x11ebc5]) ^ _0x5da081[(_0x5da081[_0x25e3f4] + _0x5da081[_0xb99338]) % 0x100])
-
-            return result
-        else:
-            return data
-
-    def decode(self, url):
-        _hash = re.compile('[A-z0-9_-]{40,}', re.DOTALL).findall(url)[0]
-        return url.replace(_hash, self.p(_hash))
-
-    def t(self, t, i):
-        self.r = 20
-        self.s = [1634760805, 857760878, 2036477234, 1797285236]
-        self.k = []
-        self.n = [0, 0]
-        self.c = [0, 0]
-        self.b = [None] * 64
-        self.d = 64
-
-        self.sk(self.sa(t))
-        self.sn(self.sa(i))
-
-    def e(self, t):
-        s = self.gb(len(t))
-        i = [s[h] ^ t[h] for h in range(len(t))]
-        return i
-
-    def p(self, t):
-        import base64
-        t += "=" * (4 - len(t) % 4)
-        t = base64.b64decode(t.replace('-', '+').replace('_', '/'))
-        return self._as(self.e(self.sa(t)))
-
-    @staticmethod
-    def sa(t):
-        s = [ord(t[i]) for i in range(len(t))]
-        return s
-
-    @staticmethod
-    def _as(t):
-        s = [chr(t[i]) for i in range(len(t))]
-        return ''.join(s)
-
-    def sk(self, t):
-        s = 0
-        for i in range(8):
-            self.k.append(
-                255 & t[s] | self.lshift((255 & t[s + 1]), 8) | self.lshift((255 & t[s + 2]), 16) | self.lshift(
-                    (255 & t[s + 3]), 24))
-            s += 4
-        self._r()
-
-    def sn(self, t):
-        self.n[0] = 255 & t[0] | self.lshift((255 & t[1]), 8) | self.lshift((255 & t[2]), 16) | self.lshift(
-            (255 & t[3]), 24)
-        self.n[1] = 255 & t[4] | self.lshift((255 & t[5]), 8) | self.lshift((255 & t[6]), 16) | self.lshift(
-            (255 & t[7]), 24)
-        self._r()
-
-    def gb(self, t):
-        i = [None] * t
-
-        for s in range(t):
-            if 64 == self.d:
-                self._g()
-                self._i()
-                self.d = 0
-
-            i[s] = self.b[self.d]
-            self.d += 1
-
-        return i
-
-    def gh(self, t):
-        i = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f']
-        h = self.gb(t)
-        s = [i[self.rshift(h[b], 4) & 15] for b in range(len(h))]
-        s.append(i[15 & h[len(h)]])
-        return ''.join(s)
-
-    def _r(self):
-        self.c[0] = 0
-        self.c[1] = 0
-        self.d = 64
-
-    def _i(self):
-        self.c[0] = self.c[0] + 1 & 4294967295
-        if 0 == self.c[0]:
-            self.c[1] = self.c[1] + 1 & 4294967295
-
-    def _g(self):
-        i = self.s[0]
-        s = self.k[0]
-        h = self.k[1]
-        b = self.k[2]
-        r = self.k[3]
-        n = self.s[1]
-        o = self.n[0]
-        e = self.n[1]
-        c = self.c[0]
-        p = self.c[1]
-        a = self.s[2]
-        f = self.k[4]
-        u = self.k[5]
-        g = self.k[6]
-        y = self.k[7]
-        k = self.s[3]
-        l = i
-        d = s
-        v = h
-        _ = b
-        A = r
-        w = n
-        C = o
-        S = e
-        j = c
-        m = p
-        q = a
-        x = f
-        z = u
-        B = g
-        D = y
-        E = k
-
-        for F in range(0, self.r, 2):
-            # 0
-            t = l + z
-            A ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = A + l
-            j ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = j + A
-            z ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = z + j
-            l ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 1
-            t = w + d
-            m ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = m + w
-            B ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = B + m
-            d ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = d + B
-            w ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 2
-            t = q + C
-            D ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = D + q
-            v ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = v + D
-            C ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = C + v
-            q ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 3
-            t = E + x
-            _ ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = _ + E
-            S ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = S + _
-            x ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = x + S
-            E ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 4
-            t = l + _
-            d ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = d + l
-            v ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = v + d
-            _ ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = _ + v
-            l ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 5
-            t = w + A
-            C ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = C + w
-            S ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = S + C
-            A ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = A + S
-            w ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 6
-            t = q + m
-            x ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = x + q
-            j ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = j + x
-            m ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = m + j
-            q ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-            # 7
-            t = E + D
-            z ^= self.lshift(t, 7) | self.bshift(t, 25)
-            t = z + E
-            B ^= self.lshift(t, 9) | self.bshift(t, 23)
-            t = B + z
-            D ^= self.lshift(t, 13) | self.bshift(t, 19)
-            t = D + B
-            E ^= self.lshift(t, 18) | self.bshift(t, 14)
-
-        l += i
-        d += s
-        v += h
-        _ += b
-        A += r
-        w += n
-        C += o
-        S += e
-        j += c
-        m += p
-        q += a
-        x += f
-        z += u
-        B += g
-        D += y
-        E += k
-
-        self.b[0] = self.bshift(l, 0) & 255
-        self.b[1] = self.bshift(l, 8) & 255
-        self.b[2] = self.bshift(l, 16) & 255
-        self.b[3] = self.bshift(l, 24) & 255
-        self.b[4] = self.bshift(d, 0) & 255
-        self.b[5] = self.bshift(d, 8) & 255
-        self.b[6] = self.bshift(d, 16) & 255
-        self.b[7] = self.bshift(d, 24) & 255
-        self.b[8] = self.bshift(v, 0) & 255
-        self.b[9] = self.bshift(v, 8) & 255
-        self.b[10] = self.bshift(v, 16) & 255
-        self.b[11] = self.bshift(v, 24) & 255
-        self.b[12] = self.bshift(_, 0) & 255
-        self.b[13] = self.bshift(_, 8) & 255
-        self.b[14] = self.bshift(_, 16) & 255
-        self.b[15] = self.bshift(_, 24) & 255
-        self.b[16] = self.bshift(A, 0) & 255
-        self.b[17] = self.bshift(A, 8) & 255
-        self.b[18] = self.bshift(A, 16) & 255
-        self.b[19] = self.bshift(A, 24) & 255
-        self.b[20] = self.bshift(w, 0) & 255
-        self.b[21] = self.bshift(w, 8) & 255
-        self.b[22] = self.bshift(w, 16) & 255
-        self.b[23] = self.bshift(w, 24) & 255
-        self.b[24] = self.bshift(C, 0) & 255
-        self.b[25] = self.bshift(C, 8) & 255
-        self.b[26] = self.bshift(C, 16) & 255
-        self.b[27] = self.bshift(C, 24) & 255
-        self.b[28] = self.bshift(S, 0) & 255
-        self.b[29] = self.bshift(S, 8) & 255
-        self.b[30] = self.bshift(S, 16) & 255
-        self.b[31] = self.bshift(S, 24) & 255
-        self.b[32] = self.bshift(j, 0) & 255
-        self.b[33] = self.bshift(j, 8) & 255
-        self.b[34] = self.bshift(j, 16) & 255
-        self.b[35] = self.bshift(j, 24) & 255
-        self.b[36] = self.bshift(m, 0) & 255
-        self.b[37] = self.bshift(m, 8) & 255
-        self.b[38] = self.bshift(m, 16) & 255
-        self.b[39] = self.bshift(m, 24) & 255
-        self.b[40] = self.bshift(q, 0) & 255
-        self.b[41] = self.bshift(q, 8) & 255
-        self.b[42] = self.bshift(q, 16) & 255
-        self.b[43] = self.bshift(q, 24) & 255
-        self.b[44] = self.bshift(x, 0) & 255
-        self.b[45] = self.bshift(x, 8) & 255
-        self.b[46] = self.bshift(x, 16) & 255
-        self.b[47] = self.bshift(x, 24) & 255
-        self.b[48] = self.bshift(z, 0) & 255
-        self.b[49] = self.bshift(z, 8) & 255
-        self.b[50] = self.bshift(z, 16) & 255
-        self.b[51] = self.bshift(z, 24) & 255
-        self.b[52] = self.bshift(B, 0) & 255
-        self.b[53] = self.bshift(B, 8) & 255
-        self.b[54] = self.bshift(B, 16) & 255
-        self.b[55] = self.bshift(B, 24) & 255
-        self.b[56] = self.bshift(D, 0) & 255
-        self.b[57] = self.bshift(D, 8) & 255
-        self.b[58] = self.bshift(D, 16) & 255
-        self.b[59] = self.bshift(D, 24) & 255
-        self.b[60] = self.bshift(E, 0) & 255
-        self.b[61] = self.bshift(E, 8) & 255
-        self.b[62] = self.bshift(E, 16) & 255
-        self.b[63] = self.bshift(E, 24) & 255
-
-    def lshift(self, num, other):
-        lnum = self.ToInt32(num)
-        rnum = self.ToUint32(other)
-        shift_count = rnum & 0x1F
-        return self.ToInt32(lnum << shift_count)
-
-    def rshift(self, num, other):
-        lnum = self.ToInt32(num)
-        rnum = self.ToUint32(other)
-        shift_count = rnum & 0x1F
-        return self.ToInt32(lnum >> shift_count)
-
-    def bshift(self, num, other):
-        lnum = self.ToUint32(num)
-        rnum = self.ToUint32(other)
-        shift_count = rnum & 0x1F
-        return self.ToUint32(lnum >> shift_count)
-
-    @staticmethod
-    def ToInt32(num):
-        int32 = num % 2 ** 32
-        return int32 - 2 ** 32 if int32 >= 2 ** 31 else int32
-
-    @staticmethod
-    def ToUint32(num):
-        return num % 2 ** 32