carrellata di piccoli di fix per molti canali

casacinema e tantifilm ora funzionano di nuovo
apri nel browser ora appare anche nei menu dei canali
This commit is contained in:
marco
2020-06-06 13:26:05 +02:00
parent ac525f259f
commit 4d64da0c05
23 changed files with 35 additions and 58 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
"animetubeita": "http://www.animetubeita.com", "animetubeita": "http://www.animetubeita.com",
"animeunity": "https://www.animeunity.it", "animeunity": "https://www.animeunity.it",
"animeworld": "https://www.animeworld.tv", "animeworld": "https://www.animeworld.tv",
"casacinema": "https://www.casacinema.digital", "casacinema": "https://www.casacinema.pw",
"casacinemaInfo": "https://casacinema.life", "casacinemaInfo": "https://casacinema.life",
"cb01anime": "https://www.cineblog01.red/", "cb01anime": "https://www.cineblog01.red/",
"cinemalibero": "https://cinemalibero.plus", "cinemalibero": "https://cinemalibero.plus",
-8
View File
@@ -58,14 +58,6 @@ se vanno cancellati tutti deve rimanere la voce:
"enabled": false, "enabled": false,
"visible": false "visible": false
}, },
{
"id": "include_in_newest_italiano",
"type": "bool",
"label": "@70727",
"default": false,
"enabled": false,
"visible": false
},
{ {
"id": "checklinks", "id": "checklinks",
"type": "bool", "type": "bool",
-8
View File
@@ -23,14 +23,6 @@
"enabled": true, "enabled": true,
"visible": true "visible": true
}, },
{
"id": "include_in_newest_italiano",
"type": "bool",
"label": "Includi in Novità - Italiano",
"default": true,
"enabled": true,
"visible": true
},
{ {
"id": "checklinks", "id": "checklinks",
"type": "bool", "type": "bool",
+1
View File
@@ -6,5 +6,6 @@
"thumbnail": "animepertutti.png", "thumbnail": "animepertutti.png",
"bannermenu": "animepertutti.png", "bannermenu": "animepertutti.png",
"categories": ["anime", "vos"], "categories": ["anime", "vos"],
"not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"],
"settings": [] "settings": []
} }
+1 -1
View File
@@ -124,7 +124,7 @@ def peliculas(item):
action = 'episodios' action = 'episodios'
item.contentType = 'tvshow' item.contentType = 'tvshow'
patronNext = '<a class="?page-link"? href="?([^>]+)"?><i class="fa fa-angle-right">' patronNext = '<a class="?page-link"? href="?([^>"]+)"?><i class="fa fa-angle-right">'
return locals() return locals()
+1 -1
View File
@@ -6,6 +6,6 @@
"thumbnail": "cinemalibero.png", "thumbnail": "cinemalibero.png",
"banner": "cinemalibero.png", "banner": "cinemalibero.png",
"categories": ["movie","tvshow"], "categories": ["movie","tvshow"],
"not_active": ["include_in_newest_anime"], "not_active": ["include_in_newest_anime", "include_in_newest_peliculas"],
"settings": [] "settings": []
} }
+3 -5
View File
@@ -48,6 +48,7 @@ def mainlist(item):
@support.scrape @support.scrape
def peliculas(item): def peliculas(item):
# debug = True
action = 'check' action = 'check'
patronBlock = r'<div class="container">.*?class="col-md-12[^"]*?">(?P<block>.*?)<div class=(?:"container"|"bg-dark ")>' patronBlock = r'<div class="container">.*?class="col-md-12[^"]*?">(?P<block>.*?)<div class=(?:"container"|"bg-dark ")>'
if item.args == 'newest': if item.args == 'newest':
@@ -60,7 +61,7 @@ def peliculas(item):
patron = r'<a href="(?P<url>(?:https:\/\/.+?\/(?P<title>[^\/]+[a-zA-Z0-9\-]+)(?P<year>\d{4})))/".+?url\((?P<thumb>[^\)]+)\)">' patron = r'<a href="(?P<url>(?:https:\/\/.+?\/(?P<title>[^\/]+[a-zA-Z0-9\-]+)(?P<year>\d{4})))/".+?url\((?P<thumb>[^\)]+)\)">'
elif item.contentType == 'tvshow': elif item.contentType == 'tvshow':
if item.args == 'update': if item.args == 'update':
patron = r'<a href="(?P<url>[^"]+)".+?url\((?P<thumb>.+?)\)">\s<div class="titolo">(?P<title>.+?)(?: &#8211; 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>.+?)(?: &#8211; 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 pagination = 25
else: 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>[^\)< ]+))?' 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 = Item()
item.args = 'newest' item.args = 'newest'
try: try:
if categoria == 'peliculas': if categoria == 'series' or categoria == 'anime':
item.url = host+'/category/film/'
item.contentType = 'movie'
elif categoria == 'series' or categoria == 'anime':
item.args = 'update' item.args = 'update'
item.url = host+'/aggiornamenti-serie-tv/' item.url = host+'/aggiornamenti-serie-tv/'
item.contentType = 'tvshow' item.contentType = 'tvshow'
+1 -1
View File
@@ -6,6 +6,6 @@
"thumbnail": "cinetecadibologna.png", "thumbnail": "cinetecadibologna.png",
"banner": "cinetecadibologna.png", "banner": "cinetecadibologna.png",
"categories": ["documentary"], "categories": ["documentary"],
"not_active":["include_in_newest"], "not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"],
"settings": [] "settings": []
} }
+1 -1
View File
@@ -6,6 +6,6 @@
"thumbnail": "fastsubita.png", "thumbnail": "fastsubita.png",
"banner": "fastsubita.png", "banner": "fastsubita.png",
"categories": ["tvshow", "vos"], "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": [] "settings": []
} }
-1
View File
@@ -32,7 +32,6 @@ def mainlist(item):
Tvshow = [ Tvshow = [
('Aggiornamenti', ['', 'peliculas', '', 'update']), ('Aggiornamenti', ['', 'peliculas', '', 'update']),
('Per Lettera {TV}', ['/elenco-serie-tv/', 'genres', 'genres']),
('Cerca... {bold}{TV}', ['','search']) ('Cerca... {bold}{TV}', ['','search'])
] ]
+1 -1
View File
@@ -13,7 +13,7 @@
""" """
import re import re
from core import servertools, httptools, support from core import httptools, support
from core.item import Item from core.item import Item
from platformcode import config from platformcode import config
-8
View File
@@ -31,14 +31,6 @@
"enabled": true, "enabled": true,
"visible": true "visible": true
}, },
{
"id": "include_in_newest_italiano",
"type": "bool",
"label": "Includi in Novità - Italiano",
"default": true,
"enabled": true,
"visible": true
},
{ {
"id": "checklinks", "id": "checklinks",
"type": "bool", "type": "bool",
+1
View File
@@ -53,6 +53,7 @@ def mainlist(item):
@support.scrape @support.scrape
def peliculas(item): def peliculas(item):
log() log()
# debug = True
if item.args == 'search': if item.args == 'search':
patronBlock = r'<div class="search-page">(?P<block>.*?)<footer class="main">' patronBlock = r'<div class="search-page">(?P<block>.*?)<footer class="main">'
+4
View File
@@ -37,6 +37,10 @@ def mainlist(item):
url=item.url, url=item.url,
action='search', action='search',
thumbnail=support.thumb(thumb='search.png'))) 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 itemlist
return locals() return locals()
+1 -1
View File
@@ -6,6 +6,6 @@
"thumbnail": "netfreex.png", "thumbnail": "netfreex.png",
"banner": "netfreex.png", "banner": "netfreex.png",
"categories": ["tvshow", "movie", "anime"], "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": [] "settings": []
} }
-8
View File
@@ -23,14 +23,6 @@
"enabled": true, "enabled": true,
"visible": true "visible": true
}, },
{
"id": "include_in_newest_italiano",
"type": "bool",
"label": "Includi in Novità - Italiano",
"default": true,
"enabled": true,
"visible": true
},
{ {
"id": "checklinks", "id": "checklinks",
"type": "bool", "type": "bool",
+1
View File
@@ -6,5 +6,6 @@
"thumbnail": "popcornstream.png", "thumbnail": "popcornstream.png",
"banner": "popcornstream.png", "banner": "popcornstream.png",
"categories": ["movie","tvshow","anime"], "categories": ["movie","tvshow","anime"],
"not_active":["include_in_newest_peliculas", "include_in_newest_series", "include_in_newest_anime"],
"settings": [] "settings": []
} }
+1 -1
View File
@@ -6,6 +6,6 @@
"thumbnail": "tantifilm.png", "thumbnail": "tantifilm.png",
"banner": "tantifilm.png", "banner": "tantifilm.png",
"categories": ["tvshow", "movie", "anime"], "categories": ["tvshow", "movie", "anime"],
"not_active":["include_in_newest_anime"], "not_active":["include_in_newest_anime", "include_in_newest_peliculas"],
"settings": [] "settings": []
} }
+2 -2
View File
@@ -13,8 +13,8 @@ from platformcode import config, unify
def findhost(): def findhost():
permUrl = httptools.downloadpage('https://www.tantifilm.info/', follow_redirects=False).data permUrl = httptools.downloadpage('https://www.tantifilm.wiki/').data
host = 'https://' + scrapertools.find_single_match(permUrl, r'Ora siamo ([A-Za-z0-9./]+)') host = scrapertools.find_single_match(permUrl, r'Nuovo indirizzo: <a href="([^"]+)')
return host return host
host = config.get_channel_url(findhost) host = config.get_channel_url(findhost)
+6 -7
View File
@@ -17,8 +17,7 @@ list_quality = ['HD', 'default']
def mainlist(item): def mainlist(item):
top = [('Novità',['', 'peliculas', 'new', 'tvshow']), top = [('Novità',['', 'peliculas', 'new', 'tvshow']),
('Aggiornamenti', ['', 'peliculas', 'last', 'tvshow']), ('Aggiornamenti', ['', 'peliculas', 'last', 'tvshow'])]
('Popolari', ['', 'peliculas', 'most_view', 'tvshow'])]
tvshow = ['/lista-serie-tv/'] tvshow = ['/lista-serie-tv/']
anime =['/lista-anime-2/', anime =['/lista-anime-2/',
('Sub-Ita',['/lista-anime-sub-ita/', 'peliculas', 'sub']), ('Sub-Ita',['/lista-anime-sub-ita/', 'peliculas', 'sub']),
@@ -34,7 +33,6 @@ def search(item, texto):
item.url = host + '/?s=' + texto item.url = host + '/?s=' + texto
try: try:
return peliculas(item) return peliculas(item)
return itemlist
# Continua la ricerca in caso di errore # Continua la ricerca in caso di errore
except: except:
import sys import sys
@@ -63,6 +61,7 @@ def newest(categoria):
def peliculas(item): def peliculas(item):
pagination = '' pagination = ''
anime = True anime = True
# debug = True
blacklist = ['-Film Animazione disponibili in attesa di recensione '] blacklist = ['-Film Animazione disponibili in attesa di recensione ']
if item.args == 'search': if item.args == 'search':
@@ -72,10 +71,10 @@ def peliculas(item):
patronNext = r'<a href="([^"]+)"\s*>Articoli meno recenti' patronNext = r'<a href="([^"]+)"\s*>Articoli meno recenti'
elif item.args == 'last': elif item.args == 'last':
patronBlock = 'Aggiornamenti</h2>(?P<block>.*)</ul>' patronBlock = 'Aggiornamenti</h2>(?P<block>.*)</ul>'
patron = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>' patron = r'<a href="(?P<url>[^"]+)">\s*<img[^>]+src(?:set)?="(?P<thumbnail>[^ ]+)[^>]+>\s*<span[^>]+>(?P<title>[^<]+)'
elif item.args == 'most_view': # elif item.args == 'most_view':
patronBlock = 'I piu visti</h2>(?P<block>.*)</ul>' # patronBlock = 'I piu visti</h2>(?P<block>.*)</ul>'
patron = r'<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"' # patron = r'<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"'
elif item.args == 'new': elif item.args == 'new':
patronBlock = '<main[^>]+>(?P<block>.*)</main>' 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))[^>]+>' 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))[^>]+>'
+5
View File
@@ -13,6 +13,8 @@ from xml.dom import minidom
host = 'http://api.radiotime.com' host = 'http://api.radiotime.com'
headers = [['Referer', host]] headers = [['Referer', host]]
list_servers = ['directo']
list_quality = ['default']
@support.scrape @support.scrape
def mainlist(item): def mainlist(item):
@@ -31,6 +33,9 @@ def mainlist(item):
url = item.url, url = item.url,
action='search', action='search',
thumbnail=support.thumb(thumb='search.png'))) 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 itemlist
return locals() return locals()
+3 -2
View File
@@ -716,8 +716,9 @@ def set_context_commands(item, item_url, parent_item, **kwargs):
'channel=infoplus&action=start&from_channel=' + item.channel))) 'channel=infoplus&action=start&from_channel=' + item.channel)))
# Go to the Main Menu (channel.mainlist) # 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": if parent_item.channel not in ["news", "channelselector", "downloads"] and 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.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()))) 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 # Add to Favorites
+1 -1
View File
@@ -132,7 +132,7 @@ def get_channels_list():
## import web_pdb; web_pdb.set_trace() ## import web_pdb; web_pdb.set_trace()
## list_canales = {'peliculas': [], '4k': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [], ## list_canales = {'peliculas': [], '4k': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [],
## 'castellano': [], 'latino':[], 'italiano':[], 'torrent':[], 'documentales': []} ## 'castellano': [], 'latino':[], 'italiano':[], 'torrent':[], 'documentales': []}
list_canales = {'peliculas': [], 'series': [],'anime': [], 'italiano':[], 'documentales': []} list_canales = {'peliculas': [], 'series': [], 'anime': [], 'documentales': []}
any_active = False any_active = False
# Fill available channel lists # Fill available channel lists