diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index c75348e0..799a4989 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -18,12 +18,17 @@ resources/media/general/ss/4.jpg [B]Estos son los cambios para esta versión:[/B] - [COLOR green][B]Canales agreados y arreglos[/B][/COLOR] - [I]- cinetux - - bajui2 - - seriesblanco[/I] - - [COLOR blue]Gracias a [COLOR yellow]devalls[/COLOR] y [COLOR yellow]j2331223[/COLOR] por su colaboración en esta versión.[/COLOR] + [COLOR green][B]Canales arreglos[/B][/COLOR] + [I]- yaske + - pelifox + - ver-pelis[/I] + [COLOR green][B]Servidor arreglado[/B][/COLOR] + - gvideo + [COLOR green][B]Novedades y mejoras[/B][/COLOR] + [I] - arreglos internos + - Directos - Nueva sección de canales con enlaces directos: Gvideo y vimeo + - videoteca - problemas con unicode fixed + - compatibilidad con la biblioteca de pelisalacarta[/I] Descripción en Español English summary diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json index 30a42828..42124f56 100755 --- a/plugin.video.alfa/channels/allcalidad.json +++ b/plugin.video.alfa/channels/allcalidad.json @@ -15,6 +15,7 @@ ], "categories": [ "movie", + "direct", "latino" ], "settings": [ diff --git a/plugin.video.alfa/channels/cinetux.json b/plugin.video.alfa/channels/cinetux.json index 5ff1aa3d..582184ab 100755 --- a/plugin.video.alfa/channels/cinetux.json +++ b/plugin.video.alfa/channels/cinetux.json @@ -28,6 +28,7 @@ ], "categories": [ "latino", + "direct", "movie" ], "settings": [ diff --git a/plugin.video.alfa/channels/gvideo.json b/plugin.video.alfa/channels/gvideo.json deleted file mode 100644 index 1df66e72..00000000 --- a/plugin.video.alfa/channels/gvideo.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "active": true, - "changes": [ - { - "date": "18/07/2017", - "description": "Versión incial" - } - ], - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(?s)https://youtube.googleapis.com.*?docid=([^(?:&|\")]+)", - "url": "http://docs.google.com/get_video_info?docid=\\1" - }, - { - "pattern": "(?s)https://drive.google.com/file/d/(.*?)/preview", - "url": "http://docs.google.com/get_video_info?docid=\\1" - } - - ] - }, - "free": true, - "id": "gvideo", - "name": "gvideo", - "settings": [ - { - "default": false, - "enabled": true, - "id": "black_list", - "label": "Incluir en lista negra", - "type": "bool", - "visible": true - }, - { - "default": 0, - "enabled": true, - "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", - "lvalues": [ - "No", - "1", - "2", - "3", - "4", - "5" - ], - "type": "list", - "visible": false - } - ], - "version": 1 -} \ No newline at end of file diff --git a/plugin.video.alfa/channels/peliculasrey.json b/plugin.video.alfa/channels/peliculasrey.json index c727b4c6..bbb3b0af 100755 --- a/plugin.video.alfa/channels/peliculasrey.json +++ b/plugin.video.alfa/channels/peliculasrey.json @@ -18,6 +18,7 @@ } ], "categories": [ + "direct", "movie" ] -} \ No newline at end of file +} diff --git a/plugin.video.alfa/channels/peliscity.json b/plugin.video.alfa/channels/peliscity.json index d899b48e..75a76237 100755 --- a/plugin.video.alfa/channels/peliscity.json +++ b/plugin.video.alfa/channels/peliscity.json @@ -20,6 +20,7 @@ "categories": [ "movie", "latino", + "direct", "VOS" ] -} \ No newline at end of file +} diff --git a/plugin.video.alfa/channels/pelisfox.json b/plugin.video.alfa/channels/pelisfox.json index 210d18e1..c8730240 100755 --- a/plugin.video.alfa/channels/pelisfox.json +++ b/plugin.video.alfa/channels/pelisfox.json @@ -23,6 +23,7 @@ ], "categories": [ "latino", + "direct", "movie" ], "settings": [ @@ -51,4 +52,4 @@ "visible": true } ] -} \ No newline at end of file +} diff --git a/plugin.video.alfa/channels/pelisfox.py b/plugin.video.alfa/channels/pelisfox.py old mode 100755 new mode 100644 index 854bf5c9..a76d7e3b --- a/plugin.video.alfa/channels/pelisfox.py +++ b/plugin.video.alfa/channels/pelisfox.py @@ -9,6 +9,8 @@ from core import logger from core import scrapertools from core import tmdb from core.item import Item +from core import servertools + tgenero = {"Drama": "https://s16.postimg.org/94sia332d/drama.png", u"Accción": "https://s3.postimg.org/y6o9puflv/accion.png", @@ -225,6 +227,7 @@ def findvideos(item): logger.info() itemlist = [] templist = [] + video_list = [] data = httptools.downloadpage(item.url).data data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data) patron = '
  • |\s{2,}', "", data) id = scrapertools.find_single_match(data, 'var _SOURCE =.*?source:(.*?),') @@ -247,24 +250,26 @@ def findvideos(item): sub = sub.replace('\\', '') else: sub = '' - new_url = 'http://iplay.one/api/embed?id=%s&token=8908d9f846&%s' % (id, sub) + new_url = 'https://onevideo.tv/api/player?key=90503e3de26d45e455b55e9dc54f015b3d1d4150&link' \ + '=%s&srt=%s' % (id, sub) data = httptools.downloadpage(new_url).data - patron = 'file":"(.*?)","label":"(.*?)","type":".*?"}' - matches = matches = re.compile(patron, re.DOTALL).findall(data) + url = scrapertools.find_single_match (data, '