diff --git a/channels.json b/channels.json index 82faaae9..b8121f4b 100644 --- a/channels.json +++ b/channels.json @@ -10,7 +10,7 @@ "animetubeita": "http://www.animetubeita.com", "animeunity": "https://www.animeunity.it", "animeworld": "https://www.animeworld.tv", - "casacinema": "https://www.casacinema.digital", + "casacinema": "https://www.casacinema.pw", "casacinemaInfo": "https://casacinema.life", "cb01anime": "https://www.cineblog01.red/", "cinemalibero": "https://cinemalibero.plus", diff --git a/channels/0example.json.txt b/channels/0example.json.txt index 1551727f..6e325e14 100644 --- a/channels/0example.json.txt +++ b/channels/0example.json.txt @@ -58,14 +58,6 @@ se vanno cancellati tutti deve rimanere la voce: "enabled": false, "visible": false }, - { - "id": "include_in_newest_italiano", - "type": "bool", - "label": "@70727", - "default": false, - "enabled": false, - "visible": false - }, { "id": "checklinks", "type": "bool", diff --git a/channels/animeforce.json b/channels/animeforce.json index 95578357..cea8ce92 100644 --- a/channels/animeforce.json +++ b/channels/animeforce.json @@ -23,14 +23,6 @@ "enabled": true, "visible": true }, - { - "id": "include_in_newest_italiano", - "type": "bool", - "label": "Includi in Novità - Italiano", - "default": true, - "enabled": true, - "visible": true - }, { "id": "checklinks", "type": "bool", diff --git a/channels/animeleggendari.json b/channels/animeleggendari.json index 74c686a5..cfab299e 100644 --- a/channels/animeleggendari.json +++ b/channels/animeleggendari.json @@ -6,5 +6,6 @@ "thumbnail": "animepertutti.png", "bannermenu": "animepertutti.png", "categories": ["anime", "vos"], + "not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"], "settings": [] } diff --git a/channels/cineblog01.py b/channels/cineblog01.py index e90f1b48..15dbf9ae 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -124,7 +124,7 @@ def peliculas(item): action = 'episodios' item.contentType = 'tvshow' - patronNext = '' + patronNext = '' return locals() diff --git a/channels/cinemalibero.json b/channels/cinemalibero.json index c64c78a3..9113bde7 100644 --- a/channels/cinemalibero.json +++ b/channels/cinemalibero.json @@ -6,6 +6,6 @@ "thumbnail": "cinemalibero.png", "banner": "cinemalibero.png", "categories": ["movie","tvshow"], - "not_active": ["include_in_newest_anime"], + "not_active": ["include_in_newest_anime", "include_in_newest_peliculas"], "settings": [] } diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index d058092d..ea703cfe 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -48,6 +48,7 @@ def mainlist(item): @support.scrape def peliculas(item): + # debug = True action = 'check' patronBlock = r'
.*?class="col-md-12[^"]*?">(?P.*?)
' if item.args == 'newest': @@ -60,7 +61,7 @@ def peliculas(item): patron = r'[^\)]+)\)">' elif item.contentType == 'tvshow': if item.args == 'update': - patron = r'.+?)\)">\s
(?P.+?)(?: – Serie TV)?(?:\([sSuUbBiItTaA\-]+\))?[ ]?(?P<year>\d{4})?</div>[ ]<div class="genere">(?:[\w]+?\.?\s?[\s|S]?[\dx\-S]+?\s\(?(?P<lang>[iItTaA]+|[sSuUbBiItTaA\-]+)\)?\s?(?P<quality>[HD]+)?|.+?\(?(?P<lang2>[sSuUbBiItTaA\-]+)?\)?</div>)' + patron = r'<a href="(?P<url>[^"]+)"[^<]+?url\((?P<thumb>.+?)\)">\s<div class="titolo">(?P<title>.+?)(?: – Serie TV)?(?:\([sSuUbBiItTaA\-]+\))?[ ]?(?P<year>\d{4})?</div>[ ](?:<div class="genere">)?(?:[\w]+?\.?\s?[\s|S]?[\dx\-S]+?\s\(?(?P<lang>[iItTaA]+|[sSuUbBiItTaA\-]+)\)?\s?(?P<quality>[HD]+)?|.+?\(?(?P<lang2>[sSuUbBiItTaA\-]+)?\)?</div>)' pagination = 25 else: patron = r'<a href="(?P<url>[^"]+)"\s*title="(?P<title>[^"\(]+)(?:"|\()(?:(?P<year>\d+)[^"]+)?.*?url\((?P<thumb>[^\)]+)\)(?:.*?<div class="voto">[^>]+>[^>]+>\s*(?P<rating>[^<]+))?.*?<div class="titolo">[^>]+>(?:<div class="genere">[^ ]*(?:\s\d+)?\s*(?:\()?(?P<lang>[^\)< ]+))?' @@ -139,10 +140,7 @@ def newest(categoria): item = Item() item.args = 'newest' try: - if categoria == 'peliculas': - item.url = host+'/category/film/' - item.contentType = 'movie' - elif categoria == 'series' or categoria == 'anime': + if categoria == 'series' or categoria == 'anime': item.args = 'update' item.url = host+'/aggiornamenti-serie-tv/' item.contentType = 'tvshow' diff --git a/channels/cinetecadibologna.json b/channels/cinetecadibologna.json index fd556a17..10adf700 100644 --- a/channels/cinetecadibologna.json +++ b/channels/cinetecadibologna.json @@ -6,6 +6,6 @@ "thumbnail": "cinetecadibologna.png", "banner": "cinetecadibologna.png", "categories": ["documentary"], - "not_active":["include_in_newest"], + "not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"], "settings": [] } diff --git a/channels/fastsubita.json b/channels/fastsubita.json index c77eaa54..eabe5c4b 100644 --- a/channels/fastsubita.json +++ b/channels/fastsubita.json @@ -6,6 +6,6 @@ "thumbnail": "fastsubita.png", "banner": "fastsubita.png", "categories": ["tvshow", "vos"], - "not_active": ["include_in_newest_peliculas", "include_in_newest_anime", "include_in_newest_italiano"], + "not_active": ["include_in_newest_peliculas", "include_in_newest_anime"], "settings": [] } diff --git a/channels/fastsubita.py b/channels/fastsubita.py index 39b746cb..77b2deb6 100644 --- a/channels/fastsubita.py +++ b/channels/fastsubita.py @@ -32,7 +32,6 @@ def mainlist(item): Tvshow = [ ('Aggiornamenti', ['', 'peliculas', '', 'update']), - ('Per Lettera {TV}', ['/elenco-serie-tv/', 'genres', 'genres']), ('Cerca... {bold}{TV}', ['','search']) ] diff --git a/channels/filmigratis.py b/channels/filmigratis.py index 345e6ac0..00bf7c57 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -13,7 +13,7 @@ """ import re -from core import servertools, httptools, support +from core import httptools, support from core.item import Item from platformcode import config diff --git a/channels/filmsenzalimiticc.json b/channels/filmsenzalimiticc.json index 04636231..76a9eb72 100644 --- a/channels/filmsenzalimiticc.json +++ b/channels/filmsenzalimiticc.json @@ -31,14 +31,6 @@ "enabled": true, "visible": true }, - { - "id": "include_in_newest_italiano", - "type": "bool", - "label": "Includi in Novità - Italiano", - "default": true, - "enabled": true, - "visible": true - }, { "id": "checklinks", "type": "bool", diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py index e5291fac..56414785 100644 --- a/channels/ilgeniodellostreaming.py +++ b/channels/ilgeniodellostreaming.py @@ -53,6 +53,7 @@ def mainlist(item): @support.scrape def peliculas(item): log() + # debug = True if item.args == 'search': patronBlock = r'<div class="search-page">(?P<block>.*?)<footer class="main">' diff --git a/channels/metalvideo.py b/channels/metalvideo.py index 9094ac47..ec7d0a33 100644 --- a/channels/metalvideo.py +++ b/channels/metalvideo.py @@ -37,6 +37,10 @@ def mainlist(item): url=item.url, action='search', thumbnail=support.thumb(thumb='search.png'))) + + support.autoplay.init(item.channel, list_servers, list_quality) + support.autoplay.show_option(item.channel, itemlist) + support.channel_config(item, itemlist) return itemlist return locals() diff --git a/channels/netfreex.json b/channels/netfreex.json index 6c69f917..2a597d05 100644 --- a/channels/netfreex.json +++ b/channels/netfreex.json @@ -6,6 +6,6 @@ "thumbnail": "netfreex.png", "banner": "netfreex.png", "categories": ["tvshow", "movie", "anime"], - "not_active": ["include_in_newest_peliculas", "include_in_newest_anime", "include_in_newest_italiano", "include_in_newest_series"], + "not_active": ["include_in_newest_peliculas", "include_in_newest_anime", "include_in_newest_series"], "settings": [] } diff --git a/channels/serietvsubita.json b/channels/serietvsubita.json index 0db82e02..b087171f 100644 --- a/channels/serietvsubita.json +++ b/channels/serietvsubita.json @@ -23,14 +23,6 @@ "enabled": true, "visible": true }, - { - "id": "include_in_newest_italiano", - "type": "bool", - "label": "Includi in Novità - Italiano", - "default": true, - "enabled": true, - "visible": true - }, { "id": "checklinks", "type": "bool", diff --git a/channels/streamingaltadefinizione.json b/channels/streamingaltadefinizione.json index 9666b270..9cb5d12f 100644 --- a/channels/streamingaltadefinizione.json +++ b/channels/streamingaltadefinizione.json @@ -6,5 +6,6 @@ "thumbnail": "popcornstream.png", "banner": "popcornstream.png", "categories": ["movie","tvshow","anime"], + "not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"], "settings": [] } diff --git a/channels/tantifilm.json b/channels/tantifilm.json index e9e12f8d..1cf987db 100644 --- a/channels/tantifilm.json +++ b/channels/tantifilm.json @@ -6,6 +6,6 @@ "thumbnail": "tantifilm.png", "banner": "tantifilm.png", "categories": ["tvshow", "movie", "anime"], - "not_active":["include_in_newest_anime"], + "not_active":["include_in_newest_anime", "include_in_newest_peliculas"], "settings": [] } diff --git a/channels/tantifilm.py b/channels/tantifilm.py index 6b79e9dc..d529fecf 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -13,8 +13,8 @@ from platformcode import config, unify def findhost(): - permUrl = httptools.downloadpage('https://www.tantifilm.info/', follow_redirects=False).data - host = 'https://' + scrapertools.find_single_match(permUrl, r'Ora siamo ([A-Za-z0-9./]+)') + permUrl = httptools.downloadpage('https://www.tantifilm.wiki/').data + host = scrapertools.find_single_match(permUrl, r'Nuovo indirizzo: <a href="([^"]+)') return host host = config.get_channel_url(findhost) diff --git a/channels/toonitalia.py b/channels/toonitalia.py index c30f7497..582c259e 100644 --- a/channels/toonitalia.py +++ b/channels/toonitalia.py @@ -17,8 +17,7 @@ list_quality = ['HD', 'default'] def mainlist(item): top = [('Novità',['', 'peliculas', 'new', 'tvshow']), - ('Aggiornamenti', ['', 'peliculas', 'last', 'tvshow']), - ('Popolari', ['', 'peliculas', 'most_view', 'tvshow'])] + ('Aggiornamenti', ['', 'peliculas', 'last', 'tvshow'])] tvshow = ['/lista-serie-tv/'] anime =['/lista-anime-2/', ('Sub-Ita',['/lista-anime-sub-ita/', 'peliculas', 'sub']), @@ -34,7 +33,6 @@ def search(item, texto): item.url = host + '/?s=' + texto try: return peliculas(item) - return itemlist # Continua la ricerca in caso di errore except: import sys @@ -63,6 +61,7 @@ def newest(categoria): def peliculas(item): pagination = '' anime = True + # debug = True blacklist = ['-Film Animazione disponibili in attesa di recensione '] if item.args == 'search': @@ -72,10 +71,10 @@ def peliculas(item): patronNext = r'<a href="([^"]+)"\s*>Articoli meno recenti' elif item.args == 'last': patronBlock = 'Aggiornamenti</h2>(?P<block>.*)</ul>' - patron = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>' - elif item.args == 'most_view': - patronBlock = 'I piu visti</h2>(?P<block>.*)</ul>' - patron = r'<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"' + patron = r'<a href="(?P<url>[^"]+)">\s*<img[^>]+src(?:set)?="(?P<thumbnail>[^ ]+)[^>]+>\s*<span[^>]+>(?P<title>[^<]+)' + # elif item.args == 'most_view': + # patronBlock = 'I piu visti</h2>(?P<block>.*)</ul>' + # patron = r'<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"' elif item.args == 'new': patronBlock = '<main[^>]+>(?P<block>.*)</main>' patron = r'<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)".*?<p>(?P<plot>[^<]+)</p>.*?<span class="cat-links">Pubblicato in.*?.*?(?P<type>(?:[Ff]ilm|</artic))[^>]+>' diff --git a/channels/tunein.py b/channels/tunein.py index d0d33383..9e1a0d8b 100644 --- a/channels/tunein.py +++ b/channels/tunein.py @@ -13,6 +13,8 @@ from xml.dom import minidom host = 'http://api.radiotime.com' headers = [['Referer', host]] +list_servers = ['directo'] +list_quality = ['default'] @support.scrape def mainlist(item): @@ -31,6 +33,9 @@ def mainlist(item): url = item.url, action='search', thumbnail=support.thumb(thumb='search.png'))) + support.autoplay.init(item.channel, list_servers, list_quality) + support.autoplay.show_option(item.channel, itemlist) + support.channel_config(item, itemlist) return itemlist return locals() diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index fea9234f..f820ccf6 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -716,8 +716,9 @@ def set_context_commands(item, item_url, parent_item, **kwargs): 'channel=infoplus&action=start&from_channel=' + item.channel))) # Go to the Main Menu (channel.mainlist) - if parent_item.channel not in ["news", "channelselector", "downloads"] and item.action != "mainlist" and parent_item.action != "mainlist": - context_commands.insert(0, (config.get_localized_string(60349), "XBMC.Container.Refresh (%s?%s)" % (sys.argv[0], Item(channel=item.channel, action="mainlist").tourl()))) + if parent_item.channel not in ["news", "channelselector", "downloads"] and item.action != "mainlist": + if parent_item.action != "mainlist": + context_commands.insert(0, (config.get_localized_string(60349), "XBMC.Container.Refresh (%s?%s)" % (sys.argv[0], Item(channel=item.channel, action="mainlist").tourl()))) context_commands.insert(1, (config.get_localized_string(70739), "XBMC.Container.Update (%s?%s)" % (sys.argv[0], Item(action="open_browser", url=item.url).tourl()))) # Add to Favorites diff --git a/specials/news.py b/specials/news.py index 2287a15a..f4a4b225 100644 --- a/specials/news.py +++ b/specials/news.py @@ -132,7 +132,7 @@ def get_channels_list(): ## import web_pdb; web_pdb.set_trace() ## list_canales = {'peliculas': [], '4k': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [], ## 'castellano': [], 'latino':[], 'italiano':[], 'torrent':[], 'documentales': []} - list_canales = {'peliculas': [], 'series': [],'anime': [], 'italiano':[], 'documentales': []} + list_canales = {'peliculas': [], 'series': [], 'anime': [], 'documentales': []} any_active = False # Fill available channel lists