From ba28a426e60f58f1680688870a24bb10fe884f34 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 28 Nov 2017 08:49:34 -0500
Subject: [PATCH 1/8] settings: Eliminado server_stats
---
plugin.video.alfa/resources/settings.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml
index 662691d8..1c4c8225 100755
--- a/plugin.video.alfa/resources/settings.xml
+++ b/plugin.video.alfa/resources/settings.xml
@@ -11,7 +11,6 @@
-
From 8b445165dff1bd6361671044e8e035a1eb99ba96 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 28 Nov 2017 08:52:06 -0500
Subject: [PATCH 2/8] servertools: Eliminado server_stats
---
plugin.video.alfa/core/servertools.py | 55 +--------------------------
1 file changed, 1 insertion(+), 54 deletions(-)
diff --git a/plugin.video.alfa/core/servertools.py b/plugin.video.alfa/core/servertools.py
index 631101c8..da799696 100644
--- a/plugin.video.alfa/core/servertools.py
+++ b/plugin.video.alfa/core/servertools.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
# --------------------------------------------------------------------------------
# Server management
# --------------------------------------------------------------------------------
@@ -75,7 +75,6 @@ def get_servers_itemlist(itemlist, fnc=None, sort=False):
@param sort: indica si el listado resultante se ha de ordenar en funcion de la lista de servidores favoritos
@type sort: bool
"""
- server_stats = {}
# Recorre los servidores
for serverid in get_servers_list().keys():
server_parameters = get_server_parameters(serverid)
@@ -90,7 +89,6 @@ def get_servers_itemlist(itemlist, fnc=None, sort=False):
for x in range(len(match.groups())):
url = url.replace("\\%s" % (x + 1), match.groups()[x])
- server_stats[serverid] = "found"
for item in itemlist:
if match.group() in item.url:
if not item.contentThumbnail:
@@ -102,8 +100,6 @@ def get_servers_itemlist(itemlist, fnc=None, sort=False):
else:
item.url = url
- save_server_stats(server_stats, "find_videos")
-
# Eliminamos los servidores desactivados
itemlist = filter(lambda i: not i.server or is_server_enabled(i.server), itemlist)
@@ -188,10 +184,6 @@ def findvideosbyserver(data, serverid):
devuelve.append(value)
logger.info(msg)
- # Guardar estadisticas
- if devuelve:
- save_server_stats({serverid: "found"}, "find_videos")
-
return devuelve
@@ -324,11 +316,8 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo
try:
logger.info("Invocando a %s.get_video_url" % server)
response = serverid.get_video_url(page_url=url, video_password=video_password)
- if response:
- save_server_stats({server: "sucess"}, "resolve")
video_urls.extend(response)
except:
- save_server_stats({server: "error"}, "resolve")
logger.error("Error al obtener la url en modo free")
error_messages.append("Se ha producido un error en %s" % server_name)
import traceback
@@ -343,16 +332,12 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo
password=config.get_setting("password", server=opcion),
video_password=video_password)
if response and response[0][1]:
- if opcion == server:
- save_server_stats({server: "sucess"}, "resolve")
video_urls.extend(response)
elif response and response[0][0]:
error_messages.append(response[0][0])
else:
error_messages.append("Se ha producido un error en %s" % server_name)
except:
- if opcion == server:
- save_server_stats({server: "error"}, "resolve")
logger.error("Error en el servidor: %s" % opcion)
error_messages.append("Se ha producido un error en %s" % server_name)
import traceback
@@ -720,41 +705,3 @@ def filter_servers(servers_list):
servers_list = servers_list_filter
return servers_list
-
-
-def save_server_stats(stats, type="find_videos"):
- if not config.get_setting("server_stats"):
- return
-
- stats_file = os.path.join(config.get_data_path(), "server_stats.json")
- today = datetime.datetime.now().strftime("%Y%m%d")
-
- # Leemos el archivo
- try:
- server_stats = jsontools.load(open(stats_file, "rb").read())
- except:
- server_stats = {"created": time.time(), "data": {}}
-
- # Actualizamos los datos
- for server in stats:
- if not server in server_stats["data"]:
- server_stats["data"][server] = {}
-
- if not today in server_stats["data"][server]:
- server_stats["data"][server][today] = {"find_videos": {"found": 0}, "resolve": {"sucess": 0, "error": 0}}
-
- server_stats["data"][server][today][type][stats[server]] += 1
-
- # Guardamos el archivo
- open(stats_file, "wb").write(jsontools.dump(server_stats))
-
- # Enviamos al servidor
- return
- if time.time() - server_stats["created"] > 86400: # 86400: #1 Dia
- from core import httptools
- if httptools.downloadpage("url servidor", headers={'Content-Type': 'application/json'},
- post=jsontools.dump(server_stats)).sucess:
- os.remove(stats_file)
- logger.info("Datos enviados correctamente")
- else:
- logger.info("No se han podido enviar los datos")
From 392435e6fb7b14b3cc0f0c335d1fc0bd847146e5 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 28 Nov 2017 09:18:12 -0500
Subject: [PATCH 3/8] gvideo: actualizado test_video_exists
---
plugin.video.alfa/servers/gvideo.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/plugin.video.alfa/servers/gvideo.py b/plugin.video.alfa/servers/gvideo.py
index 8cb31f7a..0020c425 100644
--- a/plugin.video.alfa/servers/gvideo.py
+++ b/plugin.video.alfa/servers/gvideo.py
@@ -20,7 +20,8 @@ def test_video_exists(page_url):
return False, "[gvideo] No tienes permiso para acceder a este video"
if "Se ha producido un error" in response.data:
return False, "[gvideo] Se ha producido un error en el reproductor de google"
-
+ if "No+se+puede+procesar+este" in response.data:
+ return False, "[gvideo] No se puede procesar este video"
return True, ""
From 6bbf26a9a95d6a37251a60d99a006a399ed33d83 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 28 Nov 2017 14:20:13 -0500
Subject: [PATCH 4/8] tvmoviedb: activado lista de imagenes
---
plugin.video.alfa/channels/tvmoviedb.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/plugin.video.alfa/channels/tvmoviedb.py b/plugin.video.alfa/channels/tvmoviedb.py
index eb2b1a09..f2ee9322 100755
--- a/plugin.video.alfa/channels/tvmoviedb.py
+++ b/plugin.video.alfa/channels/tvmoviedb.py
@@ -557,12 +557,12 @@ def detalles(item):
itemlist.append(item.clone(channel="trailertools", action="buscartrailer", title="Buscar Tráiler",
text_color=color5))
- # try:
- # images['tmdb'] = ob_tmdb.result["images"]
- # itemlist.append(item.clone(action="imagenes", title="Lista de Imágenes", text_color=color5, images=images,
- # extra="menu"))
- # except:
- # pass
+ try:
+ images['tmdb'] = ob_tmdb.result["images"]
+ itemlist.append(item.clone(action="imagenes", title="Lista de Imágenes", text_color=color5, images=images,
+ extra="menu"))
+ except:
+ pass
try:
if item.contentType == "movie" and item.infoLabels["year"] < 2014:
From 9d03b4de54172704f23761bebcf6008f19827126 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Tue, 28 Nov 2017 16:05:12 -0500
Subject: [PATCH 5/8] Update xbmc_videolibrary.py
---
plugin.video.alfa/platformcode/xbmc_videolibrary.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin.video.alfa/platformcode/xbmc_videolibrary.py b/plugin.video.alfa/platformcode/xbmc_videolibrary.py
index fb3f813f..8650dc70 100755
--- a/plugin.video.alfa/platformcode/xbmc_videolibrary.py
+++ b/plugin.video.alfa/platformcode/xbmc_videolibrary.py
@@ -805,7 +805,7 @@ def ask_set_content(flag, silent=False):
if not silent:
heading = "Alfa Auto-configuración"
- linea1 = "¿Desea que Alfa auto-configure la videteoca de Kodi?"
+ linea1 = "¿Desea que Alfa auto-configure la videoteca de Kodi?"
linea2 = "Si pulsa 'No' podra hacerlo desde 'Configuración > Preferencia > Rutas'."
if platformtools.dialog_yesno(heading, linea1, linea2):
do_config()
From 3701aba7fa9eac6389a72d0351378053702d0a1b Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Thu, 30 Nov 2017 08:45:22 -0500
Subject: [PATCH 6/8] Update powvideo.py
---
plugin.video.alfa/servers/powvideo.py | 361 +-------------------------
1 file changed, 1 insertion(+), 360 deletions(-)
diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py
index 4868e526..ba350a9f 100755
--- a/plugin.video.alfa/servers/powvideo.py
+++ b/plugin.video.alfa/servers/powvideo.py
@@ -1,360 +1 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import logger
-
-headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0']]
-host = "http://powvideo.net/"
-
-
-def test_video_exists(page_url):
- logger.info("(page_url='%s')" % page_url)
- return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
- logger.info("(page_url='%s')" % page_url)
-
- referer = page_url.replace('iframe', 'preview')
- data = httptools.downloadpage(page_url, headers={'referer': referer}).data
-
- _0xa3e8 = scrapertools.find_single_match(data, 'var _0xa3e8=(\[[^;]+\]);')
- packed = scrapertools.find_single_match(data, "")
- unpacked = jsunpack.unpack(packed)
-
- video_urls = []
-
- url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
- video_urls.append([".mp4" + " [powvideo]", S(_0xa3e8).decode(url)])
-
- video_urls.sort(key=lambda x: x[0], reverse=True)
- for video_url in video_urls:
- logger.info("%s - %s" % (video_url[0], video_url[1]))
-
- return video_urls
-
-
-class S:
- def __init__(self, _0xa3e8):
- self.r = None
- self.s = None
- self.k = None
- self.n = None
- self.c = None
- self.b = None
- self.d = None
-
- _0xa3e8 = eval(_0xa3e8)
- self.t(_0xa3e8[14] + _0xa3e8[15] + _0xa3e8[14] + _0xa3e8[15], _0xa3e8[16])
-
- 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
+import base64;exec base64.b64decode('# -*- coding: utf-8 -*-

import re

from core import httptools
from core import scrapertools
from lib import jsunpack
#from platformcode import logger

headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0']]
host = "http://powvideo.net/"


def test_video_exists(page_url):
    #logger.info("(page_url='%s')" % page_url)
    return True, ""


def get_video_url(page_url, premium=False, user="", password="", video_password=""):
    #logger.info("(page_url='%s')" % page_url)

    referer = page_url.replace('iframe', 'preview')
    data = httptools.downloadpage(page_url, headers={'referer': referer}).data

    _0xa3e8 = scrapertools.find_single_match(data, 'var _0xf475=(\[[^;]+\]);')
    #logger.info("Intel11 %s" %_0xa3e8)
    #logger.info("Intel22 %s" %data)
    packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
    unpacked = jsunpack.unpack(packed)

    video_urls = []

    url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
    video_urls.append([".mp4" + " [powvideo]", S(_0xa3e8).decode(url)])

    video_urls.sort(key=lambda x: x[0], reverse=True)
    return video_urls


class S:
    def __init__(self, _0xa3e8):
        self.r = None
        self.s = None
        self.k = None
        self.n = None
        self.c = None
        self.b = None
        self.d = None

        _0xa3e8 = eval(_0xa3e8)
        self.t(_0xa3e8[14] + _0xa3e8[15] + _0xa3e8[14] + _0xa3e8[15], _0xa3e8[16])

    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 48a8f2fa1ae03cb74feed3ab096a52fe2768e321 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Thu, 30 Nov 2017 17:02:54 -0500
Subject: [PATCH 7/8] pelisplus: fix buscador global series
---
plugin.video.alfa/channels/pelisplus.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/plugin.video.alfa/channels/pelisplus.py b/plugin.video.alfa/channels/pelisplus.py
index 93dd1fa9..23a950b9 100644
--- a/plugin.video.alfa/channels/pelisplus.py
+++ b/plugin.video.alfa/channels/pelisplus.py
@@ -146,8 +146,7 @@ def search(item, texto):
logger.info()
texto = texto.replace(" ", "+")
item.url = host + 'busqueda/?s=' + texto
- if not item.extra:
- item.extra = 'peliculas/'
+
try:
if texto != '':
return lista(item)
@@ -174,7 +173,7 @@ def lista(item):
data = httptools.downloadpage(item.url).data
- if item.title != 'Buscar':
+ if item.action != 'search':
patron = '.*?.<\/i>.*?.