Merge remote-tracking branch 'alfa-addon/master' into Fixes

plugin.video.alfa/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.alfa" name="Alfa" version="2.3.0" provider-name="Alfa Addon">
+<addon id="plugin.video.alfa" name="Alfa" version="2.3.1" provider-name="Alfa Addon">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
@@ -19,15 +19,10 @@
     </assets>
       <news>[B]Estos son los cambios para esta versión:[/B]
       [COLOR green][B]Canales agregados y arreglos[/B][/COLOR]
-      » cartoonlatino       »          serieslan
-      » pelisplus               »           pedropolis
-      » flashx                    »           cinetux
-      » animeflv_ru          »           streamixcloud
-      » estrenosgo           »           animemovil
-      » allpeliculas            »           pelismundo
+      » ohlatino       »          animemovil
+      » pelisplus      »          flashx
       ¤ arreglos internos
-      [COLOR green]Gracias a [COLOR yellow]Danielr460[/COLOR] por su colaboración en esta versión[/COLOR]
-      </news>
+     </news>
     <description lang="es">Navega con Kodi por páginas web para ver sus videos de manera fácil.</description>
     <summary lang="en">Browse web pages using Kodi</summary>
     <description lang="en">Browse web pages using Kodi, you can easily watch their video content.</description>

plugin.video.alfa/channels/animemovil.py

@@ -138,7 +138,7 @@ def listado(item):
 
         itemlist.append(item.clone(action=action, title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
                                    contentTitle=title, contentSerieName=show, infoLabels=infoLabels,
-                                   context=renumbertools.context, contentType=tipo))
+                                   context=renumbertools.context(item), contentType=tipo))
             
     
     try:
@@ -205,7 +205,7 @@ def completo(item):
         infoLabels = {'filtro': {"original_language": "ja"}.items()}
         itemlist.append(Item(channel=item.channel, action=action, title=scrapedtitle, url=url, thumbnail=thumb,
                              text_color=color3, contentTitle=title, contentSerieName=show, extra="completo",
-                             context=renumbertools.context, contentType=tipo, infoLabels=infoLabels))
+                             context=renumbertools.context(item), contentType=tipo, infoLabels=infoLabels))
 
     return itemlist
 
@@ -227,7 +227,7 @@ def episodios(item):
     for url, title in matches:
         url = host + url
         epi = scrapertools.find_single_match(title, '(?i)%s.*? (\d+) (?:Sub|Audio|Español)' % item.contentSerieName)
-        new_item = item.clone(action="findvideos", url=url, title=title, extra="", context=renumbertools.context)
+        new_item = item.clone(action="findvideos", url=url, title=title, extra="")
         if epi:
             season, episode = renumbertools.numbered_for_tratk(
                 item.channel, show, 1, int(epi))
@@ -301,7 +301,7 @@ def emision(item):
             infoLabels = {'filtro': {"original_language": "ja"}.items()}
             itemlist.append(item.clone(action="episodios", title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3,
                                        contentTitle=title, contentSerieName=title, extra="recientes",
-                                       context=renumbertools.context, infoLabels=infoLabels))
+                                       context=renumbertools.context(item), infoLabels=infoLabels))
 
     return itemlist
 

plugin.video.alfa/servers/flashx.py

@@ -33,11 +33,11 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
                'Cookie': ''}
     data = httptools.downloadpage(page_url, headers=headers, replace_headers=True).data
     data = data.replace("\n","")
-    cgi_counter = scrapertools.find_single_match(data, '(?s)SRC="(https://www.flashx.tv/counter.cgi\?fx=[^"]+)')
+    cgi_counter = scrapertools.find_single_match(data, '(?is)src=.(https://www.flashx.tv/counter.cgi.*?fx=[0-9a-zA-Z=]+)')
     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 = scrapertools.find_single_match(data, 'src="(https://www.flashx.tv/js/code.js.*?cache=[0-9]+)')
+    js_fxfx = scrapertools.find_single_match(data, '(?is)src=.(https://www.flashx.tv/js/code.js.*?=[0-9]+)')
     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+)')