Merge pull request #39 from Alfa-beto/Fixes

Fixes Varios

plugin.video.alfa/channels/mundoflv.py

@@ -345,13 +345,13 @@ def temporadas(item):
     itemlist = []
     templist = []
     data = httptools.downloadpage(item.url).data
+    data = data.replace ('"',"'")
     realplot = ''
-    patron = "<button class='classnamer' onclick='javascript: mostrarcapitulos.*?blank'>([^<]+)</button>"
+    patron = "<button class='classnamer' onclick='javascript: mostrarcapitulos.*?blank'>([^<]+)<\/button>"
 
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    serieid = scrapertools.find_single_match(data, 'data-nonce="(.*?)"')
+    serieid = scrapertools.find_single_match(data, "data-nonce='(.*?)'")
-
     item.thumbnail = item.thumbvid
     infoLabels = item.infoLabels
     for scrapedtitle in matches:
@@ -408,6 +408,7 @@ def episodiosxtemp(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
+    data = data.replace('"', "'")
     patron = "<button class='classnamer' onclick='javascript: mostrarenlaces\(([^\)]+)\).*?<"
     matches = re.compile(patron, re.DOTALL).findall(data)
 
@@ -640,7 +641,7 @@ def play(item):
     logger.info()
 
     data = httptools.downloadpage(item.url).data
-    if 'streamplay' not in item.server or 'streame' not in item.server:
+    if item.server not in ['streamplay','streame']:
         url = scrapertools.find_single_match(data, '<(?:IFRAME|iframe).*?(?:SRC|src)=*([^ ]+) (?!style|STYLE)')
     else:
         url = scrapertools.find_single_match(data, '<meta http-equiv="refresh" content="0; url=([^"]+)">')

plugin.video.alfa/channels/tvseriesdk.py

@@ -162,21 +162,24 @@ def findvideos(item):
                'play': 'http://streamplay.to/embed-',
                'vido': 'http://vidoza.net/embed-'}
     data = get_source(item.url)
+    noemitido = scrapertools.find_single_match(data, '<p><img src=(http://darkiller.com/images/subiendo.png) border=0\/><\/p>')
     patron = 'id=tab\d+.*?class=tab_content><script>(.*?)\((.*?)\)<\/script>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for server, video_id in matches:
+    if not noemitido:
-        if server not in ['gamo', 'powvideo', 'play', 'vido', 'netv']:
+        for server, video_id in matches:
-            url = servers[server] + video_id
+            if server not in ['gamo', 'powvideo', 'play', 'vido', 'netv']:
-        elif server == 'netv':
+                url = servers[server] + video_id
-            url = get_source(servers[server] + video_id)
+            elif server == 'netv':
-        else:
+                url = get_source(servers[server] + video_id)
-            url = servers[server] + video_id + '.html'
+            else:
-
+                url = servers[server] + video_id + '.html'
-        itemlist.extend(servertools.find_video_items(data=url))
-    for videoitem in itemlist:
-        videoitem.channel = item.channel
-        videoitem.title = item.title + ' (%s)' % videoitem.server
-        videoitem.action = 'play'
 
+            itemlist.extend(servertools.find_video_items(data=url))
+        for videoitem in itemlist:
+            videoitem.channel = item.channel
+            videoitem.title = item.title + ' (%s)' % videoitem.server
+            videoitem.action = 'play'
+    else:
+        itemlist.append(item.clone(title = 'Este capitulo aun no esta disponible', action='', url=''))
     return itemlist

plugin.video.alfa/channels/ver-peliculas.json

@@ -9,7 +9,6 @@
   "version": 1,
   "categories": [
     "movie",
-    "latino",
+    "latino"
-    "direct"
   ]
 }

plugin.video.alfa/channels/ver-peliculas.py

@@ -15,7 +15,7 @@ from core import servertools
 from core.item import Item
 from platformcode import config, logger
 
-host = "http://ver-peliculas.io/"
+host = "http://ver-peliculas.org/"
 
 
 def mainlist(item):
@@ -156,18 +156,18 @@ def findvideos(item):
 
     data = get_source(item.url)
     video_info = scrapertools.find_single_match(data, "load_player\('(.*?)','(.*?)'\);")
-    movie_info = scrapertools.find_single_match(item.url, 'http:\/\/ver-peliculas\.io\/peliculas\/(\d+)-(.*?)-\d{'
+    movie_info = scrapertools.find_single_match(item.url, 'http:\/\/ver-peliculas\.org\/peliculas\/(\d+)-(.*?)-\d{'
                                                           '4}-online\.')
     movie_id = movie_info[0]
     movie_name = movie_info[1]
     sub = video_info[1]
-    url_base = 'http://ver-peliculas.io/core/api.php?id=%s&slug=%s' % (movie_id, movie_name)
+    url_base = 'http://ver-peliculas.org/core/api.php?id=%s&slug=%s' % (movie_id, movie_name)
     data = httptools.downloadpage(url_base).data
     json_data = jsontools.load(data)
     video_list = json_data['lista']
     itemlist = []
     for videoitem in video_list:
-        video_base_url = 'http://ver-peliculas.io/core/videofinal.php'
+        video_base_url = 'http://ver-peliculas.org/core/videofinal.php'
         if video_list[videoitem] != None:
             video_lang = video_list[videoitem]
             languages = ['latino', 'spanish', 'subtitulos']
@@ -184,12 +184,12 @@ def findvideos(item):
 
                         for video_link in sources:
                             url = video_link['sources']
-                            if 'onevideo' in url:
+                            # if 'onevideo' in url:
-                                data = get_source(url)
+                                # data = get_source(url)
-                                g_urls = servertools.findvideos(data=data)
+                                # g_urls = servertools.findvideos(data=data)
-                                url = g_urls[0][1]
+                                # url = g_urls[0][1]
-                                server = g_urls[0][0]
+                                # server = g_urls[0][0]
-                            if url not in duplicated:
+                            if url not in duplicated and server!='drive':
                                 lang = lang.capitalize()
                                 if lang == 'Spanish':
                                     lang = 'Español'

plugin.video.alfa/servers/streamplay.py

@@ -26,12 +26,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     referer = re.sub(r"embed-|player-", "", page_url)[:-5]
     data = httptools.downloadpage(page_url, headers={'Referer': referer}).data
 
-    for list in scrapertools.find_multiple_matches(data, '_[^=]+=(\[[^\]]+\]);'):
+
-        if len(list) == 703 or len(list) == 711:
-            key = "".join(eval(list)[7:9])
-            break
-    if key.startswith("embed"):
-        key = key[6:] + key[:6]
     matches = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
     data = jsunpack.unpack(matches).replace("\\", "")
 
@@ -40,7 +35,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     video_urls = []
     for video_url in matches:
         _hash = scrapertools.find_single_match(video_url, '[A-z0-9\_\-]{40,}')
-        hash = decrypt(_hash, key)
+        hash = _hash[::-1]
+        hash = hash.replace(hash[2:3],"",1)
         video_url = video_url.replace(_hash, hash)
 
         filename = scrapertools.get_filename_from_url(video_url)[-4:]