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
2020-06-06 13:26:05 +02:00
parent 9a3556da34
commit bdb6422218
23 changed files with 35 additions and 58 deletions
--- 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", 
--- 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",
--- 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",
--- 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": []
 }
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -124,7 +124,7 @@ def peliculas(item):
        action = 'episodios'
        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()

--- 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": []
 }
--- 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'<div class="container">.*?class="col-md-12[^"]*?">(?P<block>.*?)<div class=(?:"container"|"bg-dark ")>'
    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>[^\)]+)\)">'
    elif item.contentType == 'tvshow':
        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
        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'
--- 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": []
 }
--- 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": []
 }
--- 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'])
    ]

--- 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

--- 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",
--- 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">'
--- 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()

--- 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": []
 }
--- 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",
--- 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": []
 }
--- 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": []
 }
--- 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)
--- 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))[^>]+>'
--- 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()

--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -716,7 +716,8 @@ 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":
+        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())))

--- 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