Merge pull request #122 from Intel11/ultimo

Actualizados
2017-10-04 23:16:45 +02:00
parent 08d9361f8c 1dd0479b3e
commit 3e37b2a367
7 changed files with 31 additions and 27 deletions
--- a/plugin.video.alfa/channels/allcalidad.py
+++ b/plugin.video.alfa/channels/allcalidad.py
@@ -94,8 +94,9 @@ def peliculas(item):
        idioma = scrapertools.find_single_match(varios, '(?s)Idioma.*?kinopoisk">([^<]+)')
        year = scrapertools.find_single_match(varios, 'Año.*?kinopoisk">([^<]+)')
        year = scrapertools.find_single_match(year, '[0-9]{4}')
-        mtitulo = titulo + " (" + idioma + ") (" + year + ")"
+        mtitulo = titulo + " (" + idioma + ")"
        if year:
+            mtitulo += " (" + year + ")"
            item.infoLabels['year'] = int(year)
        itemlist.append(item.clone(channel = item.channel,
                                   action = "findvideos",
@@ -107,9 +108,8 @@ def peliculas(item):
                                   contentType="movie",
                                   language = idioma
                                   ))
-    tmdb.set_infoLabels(itemlist, True)
-    url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)')
    tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
+    url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)')
    if url_pagina != "":
        pagina = "Pagina: " + scrapertools.find_single_match(url_pagina, "page/([0-9]+)")
        itemlist.append(Item(channel = item.channel, action = "peliculas", title = pagina, url = url_pagina))
@@ -138,7 +138,7 @@ def findvideos(item):
                 title = titulo,
                 url = url
                 ))
-    tmdb.set_infoLabels(itemlist, True)
+    tmdb.set_infoLabels(itemlist, __modo_grafico__)
    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
    if itemlist:
        itemlist.append(Item(channel = item.channel))
@@ -148,7 +148,8 @@ def findvideos(item):
        if item.extra != "library":
            if config.get_videolibrary_support():
                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
-                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail
+                                     action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                                     fulltitle = item.fulltitle
                                     ))
    return itemlist

--- a/plugin.video.alfa/channels/allpeliculas.py
+++ b/plugin.video.alfa/channels/allpeliculas.py
@@ -82,6 +82,7 @@ def findvideos(item):
    if config.get_videolibrary_support():
        itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
                             action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail,
+                             fulltitle = item.fulltitle
                             ))
    return itemlist

--- a/plugin.video.alfa/channels/cinetux.py
+++ b/plugin.video.alfa/channels/cinetux.py
@@ -7,7 +7,7 @@ from core import tmdb
 from core.item import Item
 from platformcode import config, logger

-CHANNEL_HOST = "http://www.cinetux.net/"
+CHANNEL_HOST = "http://www.cinetux.io/"

 # Configuracion del canal
 __modo_grafico__ = config.get_setting('modo_grafico', 'cinetux')
@@ -36,7 +36,7 @@ def mainlist(item):
                               thumbnail="https://raw.githubusercontent.com/master-1970/resources/master/images/genres"
                                         "/0/Directors%20Chair.png",
                               text_color=color1))
-    itemlist.append(item.clone(action="destacadas", title="      Destacadas", url="http://www.cinetux.net/mas-vistos/",
+    itemlist.append(item.clone(action="destacadas", title="      Destacadas", url=CHANNEL_HOST + "mas-vistos/",
                               thumbnail="https://raw.githubusercontent.com/master-1970/resources/master/images/genres"
                                         "/0/Favorites.png",
                               text_color=color1))
@@ -69,7 +69,7 @@ def configuracion(item):

 def search(item, texto):
    logger.info()
-    item.url = "http://www.cinetux.net/?s="
+    item.url = CHANNEL_HOST + "?s="
    texto = texto.replace(" ", "+")
    item.url = item.url + texto
    try:
@@ -147,7 +147,7 @@ def peliculas(item):
            scrapedtitle += "  [%s]" % quality
        new_item = item.clone(action="findvideos", title=scrapedtitle, fulltitle=fulltitle,
                              url=scrapedurl, thumbnail=scrapedthumbnail,
-                              contentTitle=fulltitle, contentType="movie", quality=quality)
+                              contentType="movie", quality=quality)
        if year:
            new_item.infoLabels['year'] = int(year)
        itemlist.append(new_item)
@@ -177,11 +177,11 @@ def destacadas(item):
    patron += '.*?src="([^"]+)'
    matches = scrapertools.find_multiple_matches(bloque, patron)
    for scrapedtitle, scrapedurl, scrapedthumbnail in matches:
-        scrapedurl = "http://www.cinetux.net" + scrapedurl
+        scrapedurl = CHANNEL_HOST + scrapedurl
        scrapedtitle = scrapedtitle.replace("Ver ", "")
        new_item = item.clone(action="findvideos", title=scrapedtitle, fulltitle=scrapedtitle,
                              url=scrapedurl, thumbnail=scrapedthumbnail,
-                              contentTitle=scrapedtitle, contentType="movie")
+                              contentType="movie")
        itemlist.append(new_item)

    # Extrae el paginador
@@ -241,14 +241,7 @@ def findvideos(item):
    data = httptools.downloadpage(item.url).data
    year = scrapertools.find_single_match(item.title, "\(([0-9]+)")

-    if year and item.extra != "library":
-        item.infoLabels['year'] = int(year)
-        # Ampliamos datos en tmdb
-        if not item.infoLabels['plot']:
-            try:
-                tmdb.set_infoLabels(item, __modo_grafico__)
-            except:
-                pass
+    tmdb.set_infoLabels(item, __modo_grafico__)

    if not item.infoLabels.get('plot'):
        plot = scrapertools.find_single_match(data, '<div class="sinopsis"><p>(.*?)</p>')
@@ -274,7 +267,7 @@ def findvideos(item):
        if item.extra != "library":
            if config.get_videolibrary_support():
                itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green",
-                                     action="add_pelicula_to_library", url=item.url
+                                     action="add_pelicula_to_library", url=item.url, fulltitle = item.fulltitle
                                     ))

    else:
--- a/plugin.video.alfa/channels/playmax.json
+++ b/plugin.video.alfa/channels/playmax.json
@@ -63,6 +63,14 @@
      "enabled": true,
      "visible": true
    },
+    {
+      "id": "include_in_newest_infantiles",
+      "type": "bool",
+      "label": "Incluir en Novedades - Infantiles",
+      "default": false,
+      "enabled": true,
+      "visible": true
+    },
    {
      "id": "include_in_newest_series",
      "type": "bool",
--- a/plugin.video.alfa/channels/playmax.py
+++ b/plugin.video.alfa/channels/playmax.py
@@ -211,7 +211,7 @@ def newest(categoria):
        elif categoria == 'infantiles':
            item.channel = "playmax"
            item.extra = "newest"
-            item.url = host + "/catalogo.php?tipo[]=2&genero[]=60&ad=2&ordenar=novedades&con_dis=on"
+            item.url = host + "/catalogo.php?tipo[]=2&generos[]=60&ad=2&ordenar=novedades&con_dis=on"
            item.contentType = "movie"
            itemlist = fichas(item)

--- a/plugin.video.alfa/servers/flashx.py
+++ b/plugin.video.alfa/servers/flashx.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-

-import base64
 import os
 import time
 import urllib
@@ -37,17 +36,18 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
    flashx_id = scrapertools.find_single_match(data, 'name="id" value="([^"]+)"')
    fname = scrapertools.find_single_match(data, 'name="fname" value="([^"]+)"')
    hash_f = scrapertools.find_single_match(data, 'name="hash" value="([^"]+)"')
-    post = 'op=download1&usr_login=&id=%s&fname=%s&referer=&hash=%s&imhuman=Proceed to the video' % (
-        flashx_id, urllib.quote(fname), hash_f)
+    imhuman = scrapertools.find_single_match(data, "value='([^']+)' name='imhuman'")
+    post = 'op=download1&usr_login=&id=%s&fname=%s&referer=&hash=%s&imhuman=%s' % (
+        flashx_id, urllib.quote(fname), hash_f, imhuman)
    wait_time = scrapertools.find_single_match(data, "<span id='xxc2'>(\d+)")

    headers['Referer'] = "https://www.flashx.tv/"
    headers['Accept'] = "*/*"
    headers['Host'] = "www.flashx.tv"

-    coding_url = 'https://www.flashx.tv/flashx.php?fxfx=5'
+    coding_url = 'https://www.flashx.tv/flashx.php?fxfx=7'
    headers['X-Requested-With'] = 'XMLHttpRequest'
-    httptools.downloadpage(coding_url, headers=headers, replace_headers=True)
+    httptools.downloadpage(coding_url, headers=headers)

    try:
        time.sleep(int(wait_time) + 1)
--- a/plugin.video.alfa/servers/gvideo.py
+++ b/plugin.video.alfa/servers/gvideo.py
@@ -18,6 +18,8 @@ def test_video_exists(page_url):
        return False, "[gvideo] Se ha excedido el número de reproducciones permitidas"
    if "No+tienes+permiso" in response.data:
        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"

    return True, ""

@@ -43,7 +45,6 @@ def get_video_url(page_url, user="", password="", video_password=""):
            cookies += c.split(";", 1)[0] + "; "
        data = response.data.decode('unicode-escape')
        data = urllib.unquote_plus(urllib.unquote_plus(data))
-        logger.info("Intel88 %s" %data)
        headers_string = "|Cookie=" + cookies
        url_streams = scrapertools.find_single_match(data, 'url_encoded_fmt_stream_map=(.*)')
        streams = scrapertools.find_multiple_matches(url_streams,