diff --git a/channels/filmigratis.py b/channels/filmigratis.py index fd557f7d..39b4bfff 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -117,7 +117,7 @@ def categorias_film(item): for scrapedurl, scrapedtitle in matches: itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="peliculas_categorias", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, @@ -139,7 +139,7 @@ def categorias_serie(item): for scrapedurl, scrapedtitle in matches: itemlist.append( - Item(channel=channel, + Item(channel=__channel__, contentType='tvshow', action="peliculas_serie", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", diff --git a/channels/mondolunatico2.py b/channels/mondolunatico2.py index 2f4b18ef..075ca1d1 100644 --- a/channels/mondolunatico2.py +++ b/channels/mondolunatico2.py @@ -57,7 +57,7 @@ def carousel(item, regex=r'

Ultime Richieste Inserite

(.*?)
', con scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) scrapedtitle = re.sub(r'[0-9]{4}', "", scrapedtitle) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="findvideos", contentType=contentType, title=scrapedtitle + " " + "[COLOR orange][" + year + "][/COLOR]", @@ -113,7 +113,7 @@ def top_imdb(item, contentType='movie', regex=r'(.*?)

') scrapedtitle = re.sub(r'[0-9]{4}', "", scrapedtitle) scrapedthumbnail = scrapedthumbnail.replace ("-90x135","").replace("/w92/", "/w600_and_h900_bestv2/") itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="findvideos" if "movie" in contentType else "episodios", contentType=item.contentType, contentTitle=scrapedtitle, @@ -128,7 +128,7 @@ def top_imdb(item, contentType='movie', regex=r'(.*?)

') thumbnail = thumb(itemlist=[]) scrapedurl = item.url + '{}' + str(p + 1) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, contentType=item.contentType, action="top_imdb", title="[COLOR blue][B]Successivo >[/B][/COLOR]", @@ -173,7 +173,7 @@ def peliculas(item): scrapedtitle = re.sub(r'[0-9]{4}', "", scrapedtitle) type = "[COLOR aqua][Serie][/COLOR]" if "tvshows" in item.args else "[COLOR aqua][Film][/COLOR]" itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="episodios" if "tvshows" in item.args else "findvideos", contentType="episode" if "tvshows" in item.args else "movie", title=scrapedtitle + " " + "[COLOR orange][" + year + "][/COLOR]" + " " + type, @@ -223,7 +223,7 @@ def episodios(item): matches = re.compile(patron, re.DOTALL).findall(block) for scrapedurl, scrapedtitle in matches: itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="videoplayer", contentType=item.contentType, title=scrapedtitle, @@ -250,7 +250,7 @@ def episodios(item): if len(matches) > 1: for scrapedtitle, scrapedurl in matches: itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="player_list", contentType=item.contentType, title=scrapedtitle, @@ -310,7 +310,7 @@ def player(item): for scrapedurl in matches: scrapedurl = "https://fvs.io/" + scrapedurl itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="play", contentType=item.contentType, title=item.title, @@ -345,7 +345,7 @@ def player_list(item): scrapedtitle = re.sub('Pir8|UBi|M L|BEDLAM|REPACK|DD5.1|bloody|SVU', '', scrapedtitle) scrapedtitle = scrapedtitle.replace(".", " ").replace(" - ", " ").replace(" -", "").replace(" ", "") itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="halfplayer", contentType=item.contentType, title=scrapedtitle, @@ -393,7 +393,7 @@ def dooplayer(item): for scrapedurl in matches: scrapedurl = "https://fvs.io/" + scrapedurl itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="play", contentType=item.contentType, title=item.title, diff --git a/channels/toonitalia.py b/channels/toonitalia.py index a5f53497..5d3d4ada 100644 --- a/channels/toonitalia.py +++ b/channels/toonitalia.py @@ -63,7 +63,7 @@ def insert(item): scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="episodios", contentType="episode", title=scrapedtitle, @@ -77,7 +77,7 @@ def insert(item): if len(matches) >= p * minpage: scrapedurl = item.url + '{}' + str(p + 1) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, args=item.args, action="insert", title="[COLOR blue][B]Successivo >[/B][/COLOR]", @@ -109,7 +109,7 @@ def updates(item): scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="episodios", contentType="episode", title=scrapedtitle, @@ -141,7 +141,7 @@ def most_view(item): scrapedplot = "" scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="episodios", contentType="episode", title=scrapedtitle, @@ -177,7 +177,7 @@ def list(item): scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) scrapedplot = "" itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action = 'episodios' if not 'film' in item.args else 'findvideos', contentType=item.contentType, title=scrapedtitle, @@ -190,7 +190,7 @@ def list(item): if len(matches) >= p * minpage: scrapedurl = item.url + '{}' + str(p + 1) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, args=item.args, contentType=item.contentType, action="list", @@ -224,7 +224,7 @@ def peliculas(item): if i >= p * minpage: break scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="episodios", contentType="episode", title=scrapedtitle, @@ -236,7 +236,7 @@ def peliculas(item): if len(matches) >= p * minpage: scrapedurl = item.url + '{}' + str(p + 1) itemlist.append( - Item(channel=channel, + Item(channel=__channel__, extra=item.extra, action="peliculas", title="[COLOR blue][B]Successivo >[/B][/COLOR]", @@ -273,7 +273,7 @@ def episodios(item): else: itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="findvideos", contentType=item.contentType, title="[COLOR azure]" + scrapedtitle + "[/COLOR]", @@ -298,7 +298,7 @@ def episodios(item): else: itemlist.append( - Item(channel=channel, + Item(channel=__channel__, action="findvideos", contentType=item.contentType, title="[COLOR azure]" + scrapedtitle + "[/COLOR]",