From e4b1139b847d06f37f6ed5c68202e6109d9c9198 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 5 Oct 2017 17:11:43 -0500 Subject: [PATCH 01/20] Actualizado gamovideo: fix --- plugin.video.alfa/servers/gamovideo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py index 5e378be7..715836ca 100755 --- a/plugin.video.alfa/servers/gamovideo.py +++ b/plugin.video.alfa/servers/gamovideo.py @@ -7,7 +7,7 @@ from core import scrapertools from lib import jsunpack from platformcode import logger -headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0'} +headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 Firefox/40.0'} def test_video_exists(page_url): From 4c5315150fe990bb99ab6e9428a7aa7c0efde1be Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 5 Oct 2017 17:28:57 -0500 Subject: [PATCH 02/20] Update channelselector.py --- plugin.video.alfa/channelselector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channelselector.py b/plugin.video.alfa/channelselector.py index 0c056767..b39534aa 100644 --- a/plugin.video.alfa/channelselector.py +++ b/plugin.video.alfa/channelselector.py @@ -202,7 +202,7 @@ def filterchannels(category, view="thumb_"): def get_thumb(thumb_name, view="thumb_"): - icon_pack_name = config.get_setting('icon_set') + icon_pack_name = config.get_setting('icon_set', default="default") if icon_pack_name == "default": resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes") else: From 73ad5d6a046bd95195608c6bc850520572be69a6 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 5 Oct 2017 17:30:59 -0500 Subject: [PATCH 03/20] Update keymaptools.py --- plugin.video.alfa/platformcode/keymaptools.py | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/plugin.video.alfa/platformcode/keymaptools.py b/plugin.video.alfa/platformcode/keymaptools.py index 5d6ecbf2..d65939ae 100644 --- a/plugin.video.alfa/platformcode/keymaptools.py +++ b/plugin.video.alfa/platformcode/keymaptools.py @@ -5,7 +5,7 @@ from threading import Timer import xbmc import xbmcaddon import xbmcgui -from core import filetools +from channelselector import get_thumb from platformcode import config @@ -82,27 +82,13 @@ def set_key(): MAIN_MENU = { - "news": {"label": "Novedades", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_news.png"), "order": 0}, - "channels": {"label": "Canales", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_channels.png"), "order": 1}, - "search": {"label": "Buscador", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_search.png"), "order": 2}, - "favorites": {"label": "Favoritos", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_favorites.png"), "order": 3}, - "videolibrary": {"label": "Videoteca", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_videolibrary.png"), "order": 4}, - "downloads": {"label": "Descargas", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_downloads.png"), "order": 5}, - "settings": {"label": "Configuración", - "icon": filetools.join(config.get_runtime_path(), "resources", "media", "general", "default", - "thumb_setting_0.png"), "order": 6}, + "news": {"label": "Novedades", "icon": get_thumb("news.png"), "order": 0}, + "channels": {"label": "Canales", "icon": get_thumb("channels.png"), "order": 1}, + "search": {"label": "Buscador", "icon": get_thumb("search.png"), "order": 2}, + "favorites": {"label": "Favoritos", "icon": get_thumb("favorites.png"), "order": 3}, + "videolibrary": {"label": "Videoteca", "icon": get_thumb("videolibrary.png"), "order": 4}, + "downloads": {"label": "Descargas", "icon": get_thumb("downloads.png"), "order": 5}, + "settings": {"label": "Configuración", "icon": get_thumb("setting_0.png"), "order": 6} } From 5ac00398decd92a0fba12d51c6b07d39710a03a6 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 6 Oct 2017 10:03:55 -0500 Subject: [PATCH 04/20] Update peliculasrey.py --- plugin.video.alfa/channels/peliculasrey.py | 161 ++++++--------------- 1 file changed, 48 insertions(+), 113 deletions(-) diff --git a/plugin.video.alfa/channels/peliculasrey.py b/plugin.video.alfa/channels/peliculasrey.py index bcaa5abd..ebd7c362 100755 --- a/plugin.video.alfa/channels/peliculasrey.py +++ b/plugin.video.alfa/channels/peliculasrey.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- import re -import urlparse from core import httptools from core import scrapertools from core import servertools +from core import tmdb from core.item import Item from platformcode import logger, config @@ -16,117 +16,54 @@ def mainlist(item): itemlist = [] itemlist.append(Item(channel=item.channel, action="peliculas", title="Recientes", url=host)) - itemlist.append(Item(channel=item.channel, action="PorFecha", title="Año de Lanzamiento", url=host)) - itemlist.append(Item(channel=item.channel, action="Idiomas", title="Idiomas", url=host)) - itemlist.append(Item(channel=item.channel, action="calidades", title="Por calidad", url=host)) - itemlist.append(Item(channel=item.channel, action="generos", title="Por género", url=host)) + itemlist.append(Item(channel = item.channel, + action = "filtro", + title = "Año de Lanzamiento", + category = "lanzamiento" + )) + itemlist.append(Item(channel = item.channel, + action = "filtro", + title = "Idiomas", + category = "idioma" + )) + itemlist.append(Item(channel = item.channel, + action = "filtro", + title = "Por calidad", + category = "calidades" + )) + itemlist.append(Item(channel = item.channel, + action = "filtro", + title = "Por género", + category = "generos" + )) itemlist.append(Item(channel=item.channel, action="search", title="Buscar...", url=host)) return itemlist -def PorFecha(item): - logger.info() - - # Descarga la pagina - data = httptools.downloadpage(item.url).data - data = scrapertools.find_single_match(data, '
(.*?)
') - - # Extrae las entradas (carpetas) - patron = '(.*?)') - - # Extrae las entradas (carpetas) - patron = '(.*?)') - - # Extrae las entradas (carpetas) - patron = '(.*?)') - patron = '(.*?)') patron = '([^ Date: Fri, 6 Oct 2017 10:42:05 -0500 Subject: [PATCH 05/20] Update peliscity.py --- plugin.video.alfa/channels/peliscity.py | 35 +++++++++++-------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/plugin.video.alfa/channels/peliscity.py b/plugin.video.alfa/channels/peliscity.py index 78a924df..fa64ef07 100755 --- a/plugin.video.alfa/channels/peliscity.py +++ b/plugin.video.alfa/channels/peliscity.py @@ -5,6 +5,7 @@ import re from core import httptools from core import scrapertools from core import servertools +from core import tmdb from core.item import Item from platformcode import config, logger @@ -58,7 +59,7 @@ def porGenero(item): patron = 'cat-item.*?href="([^"]+).*?>(.*?)<.*?span>([^<]+)' - matches = re.compile(patron, re.DOTALL).findall(data) + matches = scrapertools.find_multiple_matches(data, patron) for urlgen, genero, cantidad in matches: cantidad = cantidad.replace(".", "") @@ -103,7 +104,6 @@ def agregadas(item): title = info[3] plot = info[4] year = info[5].strip() - itemlist.append(Item(channel=item.channel, action='findvideos', contentType = "movie", @@ -116,15 +116,11 @@ def agregadas(item): contentTitle = title, url=url )) - # Paginación - try: - next_page = scrapertools.find_single_match(data,'tima>.*?href=(.*?) >.*?href=(.*?) > (.*?)

' - matches = re.compile(patron, re.DOTALL).findall(data) + matches = scrapertools.find_multiple_matches(data, patron) for url, thumbnail, title, sinopsis in matches: itemlist.append(Item(channel=item.channel, action="findvideos", title=title + " ", fulltitle=title, url=url, @@ -157,7 +151,7 @@ def findvideos(item): # Descarga la pagina data = httptools.downloadpage(item.url).data patron = 'cursor: hand" rel="(.*?)".*?class="optxt">(.*?)<.*?width.*?class="q">(.*?) Date: Fri, 6 Oct 2017 10:55:58 -0500 Subject: [PATCH 06/20] Update cloudy.json --- plugin.video.alfa/servers/cloudy.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin.video.alfa/servers/cloudy.json b/plugin.video.alfa/servers/cloudy.json index a0d0f523..cd539545 100755 --- a/plugin.video.alfa/servers/cloudy.json +++ b/plugin.video.alfa/servers/cloudy.json @@ -48,5 +48,6 @@ "visible": false } ], + "thumbnail": "https://s1.postimg.org/9e6doboo2n/cloudy1.png", "version": 1 } From 09b6a4a2d6e3a420e050b0afead6c6da93009941 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 6 Oct 2017 11:03:39 -0500 Subject: [PATCH 07/20] Update yourupload.json --- plugin.video.alfa/servers/yourupload.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/yourupload.json b/plugin.video.alfa/servers/yourupload.json index 401b7947..7e660487 100755 --- a/plugin.video.alfa/servers/yourupload.json +++ b/plugin.video.alfa/servers/yourupload.json @@ -58,5 +58,6 @@ "visible": false } ], + "thumbnail" : "https://s1.postimg.org/4wje61el4f/yourupload1.png", "version": 1 -} \ No newline at end of file +} From 97eb675083c8e4fae6379a92d9b096ac4acd0668 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 6 Oct 2017 12:46:48 -0500 Subject: [PATCH 08/20] Update hdfull.py --- plugin.video.alfa/channels/hdfull.py | 38 ++++------------------------ 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index bc2d90af..3ab8b367 100644 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -709,12 +709,11 @@ def findvideos(item): itemlist.extend(enlaces) ## 2 = película if type == "2" and item.category != "Cine": - ## STRM para todos los enlaces de servidores disponibles - ## Si no existe el archivo STRM de la peícula muestra el item ">> Añadir a la videoteca..." - try: - itemlist.extend(file_cine_library(item, url_targets)) - except: - pass + 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=url_targets, thumbnail = item.thumbnail, + fulltitle = item.contentTitle + )) return itemlist @@ -736,33 +735,6 @@ def trailer(item): return itemlist -def file_cine_library(item, url_targets): - import os - from core import filetools - videolibrarypath = os.path.join(config.get_videolibrary_path(), "CINE") - archivo = item.show.strip() - strmfile = archivo + ".strm" - strmfilepath = filetools.join(videolibrarypath, strmfile) - - if not os.path.exists(strmfilepath): - itemlist = [] - itemlist.append(Item(channel=item.channel, title=">> Añadir a la videoteca...", url=url_targets, - action="add_file_cine_library", extra="episodios", show=archivo)) - - return itemlist - - -def add_file_cine_library(item): - from core import videolibrarytools - new_item = item.clone(title=item.show, action="play_from_library") - videolibrarytools.save_movie(new_item) - itemlist = [] - itemlist.append(Item(title='El vídeo ' + item.show + ' se ha añadido a la videoteca')) - # xbmctools.renderItems(itemlist, "", "", "") - platformtools.render_items(itemlist, "") - - return - def play(item): if "###" in item.url: From ac4d588d34000fcaf015db1cfc889b385b61facf Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 6 Oct 2017 17:59:35 -0500 Subject: [PATCH 09/20] Update hdfull.py --- plugin.video.alfa/channels/hdfull.py | 47 +++++++++++----------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index 3ab8b367..a3b2ccfa 100644 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -676,37 +676,27 @@ def findvideos(item): matches.append([match["lang"], match["quality"], url, embed]) - enlaces = [] for idioma, calidad, url, embed in matches: - servername = scrapertools.find_single_match(url, "(?:http:|https:)//(?:www.|)([^.]+).") - if servername == "streamin": servername = "streaminto" - if servername == "waaw": servername = "netutv" - if servername == "uploaded" or servername == "ul": servername = "uploadedto" mostrar_server = True - if config.get_setting("hidepremium") == True: - mostrar_server = servertools.is_server_enabled(servername) - if mostrar_server: - option = "Ver" - if re.search(r'return ([\'"]{2,}|\})', embed): - option = "Descargar" - calidad = unicode(calidad, "utf8").upper().encode("utf8") - servername_c = unicode(servername, "utf8").capitalize().encode("utf8") - title = option + ": " + servername_c + " (" + calidad + ")" + " (" + idioma + ")" - thumbnail = item.thumbnail - plot = item.title + "\n\n" + scrapertools.find_single_match(data, - ' Date: Sat, 7 Oct 2017 08:48:04 -0500 Subject: [PATCH 10/20] Update streamplay.json --- plugin.video.alfa/servers/streamplay.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/streamplay.json b/plugin.video.alfa/servers/streamplay.json index 2867247d..f04ab61a 100755 --- a/plugin.video.alfa/servers/streamplay.json +++ b/plugin.video.alfa/servers/streamplay.json @@ -68,5 +68,6 @@ "visible": false } ], + "thumbnail": "https://s1.postimg.org/912d5vxmv3/streamplay1.png", "version": 1 -} \ No newline at end of file +} From ed2ea608cb0abb38c7f2ed2a5a5a521b883a4a11 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sat, 7 Oct 2017 09:13:16 -0500 Subject: [PATCH 11/20] Update rapidgator.json --- plugin.video.alfa/servers/rapidgator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/servers/rapidgator.json b/plugin.video.alfa/servers/rapidgator.json index 880c7df2..5b2e5a89 100755 --- a/plugin.video.alfa/servers/rapidgator.json +++ b/plugin.video.alfa/servers/rapidgator.json @@ -10,7 +10,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "(rapidgator.net/file/.*?(?:\\.html))", + "pattern": "(rapidgator.net/file/\\w+(?:\\.html|))", "url": "http://\\1" } ] @@ -50,4 +50,4 @@ ], "thumbnail": "server_rapidgator.png", "version": 1 -} \ No newline at end of file +} From ed90af9905d7e9b8b3766f2009be39af98467085 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sat, 7 Oct 2017 09:28:31 -0500 Subject: [PATCH 12/20] Update hdfull.py --- plugin.video.alfa/channels/hdfull.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index a3b2ccfa..76b6375f 100644 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -634,7 +634,7 @@ def findvideos(item): title_label = bbcode_kodi2html(" ( [COLOR green][B]Tráiler[/B][/COLOR] )") itemlist.append( - Item(channel=item.channel, action="trailer", title=title_label, fulltitle=title_label, url=url_targets, + Item(channel=item.channel, action="buscartrailer", title=title_label, fulltitle=title_label, url=url_targets, thumbnail=item.thumbnail, show=item.show)) itemlist.append(Item(channel=item.channel, action="set_status", title=title, fulltitle=title, url=url_targets, @@ -697,6 +697,7 @@ def findvideos(item): contentTitle=item.contentTitle, contentType=item.contentType, tipo=option)) itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + itemlist.sort(key=lambda it: it.title, reverse=True) ## 2 = película if type == "2" and item.category != "Cine": if config.get_videolibrary_support(): @@ -708,23 +709,6 @@ def findvideos(item): return itemlist -def trailer(item): - import youtube - itemlist = [] - item.url = "https://www.googleapis.com/youtube/v3/search" + \ - "?q=" + item.show.replace(" ", "+") + "+trailer+HD+Español" \ - "®ionCode=ES" + \ - "&part=snippet" + \ - "&hl=es_ES" + \ - "&key=AIzaSyAd-YEOqZz9nXVzGtn3KWzYLbLaajhqIDA" + \ - "&type=video" + \ - "&maxResults=50" + \ - "&pageToken=" - itemlist.extend(youtube.fichas(item)) - # itemlist.pop(-1) - return itemlist - - def play(item): if "###" in item.url: @@ -747,9 +731,6 @@ def play(item): return [item] -## -------------------------------------------------------------------------------- -## -------------------------------------------------------------------------------- - def agrupa_datos(data): ## Agrupa los datos data = re.sub(r'\n|\r|\t| |
|', '', data) From 6d950aedefa17a7ce107ae4e80e5e80de1237754 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sat, 7 Oct 2017 12:21:21 -0500 Subject: [PATCH 13/20] Update pordede.json --- plugin.video.alfa/channels/pordede.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/pordede.json b/plugin.video.alfa/channels/pordede.json index a99cd21e..ad1e3a24 100755 --- a/plugin.video.alfa/channels/pordede.json +++ b/plugin.video.alfa/channels/pordede.json @@ -1,7 +1,7 @@ { "id": "pordede", "name": "Pordede", - "active": true, + "active": false, "adult": false, "language": ["cast"], "thumbnail": "pordede.png", @@ -105,4 +105,4 @@ ] } ] -} \ No newline at end of file +} From 34011ecc776bdee0e08ae5382a99d0dd28e19f3f Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 8 Oct 2017 10:12:11 -0500 Subject: [PATCH 14/20] Update animeflv_me.py --- plugin.video.alfa/channels/animeflv_me.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin.video.alfa/channels/animeflv_me.py b/plugin.video.alfa/channels/animeflv_me.py index 71b18b3b..b73b174f 100755 --- a/plugin.video.alfa/channels/animeflv_me.py +++ b/plugin.video.alfa/channels/animeflv_me.py @@ -21,12 +21,12 @@ CHANNEL_DEFAULT_HEADERS = [ REGEX_NEXT_PAGE = r"class='current'>\d+?
  • )(.+?)(?:)' -REGEX_THUMB = r'src="(http://media.animeflv\.me/uploads/thumbs/[^"]+?)"' +REGEX_THUMB = r'src="(http://media.animeflv\.co/uploads/thumbs/[^"]+?)"' REGEX_PLOT = r'Línea de historia:

    (.*?)' -REGEX_URL = r'href="(http://animeflv\.me/Anime/[^"]+)">' +REGEX_URL = r'href="(http://animeflv\.co/Anime/[^"]+)">' REGEX_SERIE = r'%s.+?%s([^<]+?)

    (.+?)

    ' % (REGEX_THUMB, REGEX_URL) -REGEX_EPISODE = r'href="(http://animeflv\.me/Ver/[^"]+?)">(?:)?(.+?)(\d+/\d+/\d+)' -REGEX_GENERO = r'([^<]+)' +REGEX_EPISODE = r'href="(http://animeflv\.co/Ver/[^"]+?)">(?:)?(.+?)(\d+/\d+/\d+)' +REGEX_GENERO = r'([^<]+)' def get_url_contents(url): @@ -309,7 +309,7 @@ def findvideos(item): itemlist = [] page_html = get_url_contents(item.url) - regex_api = r'http://player\.animeflv\.me/[^\"]+' + regex_api = r'http://player\.animeflv\.co/[^\"]+' iframe_url = scrapertools.find_single_match(page_html, regex_api) iframe_html = get_url_contents(iframe_url) From 48522010660a5142b04246e8ac9d8c8aaee4e534 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 9 Oct 2017 09:27:32 -0500 Subject: [PATCH 15/20] Update gmobi.py --- plugin.video.alfa/channels/gmobi.py | 76 ++++++++++++++++++----------- 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/plugin.video.alfa/channels/gmobi.py b/plugin.video.alfa/channels/gmobi.py index b768f4af..ebe6145e 100644 --- a/plugin.video.alfa/channels/gmobi.py +++ b/plugin.video.alfa/channels/gmobi.py @@ -3,24 +3,21 @@ # Alfa # ------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re from core import httptools -from core import tmdb -from core import jsontools as json from core import scrapertools from core import servertools +from core import tmdb from core.item import Item -from platformcode import config, logger - +from platformcode import logger def mainlist(item): logger.info() - itemlist = [] + itemlist = list() itemlist.append(item.clone(title="Novedades", action="peliculas", url="http://gnula.mobi/")) itemlist.append(item.clone(title="Castellano", action="peliculas", - url="http://www.gnula.mobi/tag/esp)anol/")) + url="http://www.gnula.mobi/tag/espanol/")) itemlist.append(item.clone(title="Latino", action="peliculas", url="http://gnula.mobi/tag/latino/")) itemlist.append(item.clone(title="VOSE", action="peliculas", url="http://gnula.mobi/tag/subtitulada/")) @@ -53,43 +50,66 @@ def sub_search(item): patron = '
    .*?.*?') if paginacion: - itemlist.append(channel=item.channel, action="sub_search", title="Next page >>" , url=paginacion) + itemlist.append(Item(channel=item.channel, action="sub_search", title="Next page >>", url=paginacion)) return itemlist + def peliculas(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t| |
    ", "", data) - patron = '
    .*?href="(.*?)" title="(.*?)".*?under-title">(.*?)<.*?src="(.*?)"' - matches = re.compile(patron,re.DOTALL).findall(data) - + patron = '
    .*?href="(.*?)" title="(.*?)".*?under-title">(.*?)<.*?src="(.*?)"' + matches = scrapertools.find_multiple_matches(data, patron) for scrapedurl, scrapedyear, scrapedtitle, scrapedthumbnail in matches: - - url = scrapedurl - title = scrapedtitle year = scrapertools.find_single_match(scrapedyear, r'.*?\((\d{4})\)') - thumbnail = scrapedthumbnail - new_item =Item (channel = item.channel, action="findvideos", title=title, contentTitle=title, url=url, - thumbnail=thumbnail, infoLabels = {'year':year}) - if year: - tmdb.set_infoLabels_item(new_item) + itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, fulltitle = scrapedtitle, url=scrapedurl, + thumbnail=scrapedthumbnail, infoLabels={'year': year})) - itemlist.append(new_item) - - next_page_url = scrapertools.find_single_match(data,'') - if next_page_url!="": - next_page_url = urlparse.urljoin(item.url,next_page_url) + tmdb.set_infoLabels(itemlist, True) + next_page_url = scrapertools.find_single_match(data, ' Date: Mon, 9 Oct 2017 09:28:29 -0500 Subject: [PATCH 16/20] Update bitp.json --- plugin.video.alfa/servers/bitp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/bitp.json b/plugin.video.alfa/servers/bitp.json index aeb7c8be..dd570cf3 100644 --- a/plugin.video.alfa/servers/bitp.json +++ b/plugin.video.alfa/servers/bitp.json @@ -10,7 +10,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "https://www.bitporno.com/e/([A-z0-9]+)", + "pattern": "https://www.bitporno.com/(?:e|embed)/([A-z0-9]+)", "url": "https://www.bitporno.com/e/\\1" }, { From 028eec79b2eed8eeaac86bc889e40833a6abe2df Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 9 Oct 2017 10:23:27 -0500 Subject: [PATCH 17/20] nuevo conector cloudsany --- plugin.video.alfa/servers/cloudsany.json | 49 ++++++++++++++++++++++++ plugin.video.alfa/servers/cloudsany.py | 33 ++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 plugin.video.alfa/servers/cloudsany.json create mode 100644 plugin.video.alfa/servers/cloudsany.py diff --git a/plugin.video.alfa/servers/cloudsany.json b/plugin.video.alfa/servers/cloudsany.json new file mode 100644 index 00000000..bd1f4f68 --- /dev/null +++ b/plugin.video.alfa/servers/cloudsany.json @@ -0,0 +1,49 @@ +{ + "active": true, + "changes": [ + { + "date": "09/10/2017", + "description": "Versión inicial" + } + ], + "find_videos": { + "ignore_urls": [], + "patterns": [ + { + "pattern": "cloudsany.com/i/([A-z0-9]+)", + "url": "https://cloudsany.com/i/\\1" + } + ] + }, + "free": true, + "id": "cloudsany", + "name": "cloudsany", + "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 + } + ], + "thumbnail": "https://s1.postimg.org/6wixo35myn/cloudsany1.png", + "version": 1 +} diff --git a/plugin.video.alfa/servers/cloudsany.py b/plugin.video.alfa/servers/cloudsany.py new file mode 100644 index 00000000..67112c5f --- /dev/null +++ b/plugin.video.alfa/servers/cloudsany.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------ +# Alfa addon - KODI Plugin +# Conector para cloudsany +# https://github.com/alfa-addon +# ------------------------------------------------------------ + +from core import httptools +from core import scrapertools +from lib import jsunpack +from platformcode import logger + + +def test_video_exists(page_url): + logger.info("(page_url='%s')" % page_url) + data = httptools.downloadpage(page_url).data + if "no longer exists" in data: + return False, "[Cloudsany] El fichero ha sido borrado" + + return True, "" + + +def get_video_url(page_url, user="", password="", video_password=""): + logger.info("(page_url='%s')" % page_url) + data = httptools.downloadpage(page_url).data + data = scrapertools.find_single_match(data, 'p,a,c,k,e.*?') + unpack = jsunpack.unpack(data) + logger.info("Intel11 %s" %unpack) + video_urls = [] + videourl = scrapertools.find_single_match(unpack, 'config={file:"([^"]+)') + video_urls.append([".MP4 [Cloudsany]", videourl]) + + return video_urls From 7561a362163fe08bbb7f5323e6958f5732f39b0d Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 9 Oct 2017 10:47:14 -0500 Subject: [PATCH 18/20] Update gamovideo.py --- plugin.video.alfa/servers/gamovideo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py index 715836ca..2f746fbe 100755 --- a/plugin.video.alfa/servers/gamovideo.py +++ b/plugin.video.alfa/servers/gamovideo.py @@ -12,7 +12,7 @@ headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20 def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url, headers=headers).data + data = httptools.downloadpage(page_url, add_referer = True).data if "File was deleted" in data or "Not Found" in data or "File was locked by administrator" in data: return False, "[Gamovideo] El archivo no existe o ha sido borrado" @@ -24,7 +24,7 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url, headers=headers).data + data = httptools.downloadpage(page_url, add_referer = True).data packer = scrapertools.find_single_match(data, "") From 187e2fdbd1bb3c3c75c50310e36fc5b7b841435a Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 9 Oct 2017 12:34:05 -0500 Subject: [PATCH 19/20] Update pelisfox.py --- plugin.video.alfa/channels/pelisfox.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.video.alfa/channels/pelisfox.py b/plugin.video.alfa/channels/pelisfox.py index 9aa81828..aef03592 100644 --- a/plugin.video.alfa/channels/pelisfox.py +++ b/plugin.video.alfa/channels/pelisfox.py @@ -240,7 +240,6 @@ def findvideos(item): )) for videoitem in templist: data = httptools.downloadpage(videoitem.url).data - logger.debug(data) urls_list = scrapertools.find_multiple_matches(data, '{"reorder":1,"type":.*?}') for element in urls_list: json_data=jsontools.load(element) From 147afb3adb78112c9bfc5cdce7a65f9135f3bfae Mon Sep 17 00:00:00 2001 From: alfa-addon Date: Mon, 9 Oct 2017 18:11:12 -0400 Subject: [PATCH 20/20] v2.2.1 --- plugin.video.alfa/addon.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 0ca720af..35fd5c2c 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -19,11 +19,17 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » playmax » allcalidad - » cinetux » allpeliculas - » pedropolis » pelisplanet - » flashx » gvideo - ¤ selector de temas ¤ arreglos internos + » animeflv_me » gmobi + » hdfull » peliculasrey + » peliscity » pelisplanet + » bitp » cloudy + » canalpelis » cinefox + » cinefoxtv » gnula + » pedropolis » pelisfox + » gamovideo » rapidgator + » streamplay » yourupload + » cloudsany ¤ arreglos internos + Navega con Kodi por páginas web para ver sus videos de manera fácil. Browse web pages using Kodi