diff --git a/channels/altadefinizione01_club.json b/channels/altadefinizione01_club.json index b77e45d7..b4cadae2 100644 --- a/channels/altadefinizione01_club.json +++ b/channels/altadefinizione01_club.json @@ -1,7 +1,7 @@ { "id": "altadefinizione01_club", "name": "Altadefinizione01 C", - "active": "enable", + "active": false, "adult": false, "language": ["ita"], "fanart": "https://www.altadefinizione01.vision/templates/Darktemplate/images/logo.png", @@ -11,14 +11,6 @@ "movie" ], "settings": [ - { - "id": "channel_host", - "type": "text", - "label": "Host del canale", - "default": "https://altadefinizione01.estate/", - "enabled": true, - "visible": true - }, { "id": "modo_grafico", "type": "bool", diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json index 333298d4..67742a84 100644 --- a/channels/eurostreaming.json +++ b/channels/eurostreaming.json @@ -4,8 +4,8 @@ "active": true, "adult": false, "language": ["ita"], - "thumbnail": "https://eurostreaming.cafe/wp-content/uploads/2017/08/logocafe.png", - "bannermenu": "https://eurostreaming.cafe/wp-content/uploads/2017/08/logocafe.png", + "thumbnail": "eurostreaming.png", + "banner": "eurostreaming.png", "categories": ["tvshow","anime","vosi"], "settings": [ { diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index d007fdda..fdcdb4a6 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -4,15 +4,12 @@ # by Greko # ------------------------------------------------------------ """ - Riscritto per poter usufruire del decoratore support.scrape Problemi noti: - Alcune sezioni di anime-cartoni non vanno, alcune hanno solo la lista degli episodi, ma non hanno link + Alcune sezioni di anime-cartoni non vanno, alcune hanno solo la lista degli episodi, ma non hanno link, altre cambiano la struttura """ - -#import channelselector -#from specials import autoplay#, filtertools -from core import scrapertoolsV2, httptools, support#, servertools, tmdb +import re +from core import scrapertoolsV2, httptools, support from core.item import Item from platformcode import logger, config @@ -23,82 +20,59 @@ headers = [['Referer', host]] list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload'] list_quality = ['default'] -checklinks = config.get_setting('checklinks', 'cineblog01') -checklinks_number = config.get_setting('checklinks_number', 'cineblog01') - IDIOMAS = {'Italiano': 'ITA', 'Sub-ITA':'vosi'} list_language = IDIOMAS.values() @support.menu def mainlist(item): support.log() - tvshow = [ -## ('tvshow', [ '', 'peliculas', '', 'tvshow']), # mettere sempre episode per serietv, anime!! ('Archivio ', ['/category/serie-tv-archive/', 'peliculas', '', 'tvshow']), ('Aggiornamenti ', ['/aggiornamento-episodi/', 'peliculas', True, 'tvshow']) ] - anime =[ - ('Anime / Cartoni', ['/category/anime-cartoni-animati/','peliculas', '', 'tvshow']) - ] - + anime = ['/category/anime-cartoni-animati/'] return locals() -#### itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality) -## # autoplay -## support.aplay(item, itemlist, list_servers, list_quality) -## # configurazione canale -## support.channel_config(item, itemlist) -## -## return itemlist + @support.scrape def peliculas(item): -## import web_pdb; web_pdb.set_trace() support.log() + action = 'episodios' if item.args == True: patron = r'(?P.*?).[^–]<a href="(?P<url>[^"]+)"'\ '\s+target="_blank">(?P<episode>\d+x\d+) (?P<title2>.*?)</a>' - -## # permette di vedere episodio e titolo + titolo2 in novità -## def itemHook(item): -## item.show = item.episode + item.title -## return item + # permette di vedere episodio e titolo + titolo2 in novità + def itemHook(item): + item.show = item.episode + item.title + return item else: patron = r'<div class="post-thumb">.*?\s<img src="(?P<thumb>[^"]+)".*?>'\ '<a href="(?P<url>[^"]+)".*?>(?P<title>.*?(?:\((?P<year>\d{4})\)|(\4\d{4}))?)<\/a><\/h2>' patronNext='a class="next page-numbers" href="?([^>"]+)">Avanti »</a>' - action='episodios' - return locals() @support.scrape def episodios(item): -## import web_pdb; web_pdb.set_trace() support.log("episodios: %s" % item) - itemlist = [] + action = 'findvideos' item.contentType = 'episode' # Carica la pagina - data = httptools.downloadpage(item.url).data + data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"') #======== if 'clicca qui per aprire' in data.lower(): item.url = scrapertoolsV2.find_single_match(data, '"go_to":"([^"]+)"') item.url = item.url.replace("\\","") # Carica la pagina - data = httptools.downloadpage(item.url).data + data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"') elif 'clicca qui</span>' in data.lower(): item.url = scrapertoolsV2.find_single_match(data, '<h2 style="text-align: center;"><a href="([^"]+)">') # Carica la pagina - data = httptools.downloadpage(item.url).data + data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"') #========= -## patron = r'(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(?P<lang>ITA|SUB ITA)(?:\))?<\/div>'\ -## '<div class="su-spoiler-content su-clearfix" style="display:none">|'\ -## '(?:\s|\Wn)?(?:<strong>)?(?P<title>\d+&#.*?)(?:|–)?<a\s(?P<url>.*?)<\/a><br\s\/>)' - patron = r'(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(?P<lang>ITA|SUB ITA)(?:\))?<\/div>'\ - '<div class="su-spoiler-content su-clearfix" style="display:none">|'\ - '(?:\s|\Wn)?(?:|<strong>)?(?P<episode>\d+&#\d+;\d+)(?:|</strong>) '\ - '(?P<title>.*?)(?:|–)?<a\s(?P<url>.*?)<\/a><br\s\/>)' - action = 'findvideos' + data = re.sub('\n|\t', ' ', data) + patronBlock = r'(?P<block>STAGIONE\s\d+ (?:\()?(?P<lang>ITA|SUB ITA)(?:\))?<\/div>.*?)</div></div>' + patron = r'(?:\s|\Wn)?(?:|<strong>)?(?P<episode>\d+&#\d+;\d+)(?:|</strong>) (?P<title>.*?)(?:|–)?<a\s(?P<url>.*?)<\/a><br\s\/>' return locals() @@ -112,6 +86,7 @@ def findvideos(item): def search(item, texto): support.log() item.url = "%s/?s=%s" % (host, texto) + item.contentType = 'tvshow' try: return peliculas(item) # Continua la ricerca in caso di errore @@ -126,7 +101,7 @@ def newest(categoria): support.log() itemlist = [] item = Item() - item.contentType = 'episode' + item.contentType = 'tvshow' item.args = True try: item.url = "%s/aggiornamento-episodi/" % host diff --git a/core/support.py b/core/support.py index 67996042..1d53516b 100644 --- a/core/support.py +++ b/core/support.py @@ -166,7 +166,7 @@ def scrapeLang(scraped, lang, longtitle): def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, typeContentDict, typeActionDict, blacklist, search, pag, function): itemlist = [] - + log("scrapeBlock qui", block, patron) matches = scrapertoolsV2.find_multiple_matches_groups(block, patron) log('MATCHES =', matches) @@ -337,7 +337,7 @@ def scrape(func): log('DATA =', data) if patronBlock: - blocks = scrapertoolsV2.find_multiple_matches_groups(data, patronBlock) + blocks = scrapertoolsV2.find_multiple_matches_groups(data, patronBlock) block = "" for bl in blocks: blockItemlist, blockMatches = scrapeBlock(item, args, bl['block'], patron, headers, action, pagination, debug, diff --git a/resources/media/channels/banner/eurostreaming.png b/resources/media/channels/banner/eurostreaming.png new file mode 100644 index 00000000..0a3bb144 Binary files /dev/null and b/resources/media/channels/banner/eurostreaming.png differ diff --git a/resources/media/channels/thumb/eurostreaming.png b/resources/media/channels/thumb/eurostreaming.png new file mode 100644 index 00000000..2ca40328 Binary files /dev/null and b/resources/media/channels/thumb/eurostreaming.png differ