From eb390b3c440cb49dacee37cc3a931c875086b1e9 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Fri, 14 Jun 2019 21:25:54 +0200 Subject: [PATCH 1/5] new url eurostreaming --- channels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels.json b/channels.json index 5572180b..31e67294 100644 --- a/channels.json +++ b/channels.json @@ -20,7 +20,7 @@ "cinemastreaming": "https://cinemastreaming.icu", "documentaristreamingda": "https://documentari-streaming-da.com", "dreamsub": "https://www.dreamsub.stream", - "eurostreaming": "https://eurostreaming.gratis", + "eurostreaming": "https://eurostreaming.pink", "eurostreaming_video": "https://www.eurostreaming.best", "fastsubita": "http://fastsubita.com", "ffilms":"https://ffilms.org", From 9578b2d8a7f2f7da5d607f6af5d9c1b4094f2216 Mon Sep 17 00:00:00 2001 From: cttynul Date: Sat, 15 Jun 2019 01:47:21 +0200 Subject: [PATCH 2/5] Delete netlovers.py --- specials/netlovers.py | 121 ------------------------------------------ 1 file changed, 121 deletions(-) delete mode 100644 specials/netlovers.py diff --git a/specials/netlovers.py b/specials/netlovers.py deleted file mode 100644 index 8e6c3c47..00000000 --- a/specials/netlovers.py +++ /dev/null @@ -1,121 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------ -# Canale netlovers -# ------------------------------------------------------------ - -import re -import urllib -from channelselector import get_thumb -from core import httptools, scrapertools, support, tmdb -from core.item import Item -from platformcode import logger, config - -host = "https://www.netflixlovers.it" - -TIMEOUT_TOTAL = 60 - - -def mainlist(item): - logger.info(" mainlist") - itemlist = [Item(channel=item.channel, - title="Novità", - action="get_info", - url="%s/novita-su-netflix" % host, - thumbnail=item.thumbnail), - Item(channel=item.channel, - title="Prossimamente", - action="ratings", - url="%s/prossimamente-su-netflix" % host, - thumbnail=item.thumbnail), - Item(channel=item.channel, - title="Meglio del Mese", - action="ratings", - url="%s/classifiche/questo-mese" % host, - thumbnail=item.thumbnail), - Item(channel=item.channel, - title="Migliori Film", - action="ratings", - url="%s/classifiche/film" % host, - thumbnail=item.thumbnail), - Item(channel=item.channel, - title="Migliori Serie", - action="ratings", - url="%s/classifiche/migliori-serie-tv-su-netflix" % host, - thumbnail=item.thumbnail), - Item(channel=item.channel, - title="Migliori Documentari", - action="ratings", - url="%s/classifiche/documentari" % host, - thumbnail=item.thumbnail)] - - return itemlist - - -def get_info(item): - logger.info("filmontv tvoggi") - itemlist = [] - - # Carica la pagina - data = httptools.downloadpage(item.url).data - patron = r'
[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*img src="([a-zA-Z:\/\.0-9\-_]*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*alt="([A-Za-z ,:0-9\.À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&,#]*

([A-Za-z ,0-9\.À-ÖØ-öø-ÿ\-\']*)' - matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedthumbnail, scrapedtitle, scrapedinfo in matches: - # for scrapedthumbnail, scrapedtitle, scrapedtv in matches: - scrapedurl = "" - scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() - infoLabels = {} - infoLabels["plot"] = scrapedinfo - itemlist.append( - Item(channel=item.channel, - action="do_search", - extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie', - title="[B]" + scrapedtitle + "[/B]", - fulltitle="[B]" + scrapedtitle + "[/B]", - url=scrapedurl, - thumbnail=scrapedthumbnail, - contentTitle=scrapedtitle, - contentType='movie', - infoLabels=infoLabels, - folder=True)) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - - return itemlist - - -def ratings(item): - logger.info("filmontv tvoggi") - itemlist = [] - - # Carica la pagina - data = httptools.downloadpage(item.url).data - patron = r'

[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*img src="([a-zA-Z:\/\.0-9\-_]*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&]*alt="([A-Za-z ,0-9:\.À-ÖØ-öø-ÿ\-\']*)[a-z \n<>\/="_\-:0-9;A-Z.?!\'\&,#]*

([A-Za-z ,0-9\.À-ÖØ-öø-ÿ\-\']*)' - matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedthumbnail, scrapedtitle, scrapedinfo in matches: - # for scrapedthumbnail, scrapedtitle, scrapedtv in matches: - scrapedurl = "" - scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle).strip() - infoLabels = {} - infoLabels["plot"] = scrapedinfo - itemlist.append( - Item(channel=item.channel, - action="do_search", - extra=urllib.quote_plus(scrapedtitle) + '{}' + 'movie', - title="[B]" + scrapedtitle + "[/B]", - fulltitle="[B]" + scrapedtitle + "[/B]", - url=scrapedurl, - thumbnail=scrapedthumbnail, - contentTitle=scrapedtitle, - contentType='movie', - infoLabels=infoLabels, - folder=True)) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - - return itemlist - - - -def do_search(item): - from specials import search - return search.do_search(item) From e7cacde27a680fe821b982109d3518b45b113ade Mon Sep 17 00:00:00 2001 From: cttynul Date: Sat, 15 Jun 2019 01:47:35 +0200 Subject: [PATCH 3/5] Delete netlovers.json --- specials/netlovers.json | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 specials/netlovers.json diff --git a/specials/netlovers.json b/specials/netlovers.json deleted file mode 100644 index 0ca5e040..00000000 --- a/specials/netlovers.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "id": "netlovers", - "name": "Net Lovers", - "language": ["ita"], - "active": false, - "adult": false, - "thumbnail": null, - "banner": null, - "categories": [], - "settings": [], - "channel": false -} \ No newline at end of file From b6ce889ed51f6b3b28d9aeff169bde64d4c7f686 Mon Sep 17 00:00:00 2001 From: cttynul Date: Sat, 15 Jun 2019 01:55:02 +0200 Subject: [PATCH 4/5] =?UTF-8?q?-net=20from=20men=C3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- specials/search.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/specials/search.py b/specials/search.py index 50b6e2e8..b0aa0489 100644 --- a/specials/search.py +++ b/specials/search.py @@ -32,8 +32,6 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, action="sub_menu", title="[B]" + config.get_localized_string(70305)+ "[/B]", context=context, thumbnail=get_thumb("search.png"))) itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001), - thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) - itemlist.append(Item(channel="netlovers", action="mainlist", title="Net Lovers", thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) itemlist.append(Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), type='movie', thumbnail=get_thumb("genres.png"))) From 4c06d1139d6c51f4a6271bac72b1dd2b90cb0276 Mon Sep 17 00:00:00 2001 From: greko <50103632+greko17@users.noreply.github.com> Date: Sat, 15 Jun 2019 10:03:03 +0200 Subject: [PATCH 5/5] fix eurostreaming: numero stagione e newest (#50) * fix canale * fix newest * fix numero puntata --- channels/eurostreaming.json | 2 +- channels/eurostreaming.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json index c78f0e87..3fb5ddf3 100644 --- a/channels/eurostreaming.json +++ b/channels/eurostreaming.json @@ -12,7 +12,7 @@ "id": "channel_host", "type": "text", "label": "Host del canale", - "default": "https://eurostreaming.cafe/", + "default": "https://eurostreaming.cafe", "enabled": true, "visible": true }, diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index 2f153624..817cbf45 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -96,7 +96,7 @@ def episodios(item): #========= patron = r'(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?<\/div>'\ '