From 1b7e71e3bfce172d2fa2f67075dabf650d1943c9 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 1 Dec 2017 10:21:59 -0500 Subject: [PATCH 01/12] uptobox: fix patron --- plugin.video.alfa/servers/uptobox.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/servers/uptobox.py b/plugin.video.alfa/servers/uptobox.py index d563ca52..92ad5281 100755 --- a/plugin.video.alfa/servers/uptobox.py +++ b/plugin.video.alfa/servers/uptobox.py @@ -40,7 +40,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= # Si el archivo tiene enlace de streaming se redirige a upstream if "Streaming link:" in data: page_url = "http://uptostream.com/iframe/" + scrapertools.find_single_match(page_url, - 'uptobox.com/([a-z0-9]+)') + 'uptobox.com/([a-z0-9]+)') data = httptools.downloadpage(page_url).data video_urls = uptostream(data) else: @@ -56,17 +56,27 @@ def uptostream(data): subtitle = scrapertools.find_single_match(data, "kind='subtitles' src='//([^']+)'") if subtitle: subtitle = "http://" + subtitle - video_urls = [] - patron = " Date: Fri, 1 Dec 2017 10:41:50 -0500 Subject: [PATCH 02/12] Update uptobox.py --- plugin.video.alfa/servers/uptobox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/uptobox.py b/plugin.video.alfa/servers/uptobox.py index 92ad5281..43d90807 100755 --- a/plugin.video.alfa/servers/uptobox.py +++ b/plugin.video.alfa/servers/uptobox.py @@ -14,7 +14,7 @@ def test_video_exists(page_url): if "Streaming link:" in data: return True, "" - elif "Unfortunately, the file you want is not available." in data or "Unfortunately, the video you want to see is not available" in data: + elif "Unfortunately, the file you want is not available." in data or "Unfortunately, the video you want to see is not available" in data or "This stream doesn" in data: return False, "[Uptobox] El archivo no existe o ha sido borrado" wait = scrapertools.find_single_match(data, "You have to wait ([0-9]+) (minute|second)") if len(wait) > 0: From c546976329d3691297475009ca31ffbb05989fc8 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 1 Dec 2017 10:46:38 -0500 Subject: [PATCH 03/12] Delete unsoloclic.json --- plugin.video.alfa/channels/unsoloclic.json | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100755 plugin.video.alfa/channels/unsoloclic.json diff --git a/plugin.video.alfa/channels/unsoloclic.json b/plugin.video.alfa/channels/unsoloclic.json deleted file mode 100755 index 54877b68..00000000 --- a/plugin.video.alfa/channels/unsoloclic.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "unsoloclic", - "name": "Unsoloclic", - "active": true, - "adult": false, - "language": ["cast", "lat"], - "banner": "unsoloclic.png", - "thumbnail": "unsoloclic.png", - "categories": [ - "movie", - "tvshow" - ] -} \ No newline at end of file From 34f4e474fd06a4ce676244a1888346d3ee4ea1c2 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 1 Dec 2017 10:46:50 -0500 Subject: [PATCH 04/12] Delete unsoloclic.py --- plugin.video.alfa/channels/unsoloclic.py | 144 ----------------------- 1 file changed, 144 deletions(-) delete mode 100755 plugin.video.alfa/channels/unsoloclic.py diff --git a/plugin.video.alfa/channels/unsoloclic.py b/plugin.video.alfa/channels/unsoloclic.py deleted file mode 100755 index a6cf396f..00000000 --- a/plugin.video.alfa/channels/unsoloclic.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- - -import re -import urlparse - -from core import scrapertools -from core.item import Item -from platformcode import logger - - -def mainlist(item): - logger.info() - item.url = "http://unsoloclic.info" - return novedades(item) - - -def novedades(item): - logger.info() - itemlist = [] - - # Descarga la página - data = scrapertools.cachePage(item.url) - ''' -
-

Pelicula Ek Tha Tiger (2012) BLU-RAY 720p HD

-
noviembre 5th, 2012 - -
-
-

-

- -
-
- ''' - ''' -
-

The Giant Mechanical Man (2012) BluRay 720p HD

-
diciembre 24th, 2012 - -
-
-

-

-

-
-
- ''' - patron = '
[^<]+' - patron += '

([^<]+)

[^<]+' - patron += '
.*?
[^<]+' - patron += '
[^<]+' - patron += '« Peliculas anteriores - ''' - patron = '\«\; Peliculas anteriores' - matches = re.compile(patron, re.DOTALL).findall(data) - - for match in matches: - scrapedtitle = ">> Página siguiente" - scrapedplot = "" - scrapedurl = urlparse.urljoin(item.url, match) - scrapedthumbnail = "" - logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]") - itemlist.append(Item(channel=item.channel, action="novedades", title=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True)) - - return itemlist - - -def findvideos(item): - logger.info() - data = scrapertools.cache_page(item.url) - itemlist = [] - - #

- #

- patron = ']+>]+>»') if next_page_link: itemlist.append( item.clone(action="destacadas", title=">> Página siguiente", url=next_page_link, text_color=color3)) - return itemlist @@ -243,9 +240,9 @@ def findvideos(item): # Busca el argumento data = httptools.downloadpage(item.url).data - year = scrapertools.find_single_match(item.title, "\(([0-9]+)") - tmdb.set_infoLabels(item, __modo_grafico__) + if item.infoLabels["year"]: + tmdb.set_infoLabels(item, __modo_grafico__) if not item.infoLabels.get('plot'): plot = scrapertools.find_single_match(data, '

(.*?)

') From 30e32ac133c2237927cbe37b79a92b0ef0e7cae4 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 1 Dec 2017 11:37:21 -0500 Subject: [PATCH 06/12] gamovideo: test_video --- plugin.video.alfa/servers/gamovideo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py index cd7a1307..cbb32783 100755 --- a/plugin.video.alfa/servers/gamovideo.py +++ b/plugin.video.alfa/servers/gamovideo.py @@ -18,7 +18,8 @@ def test_video_exists(page_url): return False, "[Gamovideo] El archivo no existe o ha sido borrado" if "Video is processing now" in data: return False, "[Gamovideo] El video está procesándose en estos momentos. Inténtelo mas tarde." - + if "File is awaiting for moderation" in data: + return False, "[Gamovideo] El video está esperando por moderación." return True, "" From fd5b972281550475c55737ee668ace04b4a171ea Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 1 Dec 2017 11:58:39 -0500 Subject: [PATCH 07/12] Update cinetux.py --- plugin.video.alfa/channels/cinetux.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py index d89833ef..59805451 100644 --- a/plugin.video.alfa/channels/cinetux.py +++ b/plugin.video.alfa/channels/cinetux.py @@ -244,10 +244,6 @@ def findvideos(item): if item.infoLabels["year"]: tmdb.set_infoLabels(item, __modo_grafico__) - if not item.infoLabels.get('plot'): - plot = scrapertools.find_single_match(data, '

(.*?)

') - item.infoLabels['plot'] = plot - if filtro_enlaces != 0: list_enlaces = bloque_enlaces(data, filtro_idioma, dict_idiomas, "online", item) if list_enlaces: From 2e9573b6e95f9c1294774864f9e91ddc000b1667 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 1 Dec 2017 12:56:44 -0500 Subject: [PATCH 08/12] streamixcloud: fix test_video --- plugin.video.alfa/servers/streamixcloud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/servers/streamixcloud.py b/plugin.video.alfa/servers/streamixcloud.py index bc9d81a5..37664748 100755 --- a/plugin.video.alfa/servers/streamixcloud.py +++ b/plugin.video.alfa/servers/streamixcloud.py @@ -9,7 +9,7 @@ from platformcode import logger def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data - if "Not Found" in data: + if "Not Found" in data or "File was deleted" in data: return False, "[streamixcloud] El archivo no existe o ha sido borrado" if "Video is processing" in data: return False, "[streamixcloud] El video se está procesando, inténtelo mas tarde" From 02797b55719ac9a3d7c9a10f45d661fe2f99963f Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sat, 2 Dec 2017 10:57:59 -0500 Subject: [PATCH 09/12] peliculasgratis: actualizado --- plugin.video.alfa/channels/peliculasgratis.py | 1036 ++--------------- 1 file changed, 108 insertions(+), 928 deletions(-) diff --git a/plugin.video.alfa/channels/peliculasgratis.py b/plugin.video.alfa/channels/peliculasgratis.py index 35e07ba5..9105048d 100644 --- a/plugin.video.alfa/channels/peliculasgratis.py +++ b/plugin.video.alfa/channels/peliculasgratis.py @@ -3,28 +3,14 @@ import os import re import urllib -import urlparse -import xbmc -import xbmcgui from core import httptools from core import scrapertools from core import servertools from core import tmdb from core.item import Item -from core.scrapertools import decodeHtmlentities as dhe from platformcode import config, logger -ACTION_SHOW_FULLSCREEN = 36 -ACTION_GESTURE_SWIPE_LEFT = 511 -ACTION_SELECT_ITEM = 7 -ACTION_PREVIOUS_MENU = 10 -ACTION_MOVE_LEFT = 1 -ACTION_MOVE_RIGHT = 2 -ACTION_MOVE_DOWN = 4 -ACTION_MOVE_UP = 3 -OPTION_PANEL = 6 -OPTIONS_OK = 5 host = "http://peliculasgratis.biz" @@ -37,49 +23,6 @@ CALIDADES = {"micro1080p": "[COLOR plum]Micro1080p[/COLOR]", "dvds": "[COLOR lim IDIOMAS = {"castellano": "[COLOR yellow]Castellano[/COLOR]", "latino": "[COLOR orange]Latino[/COLOR]", "vose": "[COLOR lightsalmon]Subtitulada[/COLOR]", "vo": "[COLOR crimson]Ingles[/COLOR]", "en": "[COLOR crimson]Ingles[/COLOR]"} -IDIOMASP = {"es": "[COLOR yellow]CAST[/COLOR]", "la": "[COLOR orange]LAT[/COLOR]", - "vs": "[COLOR lightsalmon]SUB[/COLOR]", "vo": "[COLOR crimson]Ingles[/COLOR]", - "en": "[COLOR crimson]INGL[/COLOR]"} - - -# Para la busqueda en bing evitando baneos - -def browser(url): - import mechanize - - # Utilizamos Browser mechanize para saltar problemas con la busqueda en bing - br = mechanize.Browser() - # Browser options - br.set_handle_equiv(False) - br.set_handle_gzip(True) - br.set_handle_redirect(True) - br.set_handle_referer(False) - br.set_handle_robots(False) - # Follows refresh 0 but not hangs on refresh > 0 - br.set_handle_refresh(mechanize._http.HTTPRefreshProcessor(), max_time=1) - # Want debugging messages? - # br.set_debug_http(True) - # br.set_debug_redirects(True) - # br.set_debug_responses(True) - - # User-Agent (this is cheating, ok?) - # br.addheaders = [('User-agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/600.7.12 (KHTML, like Gecko) Version/7.1.7 Safari/537.85.16')] - # br.addheaders =[('Cookie','SRCHD=AF=QBRE; domain=.bing.com; expires=25 de febrero de 2018 13:00:28 GMT+1; MUIDB=3B942052D204686335322894D3086911; domain=www.bing.com;expires=24 de febrero de 2018 13:00:28 GMT+1')] - # Open some site, let's pick a random one, the first that pops in mind - r = br.open(url) - response = r.read() - print response - if "img,divreturn" in response: - r = br.open("http://ssl-proxy.my-addr.org/myaddrproxy.php/" + url) - print "prooooxy" - response = r.read() - - return response - - -api_key = "2e2160006592024ba87ccdf78c28f49f" -api_fankey = "dffe90fba4d02c199ae7a9e71330c987" - def mainlist(item): logger.info() @@ -88,22 +31,26 @@ def mainlist(item): thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B] Más vistas[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/catalogue?order=most_viewed", + url= host + "/catalogue?order=most_viewed", thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title=" [COLOR lightskyblue][B]Recomendadas[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/catalogue?order=most_rated", - thumbnail="http://imgur.com/fN2p6qH.png.png", + url=host + "/catalogue?order=most_rated", + thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B] Actualizadas[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/catalogue?", + url= host + "/catalogue?", + thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", + contentType="movie")) + itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B] Género[/B][/COLOR]", action="genero", + url= host, thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B]Series[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/lista-de-series", + url= host + "/lista-de-series", thumbnail="http://imgur.com/Jia27Uc.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="tvshow")) - itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B]Buscar[/B][/COLOR]", action="", url="", + itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B]Buscar[/B][/COLOR]", thumbnail="http://imgur.com/mwTwfN7.png", fanart="http://imgur.com/b8OuBR2.jpg")) itemlist.append( itemlist[-1].clone(title="[COLOR lightskyblue][B] Buscar Película[/B][/COLOR]", action="search", url="", @@ -117,11 +64,31 @@ def mainlist(item): return itemlist +def genero(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + patron = 'Películas por géneros(.*?)<\/i>Anuncios') if item.contentType != "movie": - matches = scrapertools.find_multiple_matches(bloque_enlaces, - '
(.*?)<\/a>

.*?(completa)">([^"]+)<\/a><\/h3> (.*?)<\/span>') + patron = '([^<]+)<.*?
(.*?)<\/a>

.*?title[^<]+>([^<]+)<\/a><\/h3> (.*?)<') - for url, thumb, quality, check_idioma, title, check_year in matches: - - logger.debug('check_idioma: %s' % check_idioma) + patron = '') title = title - itemlist.append( - Item(channel=item.channel, title=title, url=urlparse.urljoin(host, url), action="fanart", thumbnail=thumb, - fanart="http://imgur.com/nqmJozd.jpg", extra=title_fan + "|" + title_item + "|" + check_year.strip(), - contentType=item.contentType, folder=True, language = idiomas)) + Item(channel=item.channel, title=title, fulltitle=title, url=host + url, action=action, thumbnail=thumb, + fanart="http://imgur.com/nqmJozd.jpg", extra=title_fan + "|" + title_item + "|" + year, show=title, + contentType=item.contentType, folder=True, language = idiomas, infoLabels={"year":year})) ## Paginación - if check_year: + tmdb.set_infoLabels(itemlist) + if year: next = scrapertools.find_single_match(data, 'href="([^"]+)" title="Siguiente página">') if len(next) > 0: url = next if not "http" in url: - url = urlparse.urljoin(host, url) + url = host + url itemlist.append( Item(channel=item.channel, action="scraper", title="[COLOR floralwhite][B]Siguiente[/B][/COLOR]", url=url, thumbnail="http://imgur.com/jhRFAmk.png", fanart="http://imgur.com/nqmJozd.jpg", extra=item.extra, contentType=item.contentType, folder=True)) - - return itemlist - - -def fanart(item): - logger.info() - itemlist = [] - url = item.url - data = httptools.downloadpage(item.url).data - data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - year = item.extra.split("|")[2] - if not year.isdigit(): - try: - year = scrapertools.find_single_match(data, '[^<]+<\/span>(\d+)<') - except: - year = "" - if item.contentType != "movie": - tipo_ps = "tv" - else: - tipo_ps = "movie" - title = item.extra.split("|")[0] - fulltitle = title - if "El infiltrado" in title: - title = "The Night Manager" - title_o = scrapertools.find_single_match(data, '(.*?)<\/div>') - if sinopsis == "": - try: - sinopsis = scrapertools.find_single_match(data, 'sinopsis\'>(.*?)<\/div>') - except: - sinopsis = "" - if "Miniserie" in sinopsis: - tipo_ps = "tv" - year = scrapertools.find_single_match(sinopsis, 'de TV \((\d+)\)') - if year == "": - if item.contentType != "movie": - try: - year = scrapertools.find_single_match(data, 'Estreno:<\/strong>(\d+)<\/span>') - except: - year = "" - else: - year = scrapertools.find_single_match(data, '
A.*?(\d+)
') - if year == "": - try: - year = scrapertools.find_single_match(data, 'Estreno.*?\d+/\d+/(\d+)') - except: - try: - year = scrapertools.find_single_match(data, - '
.*?Año
.*?(\d\d\d\d)') - except: - try: - year = scrapertools.find_single_match(data, - '(.*?)h="ID.*?.*?TV Series') - else: - urlbing_imdb = "http://www.bing.com/search?q=%s+%s+site:imdb.com" % (title_imdb.replace(' ', '+'), year) - data = browser(urlbing_imdb) - data = re.sub(r"\n|\r|\t|\s{2}| |http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data) - subdata_imdb = scrapertools.find_single_match(data, '
  • (.*?)h="ID.*?') - try: - imdb_id = scrapertools.get_match(subdata_imdb, '(.*?)h="ID.*?.*?TV Series') - else: - urlbing_imdb = "http://www.bing.com/search?q=%s+%s+site:imdb.com" % ( - title_imdb.replace(' ', '+'), year) - data = browser(urlbing_imdb) - data = re.sub(r"\n|\r|\t|\s{2}| |http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data) - subdata_imdb = scrapertools.find_single_match(data, '
  • (.*?)h="ID.*?') - try: - imdb_id = scrapertools.get_match(subdata_imdb, '= 5: - fanart_info = imagenes[1] - fanart_2 = imagenes[2] - fanart_3 = imagenes[3] - fanart_4 = imagenes[4] - if fanart == item.fanart: - fanart = fanart_info - elif len(imagenes) == 4: - fanart_info = imagenes[1] - fanart_2 = imagenes[2] - fanart_3 = imagenes[3] - fanart_4 = imagenes[1] - if fanart == item.fanart: - fanart = fanart_info - elif len(imagenes) == 3: - fanart_info = imagenes[1] - fanart_2 = imagenes[2] - fanart_3 = imagenes[1] - fanart_4 = imagenes[0] - if fanart == item.fanart: - fanart = fanart_info - elif len(imagenes) == 2: - fanart_info = imagenes[1] - fanart_2 = imagenes[0] - fanart_3 = imagenes[1] - fanart_4 = imagenes[1] - if fanart == item.fanart: - fanart = fanart_info - else: - fanart_info = fanart - fanart_2 = fanart - fanart_3 = fanart - fanart_4 = fanart - images_fanarttv = fanartv(item, id_tvdb, id) - if item.contentType != "movie": - url = item.url + "/episodios" - action = "findvideos_series" - if images_fanarttv: - try: - thumbnail_art = images_fanarttv.get("hdtvlogo")[0].get("url") - except: - try: - thumbnail_art = images_fanarttv.get("clearlogo")[0].get("url") - except: - thumbnail_art = posterdb - if images_fanarttv.get("tvbanner"): - tvf = images_fanarttv.get("tvbanner")[0].get("url") - elif images_fanarttv.get("tvthumb"): - tvf = images_fanarttv.get("tvthumb")[0].get("url") - elif images_fanarttv.get("tvposter"): - tvf = images_fanarttv.get("tvposter")[0].get("url") - else: - tvf = posterdb - if images_fanarttv.get("tvthumb"): - thumb_info = images_fanarttv.get("tvthumb")[0].get("url") - else: - thumb_info = thumbnail_art - - if images_fanarttv.get("hdclearart"): - tiw = images_fanarttv.get("hdclearart")[0].get("url") - elif images_fanarttv.get("characterart"): - tiw = images_fanarttv.get("characterart")[0].get("url") - elif images_fanarttv.get("hdtvlogo"): - tiw = images_fanarttv.get("hdtvlogo")[0].get("url") - else: - tiw = "" - else: - tiw = "" - tvf = thumbnail_info = thumbnail_art = posterdb - else: - url = item.url - action = "findvideos" - if images_fanarttv: - if images_fanarttv.get("hdmovielogo"): - thumbnail_art = images_fanarttv.get("hdmovielogo")[0].get("url") - elif images_fanarttv.get("moviethumb"): - thumbnail_art = images_fanarttv.get("moviethumb")[0].get("url") - elif images_fanarttv.get("moviebanner"): - thumbnail_art = images_fanarttv.get("moviebanner")[0].get("url") - else: - thumbnail_art = posterdb - if images_fanarttv.get("moviedisc"): - tvf = images_fanarttv.get("moviedisc")[0].get("url") - elif images_fanarttv.get("hdmovielogo"): - tvf = images_fanarttv.get("hdmovielogo")[0].get("url") - else: - tvf = posterdb - if images_fanarttv.get("hdmovieclearart"): - tiw = images_fanarttv.get("hdmovieclearart")[0].get("url") - elif images_fanarttv.get("hdmovielogo"): - tiw = images_fanarttv.get("hdmovielogo")[0].get("url") - else: - tiw = "" - else: - tiw = "" - tvf = thumbnail_art = posterdb - extra = str(fanart_2) + "|" + str(fanart_3) + "|" + str(fanart_4) + "|" + str(id) + "|" + str(tvf) + "|" + str( - id_tvdb) + "|" + str(tiw) + "|" + str(rating) + "|" + tipo_ps - itemlist.append( - Item(channel=item.channel, title=item.title, url=url, action=action, thumbnail=thumbnail_art, fanart=fanart, - extra=extra, contentType=item.contentType, fulltitle=fulltitle, folder=True)) - title_info = "[COLOR powderblue][B]Info[/B][/COLOR]" - extra = str(rating) + "|" + str(rating_filma) + "|" + str(id) + "|" + str(item.title) + "|" + str( - id_tvdb) + "|" + str(tagline) + "|" + str(sinopsis) + "|" + str(critica) + "|" + str(thumbnail_art) + "|" + str( - fanart_4) - itemlist.append(Item(channel=item.channel, action="info", title=title_info, url=item.url, thumbnail=posterdb, - fanart=fanart_info, extra=extra, contentType=item.contentType, folder=False)) return itemlist def findvideos_series(item): logger.info() itemlist = [] - fanart = "" check_temp = [] - data = httptools.downloadpage(item.url).data - if item.contentType != "movie": - itmdb = tmdb.Tmdb(id_Tmdb=item.extra.split("|")[3], tipo=item.extra.split("|")[8]) - season = itmdb.result.get("seasons") - check = "no" - try: - temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)Temporada') - except: - if "no se agregaron" in data: - temp = bloque_enlaces = "" - else: - temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)
    ') - if temp != "": - thumbnail = "" - if season: - for detail in season: - if str(detail["season_number"]) == temp: - if detail["poster_path"]: - thumbnail = "https://image.tmdb.org/t/p/original" + detail["poster_path"] - images_fanarttv = fanartv(item, item.extra.split("|")[5], item.extra.split("|")[3]) - if images_fanarttv: - season_f = images_fanarttv.get("showbackground") - if season_f: - for detail in season_f: - if str(detail["season"]) == temp: - if detail["url"]: - fanart = detail["url"] - if fanart == "": - fanart = item.extra.split("|")[0] - if thumbnail == "": - thumbnail = item.thumbnail - itemlist.append(Item(channel=item.channel, - title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + temp + "[/COLOR]", - url="", action="", thumbnail=thumbnail, fanart=fanart, extra="", - contentType=item.contentType, folder=False)) - capitulos = scrapertools.find_multiple_matches(bloque_enlaces, 'href="([^"]+)".*?Episodio (\d+) - ([^<]+)') - for url, epi, title in capitulos: - if epi == "1": - if epi in str(check_temp): - temp = int(temp) + 1 - thumbnail = "" - if season: - for detail in season: - if detail["season_number"] == temp: - if detail["poster_path"]: - thumbnail = "https://image.tmdb.org/t/p/original" + detail["poster_path"] - images_fanarttv = fanartv(item, item.extra.split("|")[5], item.extra.split("|")[3]) - if images_fanarttv: - season_f = images_fanarttv.get("showbackground") - if season_f: - for detail in season_f: - if detail["season"] == temp: - if detail["url"]: - fanart = detail["url"] - if fanart == "": - fanart = item.extra.split("|")[0] - if thumbnail == "": - thumbnail = item.thumbnail - itemlist.append(Item(channel=item.channel, - title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + str( - temp) + "[/COLOR]", url="", action="", thumbnail=thumbnail, fanart=fanart, - extra="", contentType=item.contentType, folder=False)) - check_temp.append([epi]) - itemlist.append(Item(channel=item.channel, - title=" [COLOR cyan]Episodio[/COLOR] " + "[COLOR darkcyan]" + epi + "[/COLOR]" + " - " + "[COLOR cadetblue]" + title + "[/COLOR]", - url=url, action="findvideos", thumbnail=item.extra.split("|")[4], - fanart=item.extra.split("|")[0], extra="", contentType=item.contentType, folder=True)) - title_info = " Info" - title_info = "[COLOR steelblue]" + title_info + "[/COLOR]" - itemlist.append(Item(channel=item.channel, action="info_capitulos", title=title_info, url=item.url, - thumbnail=item.extra.split("|")[6], fanart=item.extra.split("|")[1], - extra=item.extra + "|" + str(temp) + "|" + epi, folder=False)) - + data = httptools.downloadpage(item.url + "/episodios").data + try: + temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)Temporada') + except: + if "no se agregaron" in data: + temp = bloque_enlaces = "" + else: + temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)
    ') + if temp != "": + item.infoLabels["season"] = temp + itemlist.append(item.clone(title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + temp + "[/COLOR]", + folder=False)) + capitulos = scrapertools.find_multiple_matches(bloque_enlaces, 'href="([^"]+)".*?Episodio (\d+) - ([^<]+)') + for url, epi, title in capitulos: + if epi == "1": + if epi in str(check_temp): + temp = int(temp) + 1 + item.infoLabels["season"] = temp + item.infoLabels["episode"] = 0 + itemlist.append(item.clone(title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + str( + temp) + "[/COLOR]", folder=False + )) + check_temp.append([epi]) + item.infoLabels["season"] = temp + item.infoLabels["episode"] = epi + itemlist.append(item.clone(title=" [COLOR cyan]Episodio[/COLOR] " + "[COLOR darkcyan]" + epi + "[/COLOR]" + " - " + "[COLOR cadetblue]" + title + "[/COLOR]", + url=url, action="findvideos", thumbnail="", + extra="", contentType=item.contentType, folder=True)) + tmdb.set_infoLabels(itemlist) return itemlist @@ -584,9 +197,7 @@ def findvideos(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data - if item.extra != "dd" and item.extra != "descarga": - if item.contentType != "movie": bloque_links = scrapertools.find_single_match(data, '