From bd68b83b6c2c1fa4332f146e51bae5aaef383053 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Wed, 1 Nov 2017 06:47:51 -0500
Subject: [PATCH 01/11] flashx: fix

---
 plugin.video.alfa/servers/flashx.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py
index 9730b95d..169c0a54 100644
--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -37,12 +37,16 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     cgi_counter = cgi_counter.replace("%0A","").replace("%22","")
     playnow = scrapertools.find_single_match(data, 'https://www.flashx.tv/dl[^"]+')
     # Para obtener el f y el fxfx
-    js_fxfx = "https://www." + scrapertools.find_single_match(data, """(?is)(flashx.tv/js/code.js.*?[^(?:'|")]+)""")
+    js_fxfx = "https://www." + scrapertools.find_single_match(data.replace("//","/"), """(?is)(flashx.tv/js/code.js.*?[^(?:'|")]+)""")
     data_fxfx = httptools.downloadpage(js_fxfx).data
     mfxfx = scrapertools.find_single_match(data_fxfx, 'get.*?({.*?})').replace("'","").replace(" ","")
     matches = scrapertools.find_multiple_matches(mfxfx, '(\w+):(\w+)')
     for f, v in matches:
         pfxfx += f + "=" + v + "&"
+    logger.info("mfxfxfx1= %s" %js_fxfx)
+    logger.info("mfxfxfx2= %s" %pfxfx)
+    if pfxfx == "":
+        pfxfx = "f=fail&fxfx=6"
     coding_url = 'https://www.flashx.tv/flashx.php?%s' %pfxfx
     # {f: 'y', fxfx: '6'}
     flashx_id = scrapertools.find_single_match(data, 'name="id" value="([^"]+)"')

From 267c9d80315c4a94dd24a71132d39d4435990556 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:07:46 -0500
Subject: [PATCH 02/11] gvideo: fix

---
 plugin.video.alfa/servers/gvideo.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugin.video.alfa/servers/gvideo.py b/plugin.video.alfa/servers/gvideo.py
index 7ed9570c..8cb31f7a 100644
--- a/plugin.video.alfa/servers/gvideo.py
+++ b/plugin.video.alfa/servers/gvideo.py
@@ -30,12 +30,20 @@ def get_video_url(page_url, user="", password="", video_password=""):
     streams =[]
     logger.debug('page_url: %s'%page_url)
     if 'googleusercontent' in page_url:
-        data = httptools.downloadpage(page_url, follow_redirects = False, headers={"Referer": page_url})
-        url=data.headers['location']
+
+        response = httptools.downloadpage(page_url, follow_redirects = False, cookies=False, headers={"Referer": page_url})
+        url=response.headers['location']
+        cookies = ""
+        cookie = response.headers["set-cookie"].split("HttpOnly, ")
+        for c in cookie:
+            cookies += c.split(";", 1)[0] + "; "
+        data = response.data.decode('unicode-escape')
+        data = urllib.unquote_plus(urllib.unquote_plus(data))
+        headers_string = "|Cookie=" + cookies
+
         quality = scrapertools.find_single_match (url, '.itag=(\d+).')
 
         streams.append((quality, url))
-        headers_string=""
 
     else:
         response = httptools.downloadpage(page_url, cookies=False, headers={"Referer": page_url})

From 9cc30152f89d9696ad7ab6ee24964614e53b405a Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:15:27 -0500
Subject: [PATCH 03/11] vshare: actualizado patron

---
 plugin.video.alfa/servers/vshare.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/servers/vshare.json b/plugin.video.alfa/servers/vshare.json
index 04faa1bb..8752af78 100644
--- a/plugin.video.alfa/servers/vshare.json
+++ b/plugin.video.alfa/servers/vshare.json
@@ -3,8 +3,8 @@
   "find_videos": {
     "patterns": [
       {
-        "pattern": "(http://vshare.io/v/[\\w]+[^\"']*)[\"']",
-        "url": "\\1"
+        "pattern": "(vshare.io/v/[a-zA-Z0-9/-]+)",
+        "url": "http://\\1"
       }
     ]
   },

From 506e68e8a35db847a55b20edd8c6ea244144d305 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:17:12 -0500
Subject: [PATCH 04/11] vshare: cambiado el orden de resoluciones

---
 plugin.video.alfa/servers/vshare.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugin.video.alfa/servers/vshare.py b/plugin.video.alfa/servers/vshare.py
index d475229b..23a8ddfe 100644
--- a/plugin.video.alfa/servers/vshare.py
+++ b/plugin.video.alfa/servers/vshare.py
@@ -40,11 +40,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         arrayResult = [chr(int(value) - substract) for value in fields.group(1).split(",")]
         strResult = "".join(arrayResult)
         logger.debug(strResult)
-
         videoSources = re.findall("<source[\s]+src=[\"'](?P<url>[^\"']+)[^>]+label=[\"'](?P<label>[^\"']+)", strResult)
-
         for url, label in videoSources:
-            logger.debug("[" + label + "] " + url)
             video_urls.append([label, url])
-
+    video_urls.sort(key=lambda i: int(i[0].replace("p","")))
     return video_urls

From 2925c29671f861438fb11c6111205c04181c4c8f Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:20:47 -0500
Subject: [PATCH 05/11] Update ultrapeliculashd.json

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

diff --git a/plugin.video.alfa/channels/ultrapeliculashd.json b/plugin.video.alfa/channels/ultrapeliculashd.json
index 0480994d..184a5f4a 100755
--- a/plugin.video.alfa/channels/ultrapeliculashd.json
+++ b/plugin.video.alfa/channels/ultrapeliculashd.json
@@ -34,6 +34,14 @@
             "default": true,
             "enabled": true,
             "visible": true
+        },
+        {
+            "id": "include_in_newest_terror",
+            "type": "bool",
+            "label": "Incluir en Novedades -Terror",
+            "default": true,
+            "enabled": true,
+            "visible": true
         }
     ]
-}
\ No newline at end of file
+}

From 6855508eaac6add0aebdb5482ca7558e1bffde1e Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:21:18 -0500
Subject: [PATCH 06/11] Update ultrapeliculashd.py

---
 plugin.video.alfa/channels/ultrapeliculashd.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/channels/ultrapeliculashd.py b/plugin.video.alfa/channels/ultrapeliculashd.py
index 73f4e78a..e1093573 100755
--- a/plugin.video.alfa/channels/ultrapeliculashd.py
+++ b/plugin.video.alfa/channels/ultrapeliculashd.py
@@ -252,10 +252,13 @@ def newest(categoria):
     item.extra = 'estrenos/'
     try:
         if categoria == 'peliculas':
-            item.url = host + '/category/estrenos/'
+            item.url = host + '/genre/estrenos/'
 
         elif categoria == 'infantiles':
-            item.url = host + '/category/infantil/'
+            item.url = host + '/genre/animacion/'
+
+        elif categoria == 'terror':
+            item.url = host + '/genre/terror/'
 
         itemlist = lista(item)
         if itemlist[-1].title == 'Siguiente >>>':

From 7afd09dfa9000df7d7c221ce3d91df6cb70eb7eb Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 11:08:16 -0500
Subject: [PATCH 07/11] streamixcloud: fix

---
 plugin.video.alfa/servers/streamixcloud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/servers/streamixcloud.py b/plugin.video.alfa/servers/streamixcloud.py
index 5f99d151..bc9d81a5 100755
--- a/plugin.video.alfa/servers/streamixcloud.py
+++ b/plugin.video.alfa/servers/streamixcloud.py
@@ -8,7 +8,6 @@ from platformcode import logger
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-
     data = httptools.downloadpage(page_url).data
     if "Not Found" in data:
         return False, "[streamixcloud] El archivo no existe o ha sido borrado"
@@ -21,7 +20,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.info("(page_url='%s')" % page_url)
     data = httptools.downloadpage(page_url).data
     video_urls = []
-    packed = scrapertools.find_single_match(data,
+    patron = "<script type='text/javascript'>(eval\(function\(p,a,c,k,e,d.*?)</script"
+    packed = scrapertools.find_single_match(data, patron)
     data = jsunpack.unpack(packed)
     media_url = scrapertools.find_multiple_matches(data, '\{file:"([^"]+)",')
     ext = scrapertools.get_filename_from_url(media_url[0])[-4:]

From 6dc853b41e317ae0d9494c4d0831350e0431a8a6 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 15:49:52 -0500
Subject: [PATCH 08/11] repelis: fix categoria

---
 plugin.video.alfa/channels/repelis.py | 58 ++++++++-------------------
 1 file changed, 16 insertions(+), 42 deletions(-)

diff --git a/plugin.video.alfa/channels/repelis.py b/plugin.video.alfa/channels/repelis.py
index 480a5e4f..dec63bd8 100644
--- a/plugin.video.alfa/channels/repelis.py
+++ b/plugin.video.alfa/channels/repelis.py
@@ -30,11 +30,6 @@ def mainlist(item):
     itemlist.append(
             Item(channel=item.channel, action="menudesta", title="Destacadas", url= host + "/pag/1",
                  thumbnail="http://img.irtve.es/v/1074982/", fanart=mifan))
-    itemlist.append(Item(channel=item.channel, action="menupelis", title="Proximos estrenos",
-                         url= host + "/archivos/proximos-estrenos/pag/1",
-                         thumbnail="https://encrypted-tbn3.gstatic.com/images?q=tbn:ANd9GcTpsRC"
-                                   "-GTYzCqhor2gIDfAB61XeymwgXWSVBHoRAKs2c5HAn29f&reload=on",
-                         fanart=mifan))
     itemlist.append(Item(channel=item.channel, action="menupelis", title="Todas las Peliculas",
                          url= host + "/pag/1",
                          thumbnail="https://freaksociety.files.wordpress.com/2012/02/logos-cine.jpg", fanart=mifan))
@@ -70,7 +65,8 @@ def menupelis(item):
     logger.info(item.url)
     itemlist = []
     data = httptools.downloadpage(item.url).data.decode('iso-8859-1').encode('utf-8')
-
+    if item.genre:
+        item.extra = item.genre
     if item.extra == '':
         section = 'Recién Agregadas'
     elif item.extra == 'year':
@@ -79,17 +75,13 @@ def menupelis(item):
         section = 'de Eróticas \+18'
     else:
         section = 'de %s'%item.extra
-
-    patronenlaces = '<h.>Películas %s<\/h.>.*?>(.*?)<\/section>'%section
-    matchesenlaces = re.compile(patronenlaces, re.DOTALL).findall(data)
-
+    patronenlaces = '<h.>Películas %s</h.>.*?>(.*?)</section>'%section
+    matchesenlaces = scrapertools.find_multiple_matches(data, patronenlaces)
     for bloque_enlaces in matchesenlaces:
-
         patron = '<div class="poster-media-card">.*?'
         patron += '<a href="(.*?)".*?title="(.*?)"(.*?)'
         patron += '<img src="(.*?)"'
         matches = re.compile(patron, re.DOTALL).findall(bloque_enlaces)
-
         for scrapedurl, scrapedtitle, extra_info, scrapedthumbnail in matches:
             title = scrapertools.remove_show_from_title(scrapedtitle, "Ver Película")
             title = title.replace("Online", "");
@@ -144,21 +136,14 @@ def menudesta(item):
 # Peliculas de Estreno
 def menuestre(item):
     logger.info(item.url)
-
     itemlist = []
-
     data = httptools.downloadpage(item.url).data.decode('iso-8859-1').encode('utf-8')
     patronenlaces = '<h1>Estrenos</h1>(.*?)</section>'
-    matchesenlaces = re.compile(patronenlaces, re.DOTALL).findall(data)
-
+    matchesenlaces = scrapertools.find_multiple_matches(data, patronenlaces)
     for bloque_enlaces in matchesenlaces:
-
-        # patron = '<a href="([^"]+)" title="([^"]+)"> <div class="poster".*?<img src="([^"]+)"'
-
         patron = '<div class="poster-media-card">.*?'
         patron += '<a href="(.*?)".*?title="(.*?)"(.*?)'
         patron += '<img src="(.*?)"'
-
         matches = re.compile(patron, re.DOTALL).findall(bloque_enlaces)
         for scrapedurl, scrapedtitle, extra_info, scrapedthumbnail in matches:
             title = scrapertools.remove_show_from_title(scrapedtitle, "Ver Película")
@@ -255,32 +240,22 @@ def search(item, texto):
     patron += '<div class="row">.*?'
     patron += '<a href="(.*?)" title="(.*?)">.*?'
     patron += '<img src="(.*?)"'
-
-    logger.info(patron)
-
     matches = re.compile(patron, re.DOTALL).findall(data)
-
     itemlist = []
-
     for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
         title = scrapertools.remove_show_from_title(scrapedtitle, "Ver Película")
         title = title.replace("Online", "")
-        url = item.url + scrapedurl
-        thumbnail = item.url + scrapedthumbnail
-        logger.info(url)
+        url = scrapedurl
+        thumbnail = scrapedthumbnail
         itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url,
                              thumbnail=thumbnail, fanart=thumbnail))
-
     return itemlist
 
 
 def poranyo(item):
     logger.info(item.url)
-
     itemlist = []
-
     data = httptools.downloadpage(item.url).data.decode('iso-8859-1').encode('utf-8')
-
     patron = '<option value="([^"]+)">(.*?)</option>'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for scrapedurl, scrapedtitle in matches:
@@ -289,7 +264,6 @@ def poranyo(item):
         url = item.url + scrapedurl
         itemlist.append(Item(channel=item.channel, action="menupelis", title=title, fulltitle=title, url=url,
                              fanart=item.fanart, extra='year'))
-
     return itemlist
 
 
@@ -300,24 +274,25 @@ def porcateg(item):
     data = httptools.downloadpage(item.url).data.decode('iso-8859-1').encode('utf-8')
     patron = '<li class="cat-item cat-item-3">.*?<a href="([^"]+)" title="([^"]+)">'
     matches = scrapertools.find_multiple_matches(data, patron)
-
+    adult_mode = config.get_setting("adult_mode")
     for scrapedurl, scrapedtitle in matches:
+        if "18" in scrapedtitle and adult_mode == 0:
+            continue
         title = scrapertools.remove_show_from_title(scrapedtitle, "Ver Película")
         title = title.replace("Online", "")
         url = scrapedurl
         logger.info(url)
         # si no esta permitidas categoria adultos, la filtramos
-        extra = title
-        adult_mode = config.get_setting("adult_mode")
+        extra1 = title
         if adult_mode != 0:
             if 'erotic' in scrapedurl:
-                extra = 'adult'
+                extra1 = 'adult'
         else:
-            extra=title
+            extra1=title
 
-        if (extra=='adult' and adult_mode != 0) or extra != 'adult':
+        if (extra1=='adult' and adult_mode != 0) or extra1 != 'adult':
             itemlist.append(Item(channel=item.channel, action="menupelis", title=title, fulltitle=title, url=url,
-                                 fanart=item.fanart, extra = extra))
+                                 fanart=item.fanart, genre = extra1))
 
     return itemlist
 
@@ -338,7 +313,6 @@ def decode(string):
         i += 1
         enc4 = keyStr.index(input[i])
         i += 1
-
         chr1 = (enc1 << 2) | (enc2 >> 4)
         chr2 = ((enc2 & 15) << 4) | (enc3 >> 2)
         chr3 = ((enc3 & 3) << 6) | enc4
@@ -352,4 +326,4 @@ def decode(string):
 
     output = output.decode('utf8')
 
-    return output
\ No newline at end of file
+    return output

From 9c3b3e92569224cf300c0ba2d7c6bd232cb1b6e5 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Fri, 3 Nov 2017 17:54:51 -0500
Subject: [PATCH 09/11] allpeliculas: paginador para colecciones

---
 plugin.video.alfa/channels/allpeliculas.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugin.video.alfa/channels/allpeliculas.py b/plugin.video.alfa/channels/allpeliculas.py
index 6f4ca9e1..86696b83 100644
--- a/plugin.video.alfa/channels/allpeliculas.py
+++ b/plugin.video.alfa/channels/allpeliculas.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import urlparse
-
 from core import httptools
 from core import jsontools
 from core import scrapertools
@@ -59,6 +57,7 @@ def colecciones(item):
         title = scrapedtitle.capitalize() + " (" + scrapedcantidad + ")"
         itemlist.append(Item(channel = item.channel,
                              action = "listado_colecciones",
+                             page = 1,
                              thumbnail = host + scrapedthumbnail,
                              title = title,
                              url = host + scrapedurl
@@ -69,9 +68,10 @@ def colecciones(item):
 def listado_colecciones(item):
     logger.info()
     itemlist = []
+    logger.info("Intel66 %s" %item.tostring())
     data = httptools.downloadpage(item.url).data
     data_url = scrapertools.find_single_match(data, "data_url: '([^']+)")
-    post = "page=1"
+    post = "page=%s" %item.page
     data = httptools.downloadpage(host + data_url, post=post).data
     patron  = 'a href="(/peli[^"]+).*?'
     patron += 'src="([^"]+).*?'
@@ -88,6 +88,16 @@ def listado_colecciones(item):
                              url = host + scrapedurl
                              ))
     tmdb.set_infoLabels(itemlist)
+    item.page += 1
+    post = "page=%s" %item.page
+    data = httptools.downloadpage(host + data_url, post=post).data
+    if len(data) > 50:
+        itemlist.append(Item(channel = item.channel,
+                            action = "listado_colecciones",
+                            title = "Pagina siguiente>>",
+                            page = item.page,
+                            url = item.url
+                            ))
     return itemlist
 
 
@@ -159,6 +169,7 @@ def lista(item):
         params = jsontools.dump(dict_param)
 
     data = httptools.downloadpage(item.url, post=params).data
+    data = data.replace("<mark>","").replace("<\/mark>","")
     dict_data = jsontools.load(data)
 
     for it in dict_data["items"]:
@@ -167,11 +178,12 @@ def lista(item):
         rating = it["imdb"]
         year = it["year"]
         url = host + "pelicula/" + it["slug"]
-        thumb = urlparse.urljoin(host, it["image"])
+        thumb = host + it["image"]
         item.infoLabels['year'] = year
         itemlist.append(item.clone(action="findvideos", title=title, fulltitle=title, url=url, thumbnail=thumb,
                                    plot=plot, context=["buscar_trailer"], contentTitle=title, contentType="movie"))
 
+    scrapertools.printMatches(itemlist)
     try:
         tmdb.set_infoLabels(itemlist, __modo_grafico__)
     except:

From 927310c7c67a4b7e5f5a07e0aadb9a4c9a9b74e7 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 4 Nov 2017 14:58:29 -0500
Subject: [PATCH 10/11] flashx: actualizado

---
 plugin.video.alfa/servers/flashx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py
index 169c0a54..e2191039 100644
--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -46,7 +46,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.info("mfxfxfx1= %s" %js_fxfx)
     logger.info("mfxfxfx2= %s" %pfxfx)
     if pfxfx == "":
-        pfxfx = "f=fail&fxfx=6"
+        pfxfx = "ss=yes&f=fail&fxfx=6"
     coding_url = 'https://www.flashx.tv/flashx.php?%s' %pfxfx
     # {f: 'y', fxfx: '6'}
     flashx_id = scrapertools.find_single_match(data, 'name="id" value="([^"]+)"')

From 2924b6958d71ec51b9defeca4ea4e578e4dab064 Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Sat, 4 Nov 2017 15:01:27 -0500
Subject: [PATCH 11/11] Update allpeliculas.py

---
 plugin.video.alfa/channels/allpeliculas.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin.video.alfa/channels/allpeliculas.py b/plugin.video.alfa/channels/allpeliculas.py
index 86696b83..06175ca6 100644
--- a/plugin.video.alfa/channels/allpeliculas.py
+++ b/plugin.video.alfa/channels/allpeliculas.py
@@ -68,7 +68,6 @@ def colecciones(item):
 def listado_colecciones(item):
     logger.info()
     itemlist = []
-    logger.info("Intel66 %s" %item.tostring())
     data = httptools.downloadpage(item.url).data
     data_url = scrapertools.find_single_match(data, "data_url: '([^']+)")
     post = "page=%s" %item.page
@@ -183,7 +182,6 @@ def lista(item):
         itemlist.append(item.clone(action="findvideos", title=title, fulltitle=title, url=url, thumbnail=thumb,
                                    plot=plot, context=["buscar_trailer"], contentTitle=title, contentType="movie"))
 
-    scrapertools.printMatches(itemlist)
     try:
         tmdb.set_infoLabels(itemlist, __modo_grafico__)
     except: