diff --git a/channels.json b/channels.json index e42f75b6..af2f9220 100644 --- a/channels.json +++ b/channels.json @@ -3,9 +3,9 @@ "altadefinizione01_club": "https://www.altadefinizione01.cc", "altadefinizione01_link": "http://altadefinizione01.town", "altadefinizioneclick": "https://altadefinizione.cloud", - "altadefinizionehd": "https://altadefinizionetv.best", + "altadefinizionehd": "https://altadefinizione.wtf", "animeforce": "https://ww1.animeforce.org", - "animeleggendari": "https://animepertutti.net", + "animeleggendari": "https://animepertutti.com", "animespace": "http://www.animespace.tv", "animestream": "https://www.animeworld.it", "animesubita": "http://www.animesubita.org", @@ -45,10 +45,10 @@ "serietvonline": "https://serietvonline.tech", "serietvsubita": "http://serietvsubita.xyz", "serietvu": "https://www.serietvu.club", - "streamingaltadefinizione": "https://www.streamingaltadefinizione.me", + "streamingaltadefinizione": "https://www.popcornstream.best", "streamtime": "https://t.me/s/StreamTime", "tantifilm": "https://www.tantifilm.eu", "toonitalia": "https://toonitalia.org", - "vedohd": "https://vedohd.icu/", + "vedohd": "https://vedohd.video", "vvvvid": "https://www.vvvvid.it" -} +} \ No newline at end of file diff --git a/channels/streamingaltadefinizione.json b/channels/streamingaltadefinizione.json index 1cca3246..2fbcfdb5 100644 --- a/channels/streamingaltadefinizione.json +++ b/channels/streamingaltadefinizione.json @@ -1,19 +1,11 @@ { "id": "streamingaltadefinizione", - "name": "Streaming Altadefinizione", + "name": "Popcorn Stream", "language": ["ita"], "active": true, "adult": false, - "thumbnail": "https://www.streamingaltadefinizione.world/wp-content/uploads/2018/09/StreamingAltadefinizioneLogo.png", + "thumbnail": "https://www.popcornstream.best/wp-content/uploads/2019/09/PopLogo40.png", + "banner": "https://www.popcornstream.info/media/PopcornStream820x428.png", "categories": ["movie","tvshow","anime"], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Includi in Ricerca Globale", - "default": true, - "enabled": true, - "visible": true - } - ] + "settings": [] } diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index 12b641a5..41b4b8e3 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -11,7 +11,6 @@ from core import support from core.item import Item -from specials import autoplay from platformcode import config __channel__ = "streamingaltadefinizione" @@ -49,7 +48,8 @@ def generos(item): def peliculas(item): - return support.dooplay_films(item) + support.dbg() + return support.dooplay_peliculas(item, True if "/genere/anime/" in item.url else False) def episodios(item): @@ -59,20 +59,16 @@ def episodios(item): def findvideos(item): itemlist = [] for link in support.dooplay_get_links(item, host): - server = link['server'][:link['server'].find(".")] - itemlist.append( - Item(channel=item.channel, - action="play", - title=server + " [COLOR blue][" + link['title'] + "][/COLOR]", - url=link['url'], - server=server, - fulltitle=item.fulltitle, - thumbnail=item.thumbnail, - show=item.show, - quality=link['title'], - contentType=item.contentType, - folder=False)) + if link['title'] != 'Guarda il trailer': + itemlist.append( + Item(channel=item.channel, + action="play", + url=link['url'], + fulltitle=item.fulltitle, + thumbnail=item.thumbnail, + show=item.show, + quality=link['title'], + contentType=item.contentType, + folder=False)) - autoplay.start(itemlist, item) - - return itemlist + return support.server(item, itemlist=itemlist) diff --git a/channels/vedohd.py b/channels/vedohd.py index fb7803d8..b5b30e7f 100644 --- a/channels/vedohd.py +++ b/channels/vedohd.py @@ -40,7 +40,7 @@ def search(item, text): def peliculas(item): - return support.dooplay_films(item, blacklist) + return support.dooplay_peliculas(item, blacklist) def findvideos(item): diff --git a/core/support.py b/core/support.py index 7961ce0a..ca833350 100644 --- a/core/support.py +++ b/core/support.py @@ -340,10 +340,10 @@ def scrape(func): # IMPORTANT 'type' is a special key, to work need typeContentDict={} and typeActionDict={} def wrapper(*args): - function = func.__name__ itemlist = [] args = func(*args) + function = func.__name__ if not 'actLike' in args else args['actLike'] # log('STACK= ',inspect.stack()[1][3]) item = args['item'] @@ -497,17 +497,15 @@ def dooplay_get_links(item, host): @scrape def dooplay_get_episodes(item): - item.contentType = "episode" patron = '
  • .*?[^"]+).*?(?P[0-9]+ - [0-9]+).*?(?P[^<>]+).*?(?P<year>[0-9]{4})' - - def itemlistHook(itemlist): - return videolibrary(itemlist, item, function='episodios') + actLike = 'episodios' return locals() @scrape -def dooplay_films(item, blacklist=""): +def dooplay_peliculas(item, mixed=False, blacklist=""): + actLike = 'peliculas' if item.args == 'searchPage': return dooplay_search_vars(item, blacklist) else: @@ -516,7 +514,7 @@ def dooplay_films(item, blacklist=""): patron = '<article id="post-[0-9]+" class="item movies">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?<span class="quality">(?P<quality>[^<>]+).*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>[^<>]*(?P<year>[0-9]{4})</span>|</article>).*?(?:<span>(?P<duration>[0-9]+) min</span>|</article>).*?(?:<div class="texto">(?P<plot>[^<>]+)|</article>).*?(?:genres">(?P<genre>.*?)</div>|</article>)' else: action = 'episodios' - patron = '<article id="post-[0-9]+" class="item tvshows">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?(?:<span class="quality">(?P<quality>[^<>]+))?.*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>(?P<year>[0-9]{4})</span>|</article>).*?(?:<div class="texto">(?P<plot>[^<>]+)|</article>).*?(?:genres">(?P<genre>.*?)</div>|</article>)' + patron = '<article id="post-[0-9]+" class="item ' + ('\w+' if mixed else 'tvshow') + '">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?(?:<span class="quality">(?P<quality>[^<>]+))?.*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>(?P<year>[0-9]{4})</span>|</article>).*?(?:<div class="texto">(?P<plot>[^<>]+)|</article>).*?(?:genres">(?P<genre>.*?)</div>|</article>)' patronNext = '<div class="pagination">.*?class="current".*?<a href="([^"]+)".*?<div class="resppages">' addVideolibrary = False @@ -536,6 +534,7 @@ def dooplay_search_vars(item, blacklist): action = 'episodios' patron = '<div class="result-item">.*?<img src="(?P<thumb>[^"]+)".*?<span class="' + type + '">(?P<quality>[^<>]+).*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a>.*?<span class="year">(?P<year>[0-9]{4}).*?<div class="contenido"><p>(?P<plot>[^<>]+)' patronNext = '<a class="arrow_pag" href="([^"]+)"><i id="nextpagination"' + def fullItemlistHook(itemlist): # se รจ una next page if itemlist[-1].title == typo(config.get_localized_string(30992), 'color kod bold'): @@ -905,16 +904,19 @@ def pagination(itemlist, item, page, perpage, function_level=1): def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, down_load=True): - if not data: + if not (data and itemlist): data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data - itemList = servertools.find_video_items(data=str(data)) itemlist = itemlist + itemList for videoitem in itemlist: + if not videoitem.server: + findS = servertools.findvideos(videoitem.url)[0] + videoitem.server = findS[2] + videoitem.title = findS[0] item.title = item.contentTitle if config.get_localized_string(30161) in item.title else item.title - videoitem.title = item.title + typo(videoitem.title, '_ color kod []') + (typo(videoitem.quality, '_ color kod []') if videoitem.quality else "") + videoitem.title = item.fulltitle + typo(videoitem.title, '_ color kod []') + (typo(videoitem.quality, '_ color kod []') if videoitem.quality else "") videoitem.fulltitle = item.fulltitle videoitem.show = item.show videoitem.thumbnail = item.thumbnail