diff --git a/.gitignore b/.gitignore index bac54407..fbc6c602 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +* +!plugin.video.alfa *.pyo *.pyc .DS_Store diff --git a/plugin.video.alfa/channels/altadefinizionehd.py b/plugin.video.alfa/channels/altadefinizionehd.py index fbde1156..8b18e2e9 100644 --- a/plugin.video.alfa/channels/altadefinizionehd.py +++ b/plugin.video.alfa/channels/altadefinizionehd.py @@ -9,7 +9,7 @@ import re from core import httptools, scrapertools, servertools from platformcode import logger, config from core.item import Item -from core.tmdb import infoIca +from core import tmdb @@ -119,14 +119,14 @@ def elenco(item): for scrapedurl, scrapedtitle, scrapedthumbnail in matches: scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) logger.info("title=[" + scrapedtitle + "] url=[" + scrapedurl + "] thumbnail=[" + scrapedthumbnail + "]") - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="movie")) + thumbnail=scrapedthumbnail)) # Paginazione # =========================================================================================================================== @@ -140,7 +140,8 @@ def elenco(item): itemlist.append(Item(channel=item.channel, action="mainlist", title=ListTxt, folder=True)) # =========================================================================================================================== - + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -158,13 +159,13 @@ def search(item, texto): for scrapedthumbnail, scrapedurl, scrapedtitle in matches: scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="movie")) + thumbnail=scrapedthumbnail)) # Paginazione # =========================================================================================================================== @@ -176,6 +177,7 @@ def search(item, texto): else: itemlist.append(Item(channel=item.channel, action="mainlist", title=ListTxt, folder=True)) # =========================================================================================================================== + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/cineblog01blog.py b/plugin.video.alfa/channels/cineblog01blog.py index 4641c2c6..7d88092b 100644 --- a/plugin.video.alfa/channels/cineblog01blog.py +++ b/plugin.video.alfa/channels/cineblog01blog.py @@ -9,7 +9,7 @@ import re from platformcode import logger, config from core import httptools, scrapertools, servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb host = "https://www.cineblog01.cloud" @@ -154,7 +154,7 @@ def peliculas(item): for url in matches: if "scrolling" not in url: continue - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", @@ -163,7 +163,7 @@ def peliculas(item): url=scrapedurl, extra="movie", thumbnail=scrapedthumbnail, - folder=True), tipo="movie")) + folder=True)) # Pagine patronvideos = r'Avanti' @@ -184,6 +184,7 @@ def peliculas(item): folder=True)) break + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist # ================================================================================================================ diff --git a/plugin.video.alfa/channels/cinemalibero.py b/plugin.video.alfa/channels/cinemalibero.py index 6950a5d5..39f1cea8 100644 --- a/plugin.video.alfa/channels/cinemalibero.py +++ b/plugin.video.alfa/channels/cinemalibero.py @@ -15,7 +15,7 @@ from platformcode import logger, config from core.item import Item from lib import unshortenit from platformcode import config -from core.tmdb import infoIca +from core import tmdb # Necessario per Autoplay IDIOMAS = {'Italiano': 'IT'} @@ -136,7 +136,7 @@ def video(item): tipologia = 'movie' action = 'select' - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action=action, contentType=item.contentType, @@ -146,7 +146,7 @@ def video(item): url=url, thumbnail=thumb, infoLabels=year, - show=title), tipo=tipologia)) + show=title)) # Next page next_page = scrapertools.find_single_match(data, 'AVANTI' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -144,6 +144,7 @@ def elenco(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -188,14 +189,14 @@ def elenco_ten(item): for scrapedurl, scrapedtitle in matches: logger.info("Url:" + scrapedurl + " title:" + scrapedtitle) - itemlist.append(infoIca(Item(channel=item.channel, + itemlist.append(Item(channel=item.channel, action="findvideos", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", fulltitle=scrapedtitle, url=scrapedurl, thumbnail="", fanart="" - ))) + )) return itemlist diff --git a/plugin.video.alfa/channels/filmontv.py b/plugin.video.alfa/channels/filmontv.py index 86d68d42..3a9532f1 100644 --- a/plugin.video.alfa/channels/filmontv.py +++ b/plugin.video.alfa/channels/filmontv.py @@ -12,7 +12,7 @@ from core import httptools from platformcode import logger from core import scrapertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb @@ -66,7 +66,7 @@ def tvoggi(item): scrapedurl = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="do_search", extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie', @@ -74,7 +74,7 @@ def tvoggi(item): fulltitle=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, - folder=True), tipo="movie")) + folder=True), tipo="movie") return itemlist diff --git a/plugin.video.alfa/channels/filmperevolvere.py b/plugin.video.alfa/channels/filmperevolvere.py index b69dbebc..2d8a2354 100644 --- a/plugin.video.alfa/channels/filmperevolvere.py +++ b/plugin.video.alfa/channels/filmperevolvere.py @@ -13,7 +13,7 @@ from platformcode import logger, config from core import scrapertools from core import servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb @@ -152,7 +152,7 @@ def peliculas(item): scrapedtitle = scrapedtitle.title() txt = "Serie Tv" if txt in scrapedtitle: continue - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", fulltitle=scrapedtitle, @@ -161,9 +161,9 @@ def peliculas(item): url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, - folder=True), tipo='movie')) + folder=True)) - # Paginazione + # Paginazione patronvideos = '[^<]+' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -177,6 +177,7 @@ def peliculas(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/filmpertutti.py b/plugin.video.alfa/channels/filmpertutti.py index d21d464a..6e1f4750 100644 --- a/plugin.video.alfa/channels/filmpertutti.py +++ b/plugin.video.alfa/channels/filmpertutti.py @@ -10,7 +10,7 @@ import urlparse from channels import autoplay from core import scrapertools, servertools, httptools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from lib import unshortenit from platformcode import config, logger @@ -93,7 +93,7 @@ def peliculas(item): for scrapedurl, scrapedthumbnail, scrapedtitle, scraprate in matches: scrapedplot = "" - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", @@ -104,9 +104,9 @@ def peliculas(item): thumbnail=scrapedthumbnail, plot=scrapedplot, extra=item.extra, - folder=True), tipo='movie')) + folder=True)) - # Paginazione + # Paginazione patronvideos = ']+>Pagina' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -121,6 +121,7 @@ def peliculas(item): extra=item.extra, folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -138,7 +139,7 @@ def peliculas_tv(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: title = scrapertools.decodeHtmlentities(scrapedtitle) scrapedplot = "" - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios", fulltitle=title, @@ -148,9 +149,9 @@ def peliculas_tv(item): thumbnail=scrapedthumbnail, plot=scrapedplot, extra=item.extra, - folder=True), tipo='tv')) + folder=True)) - # Paginazione + # Paginazione patronvideos = ']+>Pagina' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -165,6 +166,7 @@ def peliculas_tv(item): extra=item.extra, folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def categorias(item): diff --git a/plugin.video.alfa/channels/filmsenzalimiti.py b/plugin.video.alfa/channels/filmsenzalimiti.py index 50df4532..9a913757 100644 --- a/plugin.video.alfa/channels/filmsenzalimiti.py +++ b/plugin.video.alfa/channels/filmsenzalimiti.py @@ -15,7 +15,7 @@ from core import scrapertools, servertools, httptools from platformcode import logger, config from core.item import Item from platformcode import config -from core.tmdb import infoIca +from core import tmdb __channel__ = 'filmsenzalimiti' @@ -134,7 +134,7 @@ def video(item): scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() scrapedrating = scrapertools.decodeHtmlentities(scrapedrating) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action='findvideos', title=scrapedtitle + ' (' + scrapedrating + ')', @@ -142,7 +142,7 @@ def video(item): url=scrapedurl, show=scrapedtitle, contentType=item.contentType, - thumbnail=scrapedthumbnail), tipo='movie')) + thumbnail=scrapedthumbnail), tipo='movie') patron = '') @@ -197,6 +197,7 @@ def video(item): contentType=item.contentType, thumbnail='http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png')) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/filmstreaminggratis.py b/plugin.video.alfa/channels/filmstreaminggratis.py index e08d20e0..860fb661 100644 --- a/plugin.video.alfa/channels/filmstreaminggratis.py +++ b/plugin.video.alfa/channels/filmstreaminggratis.py @@ -11,7 +11,7 @@ from channels import autoplay from channels import filtertools from core import scrapertools, servertools, httptools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from platformcode import logger, config IDIOMAS = {'Italiano': 'IT'} @@ -99,7 +99,7 @@ def ultimifilm(item): for scrapedurl, scrapedtitle in matches: scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", @@ -108,8 +108,9 @@ def ultimifilm(item): url=scrapedurl, extra="movie", thumbnail=item.thumbnail, - folder=True), tipo="movie")) + folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -152,7 +153,7 @@ def loadfilms(item): for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedplot in matches: scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) scrapedplot = scrapertools.decodeHtmlentities(scrapedplot.strip()) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", title=scrapedtitle, @@ -160,7 +161,7 @@ def loadfilms(item): url=scrapedurl, plot=scrapedplot, thumbnail=scrapedthumbnail, - folder=True), tipo=item.extra)) + folder=True)) patronvideos = '' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -175,6 +176,7 @@ def loadfilms(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/filmzstreaming.py b/plugin.video.alfa/channels/filmzstreaming.py index d97f74df..ce28c5d6 100644 --- a/plugin.video.alfa/channels/filmzstreaming.py +++ b/plugin.video.alfa/channels/filmzstreaming.py @@ -11,7 +11,7 @@ from channels import autoplay from channels import filtertools from core import scrapertools, servertools, httptools from core.item import Item -from core.tmdb import infoIca +from core import tmdb @@ -81,16 +81,16 @@ def peliculas(item): scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) scrapedtitle = scrapedtitle.replace("Streaming ", "") - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="movie")) + thumbnail=scrapedthumbnail)) - # Paginazione + # Paginazione patronvideos = '[^>]+' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -104,6 +104,7 @@ def peliculas(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def peliculas_tv(item): @@ -125,16 +126,16 @@ def peliculas_tv(item): scrapedtitle = scrapedtitle.replace(" Streaming", "") scrapedtitle = scrapedtitle.title() - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios", contentType="tv", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="tv")) + thumbnail=scrapedthumbnail)) - # Paginazione + # Paginazione patronvideos = '[^>]+' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -148,6 +149,7 @@ def peliculas_tv(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def episodios(item): @@ -166,7 +168,7 @@ def episodios(item): scrapedthumbnail = "" scrapedtitle = scraped_1 + " " + scraped_2 - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="episode", @@ -174,7 +176,7 @@ def episodios(item): title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="tv")) + thumbnail=scrapedthumbnail)) # Comandi di servizio if config.get_videolibrary_support() and len(itemlist) != 0: @@ -186,6 +188,7 @@ def episodios(item): extra="episodios", show=item.show)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def peliculas_src_tv(item): @@ -205,16 +208,16 @@ def peliculas_src_tv(item): scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) scrapedtitle = scrapedtitle.replace("Streaming ", "") - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios", contentType="tv", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="tv")) + thumbnail=scrapedthumbnail)) - # Paginazione + # Paginazione patronvideos = '[^>]+' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -228,6 +231,7 @@ def peliculas_src_tv(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def peliculas_src(item): @@ -247,16 +251,16 @@ def peliculas_src(item): scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) scrapedtitle = scrapedtitle.replace("Streaming ", "") - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail), tipo="movie")) + thumbnail=scrapedthumbnail)) - # Paginazione + # Paginazione patronvideos = '[^>]+' matches = re.compile(patronvideos, re.DOTALL).findall(data) @@ -270,6 +274,7 @@ def peliculas_src(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def categorias(item): diff --git a/plugin.video.alfa/channels/guardarefilm.py b/plugin.video.alfa/channels/guardarefilm.py index c1d22efb..6a361262 100644 --- a/plugin.video.alfa/channels/guardarefilm.py +++ b/plugin.video.alfa/channels/guardarefilm.py @@ -11,7 +11,7 @@ from core import httptools from core import scrapertools from core import servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from platformcode import logger, config host = "https://www.guardarefilm.video" @@ -152,7 +152,7 @@ def peliculas(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios" if item.extra == "tvshow" else "findvideos", contentType="movie", @@ -162,7 +162,7 @@ def peliculas(item): url=scrapedurl, thumbnail=urlparse.urljoin(host, scrapedthumbnail), plot=scrapedplot, - folder=True), tipo='movie')) + folder=True)) # Paginazione patronvideos = '
.*?' @@ -196,7 +196,7 @@ def peliculas_tv(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios" if item.extra == "tvshow" else "findvideos", fulltitle=scrapedtitle, @@ -205,7 +205,7 @@ def peliculas_tv(item): url=scrapedurl, thumbnail=urlparse.urljoin(host, scrapedthumbnail), plot=scrapedplot, - folder=True), tipo='tv')) + folder=True)) # Paginazione patronvideos = '
.*?' diff --git a/plugin.video.alfa/channels/guardaseriecc.py b/plugin.video.alfa/channels/guardaseriecc.py index 9c4457db..7551eeae 100644 --- a/plugin.video.alfa/channels/guardaseriecc.py +++ b/plugin.video.alfa/channels/guardaseriecc.py @@ -8,7 +8,7 @@ import re from core import httptools, scrapertools, servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from lib import unshortenit from platformcode import logger, config @@ -70,14 +70,14 @@ def lista_serie(item): for scrapedthumbnail, scrapedtitle, scrapedurl in matches: scrapedtitle = scrapedtitle.split("(")[0] scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, thumbnail=scrapedthumbnail, fulltitle=scrapedtitle, - show=scrapedtitle, viewmode="movie"), tipo='tv')) + show=scrapedtitle, viewmode="movie")) # Paginazione # =========================================================== @@ -95,6 +95,7 @@ def lista_serie(item): thumbnail=thumbnail_successivo, folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -209,15 +210,16 @@ def ricerca(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: scrapedtitle = scrapedtitle.split("(")[0] - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodios", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, thumbnail=scrapedthumbnail, fulltitle=scrapedtitle, - show=scrapedtitle, viewmode="movie"), tipo='tv')) + show=scrapedtitle, viewmode="movie")) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -245,15 +247,16 @@ def search(item, texto): for scrapedurl,scrapedthumbnail,scrapedtitle in matches: scrapedtitle = scrapedtitle.split("(")[0] - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="stagione", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, thumbnail=scrapedthumbnail, fulltitle=scrapedtitle, - show=scrapedtitle, viewmode="movie"), tipo='tv')) + show=scrapedtitle, viewmode="movie"))) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/guardaserieclick.py b/plugin.video.alfa/channels/guardaserieclick.py index 54789b69..8a8abe87 100644 --- a/plugin.video.alfa/channels/guardaserieclick.py +++ b/plugin.video.alfa/channels/guardaserieclick.py @@ -9,7 +9,7 @@ import re from core import httptools, scrapertools, servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from platformcode import logger, config @@ -109,7 +109,7 @@ def nuoveserie(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodi", contentType="tv", @@ -119,8 +119,9 @@ def nuoveserie(item): extra="tv", show=scrapedtitle, thumbnail=scrapedthumbnail, - folder=True), tipo="tv")) + folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -145,7 +146,7 @@ def serietvaggiornate(item): title = "%s %s" % (scrapedtitle, scrapedep) extra = r']*>' % ( episode[0][0], episode[0][1].lstrip("0")) - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findepvideos", contentType="tv", @@ -155,7 +156,8 @@ def serietvaggiornate(item): url=scrapedurl, extra=extra, thumbnail=scrapedthumbnail, - folder=True), tipo="tv")) + folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -201,7 +203,7 @@ def lista_serie(item): for scrapedurl, scrapedimg, scrapedtitle in matches: scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="episodi", title=scrapedtitle, @@ -210,7 +212,8 @@ def lista_serie(item): thumbnail=scrapedimg, extra=item.extra, show=scrapedtitle, - folder=True), tipo="tv")) + folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/guardogratis.py b/plugin.video.alfa/channels/guardogratis.py index dd04b0bf..61844e71 100644 --- a/plugin.video.alfa/channels/guardogratis.py +++ b/plugin.video.alfa/channels/guardogratis.py @@ -12,7 +12,7 @@ from platformcode import logger, config from core import scrapertools from core import servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb __channel__ = "guardogratis" @@ -84,7 +84,7 @@ def list_titles(item): rate=' IMDb: [[COLOR orange]%s[/COLOR]]' % match.group(4) if match.group(4)!='N/A'else '' scrapedtitle = scrapertools.unescape(match.group(3)) #scrapedtitle = scrapertools.unescape(match.group(3))+rate - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos" if not 'tvshow' in item.extra else 'serietv', contentType="movie" if not 'tvshow' in item.extra else 'serie', @@ -94,7 +94,7 @@ def list_titles(item): url=scrapedurl, thumbnail=scrapedthumbnail, extra=item.extra, - viewmode="movie_with_plot"), tipo=tipo)) + viewmode="movie_with_plot")) nextpage_regex='' if item.extra in "movies,tvshow": @@ -113,6 +113,7 @@ def list_titles(item): extra=item.extra, thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png")) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def search(item, texto): @@ -176,7 +177,7 @@ def serietv(item): scrapedtitle = scrapedtitle.replace("/", "") scrapedtitle = scrapedtitle.replace("-", " ") scrapedtitle = scrapedtitle.title() - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", fulltitle=scrapedtitle, @@ -185,7 +186,7 @@ def serietv(item): url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, - folder=True), tipo='tv')) + folder=True)) if config.get_videolibrary_support() and len(itemlist) != 0: itemlist.append( @@ -196,6 +197,7 @@ def serietv(item): extra="serietv", show=item.show)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist def findvideos(item): diff --git a/plugin.video.alfa/channels/ilgeniodellostreaming.py b/plugin.video.alfa/channels/ilgeniodellostreaming.py index f9e2f0b0..4259c614 100644 --- a/plugin.video.alfa/channels/ilgeniodellostreaming.py +++ b/plugin.video.alfa/channels/ilgeniodellostreaming.py @@ -10,7 +10,7 @@ from core import scrapertools, servertools, httptools from core.item import Item from channels import autoplay from channels import filtertools -from core.tmdb import infoIca +from core import tmdb __channel__ = "ilgeniodellostreaming" @@ -146,7 +146,7 @@ def peliculas_src(item): logger.info("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]") if scrapedtipo == "TV": - itemlist.append(infoIca( + itemlist.append( Item(channel=__channel__, action="episodios", fulltitle=scrapedtitle, @@ -154,9 +154,9 @@ def peliculas_src(item): title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, thumbnail=scrapedthumbnail, - folder=True), tipo='tv')) + folder=True)) else: - itemlist.append(infoIca( + itemlist.append( Item(channel=__channel__, action="findvideos", contentType="movie", @@ -165,8 +165,9 @@ def peliculas_src(item): title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, thumbnail=scrapedthumbnail, - folder=True), tipo='movie')) + folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -184,7 +185,7 @@ def peliculas(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=__channel__, action="findvideos", contentType="movie", @@ -194,9 +195,9 @@ def peliculas(item): url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, - folder=True), tipo='movie')) + folder=True)) - # Paginazione + # Paginazione patronvideos = '[^<]+<[^>]+>= p * PERPAGE: break scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=__channel__, action="findvideos", fulltitle=scrapedtitle, @@ -245,7 +247,7 @@ def nuoviep(item): url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, - folder=True), tipo='tv')) + folder=True)) if len(matches) >= p * PERPAGE: scrapedurl = item.url + '{}' + str(p + 1) @@ -258,6 +260,7 @@ def nuoviep(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -275,7 +278,7 @@ def serie(item): for scrapedurl, scrapedthumbnail, scrapedtitle in matches: scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca( + itemlist.append( Item(channel=__channel__, action="episodios", fulltitle=scrapedtitle, @@ -284,9 +287,9 @@ def serie(item): url=scrapedurl, thumbnail=scrapedthumbnail, plot=scrapedplot, - folder=True), tipo='tv')) + folder=True)) - # Paginazione + # Paginazione patronvideos = '[^<]+<[^>]+>|

))' % scrapedepisode - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos_single_ep", title=completetitle, @@ -194,8 +194,9 @@ def latestep(item): fulltitle=scrapedtitle, url=scrapedurl, extra=ep_pattern, - folder=True), tipo='tv')) + folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -216,7 +217,7 @@ def peliculas(item): plot = "" thumbnail = scrapertools.find_single_match(match, 'data-echo="([^"]+)"') - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, extra=item.extra, action='findvideos', @@ -228,7 +229,7 @@ def peliculas(item): thumbnail=thumbnail, plot=plot, viewmode="movie_with_plot", - folder=True), tipo='movie')) + folder=True)) # Pagina successiva try: @@ -244,6 +245,7 @@ def peliculas(item): except: pass + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -292,7 +294,7 @@ def peliculas_tv(item): plot = "" thumbnail = scrapertools.find_single_match(match, 'data-echo="([^"]+)"') - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, extra=item.extra, action='episodios', @@ -303,7 +305,7 @@ def peliculas_tv(item): thumbnail=thumbnail, plot=plot, viewmode="movie_with_plot", - folder=True), tipo='tv')) + folder=True)) # Successivo try: @@ -319,6 +321,7 @@ def peliculas_tv(item): except: pass + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -336,7 +339,7 @@ def pel_tv(item): thumbnail = "" url = scrapedurl - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, extra=item.extra, action='episodios', @@ -347,7 +350,7 @@ def pel_tv(item): thumbnail=thumbnail, plot=plot, viewmode="movie_with_plot", - folder=True), tipo='tv')) + folder=True)) # Siguiente try: @@ -363,6 +366,7 @@ def pel_tv(item): except: pass + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/italiafilmhd.py b/plugin.video.alfa/channels/italiafilmhd.py index a021e6ab..0e42106a 100644 --- a/plugin.video.alfa/channels/italiafilmhd.py +++ b/plugin.video.alfa/channels/italiafilmhd.py @@ -12,7 +12,7 @@ from channels import autoplay from channels import filtertools from core import scrapertools, servertools, httptools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from platformcode import logger, config IDIOMAS = {'Italiano': 'IT'} @@ -158,7 +158,7 @@ def fichas(item): # ------------------------------------------------ scrapedthumbnail = httptools.get_url_headers(scrapedthumbnail) # ------------------------------------------------ - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", @@ -166,7 +166,7 @@ def fichas(item): url=scrapedurl, thumbnail=scrapedthumbnail, fulltitle=title, - show=scrapedtitle), tipo='movie')) + show=scrapedtitle)) # Paginación next_page = scrapertools.find_single_match(data, '
i: continue if i >= p * PERPAGE: break scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca(Item(channel=item.channel, + itemlist.append(Item(channel=item.channel, contentType="movie", action="findvideos", title=scrapedtitle, @@ -172,7 +174,7 @@ def peliculas(item): url=scrapedurl, fanart=item.fanart if item.fanart != "" else item.scrapedthumbnail, show=item.fulltitle, - folder=True), tipo='movie')) + folder=True)) if len(matches) >= p * PERPAGE: scrapedurl = item.url + '{}' + str(p + 1) @@ -185,6 +187,7 @@ def peliculas(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist @@ -208,14 +211,14 @@ def lista_serie(item): if (p - 1) * PERPAGE > i: continue if i >= p * PERPAGE: break scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - itemlist.append(infoIca(Item(channel=item.channel, + itemlist.append(Item(channel=item.channel, action="episodios", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, fanart=item.fanart if item.fanart != "" else item.scrapedthumbnail, show=item.fulltitle, - folder=True), tipo='tv')) + folder=True)) if len(matches) >= p * PERPAGE: scrapedurl = item.url + '{}' + str(p + 1) @@ -228,6 +231,7 @@ def lista_serie(item): thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png", folder=True)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) return itemlist diff --git a/plugin.video.alfa/channels/piratestreaming.py b/plugin.video.alfa/channels/piratestreaming.py index 3ff81990..28ee0b3d 100644 --- a/plugin.video.alfa/channels/piratestreaming.py +++ b/plugin.video.alfa/channels/piratestreaming.py @@ -11,7 +11,7 @@ from channels import autoplay from channels import filtertools from core import httptools, scrapertools, servertools from core.item import Item -from core.tmdb import infoIca +from core import tmdb from lib import unshortenit from platformcode import logger, config @@ -85,7 +85,7 @@ def peliculas(item): scrapedthumbnail = "" scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() - itemlist.append(infoIca( + itemlist.append( Item(channel=item.channel, action="findvideos", contentType="movie", @@ -96,9 +96,9 @@ def peliculas(item): thumbnail=scrapedthumbnail, plot=scrapedplot, extra=item.extra, - folder=True), tipo='movie')) + folder=True)) - # Paginazione + # Paginazione patronvideos = '