From b5c06e279ef0a905a9a1ee64bd9fc9e6c3fe2b0a Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 20 Apr 2020 17:00:33 +0200 Subject: [PATCH] =?UTF-8?q?supporto=20ai=20tag=20qualit=C3=A0=20filmpertut?= =?UTF-8?q?ti=20e=20tantifilm=20tipologia=20movie=20per=20le=20novit=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- channels/filmpertutti.py | 2 +- channels/tantifilm.py | 1 + core/support.py | 20 ++++++++++++++------ platformcode/platformtools.py | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py index 0589367f..8f8ffbe9 100644 --- a/channels/filmpertutti.py +++ b/channels/filmpertutti.py @@ -155,6 +155,6 @@ def newest(categoria): def findvideos(item): if item.contentType == 'movie': data = httptools.downloadpage(item.url).data - return support.server(item, data=data) + return support.server(item, data=data, patronTag='Versione: <[^>]+>([^<]+)') else: return support.server(item, item.url) diff --git a/channels/tantifilm.py b/channels/tantifilm.py index 0575fe86..e0cba0e1 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -203,4 +203,5 @@ def findvideos(item): log('URLS',urls) itemlist = support.server(item, urls) + support.addQualityTag(item, itemlist, data, 'Keywords:\s*(?:)?([^<]+)') return itemlist diff --git a/core/support.py b/core/support.py index e8db22bf..a6c1dd86 100755 --- a/core/support.py +++ b/core/support.py @@ -1236,7 +1236,7 @@ def addQualityTag(item, itemlist, data, patron): "MP3": "codec per compressione audio utilizzato MP3.", "RESYNC": "il film รจ stato lavorato e re sincronizzato con una traccia audio. A volte potresti riscontrare una mancata sincronizzazione tra audio e video.", } - qualityStr = scrapertools.find_single_match(data, patron).strip() + qualityStr = scrapertools.find_single_match(data, patron).strip().upper() if PY3: qualityStr = qualityStr.encode('ascii', 'ignore') else: @@ -1244,11 +1244,19 @@ def addQualityTag(item, itemlist, data, patron): if qualityStr: try: - splitted = qualityStr.split('.') - video = splitted[-1] - audio = splitted[-2] - descr = typo(video + ': ', 'color kod') + defQualVideo.get(video.upper(), '') + '\n' +\ - typo(audio + ': ', 'color kod') + defQualAudio.get(audio.upper(), '') + video, audio, descr = None, None, '' + for tag in defQualVideo: + if tag in qualityStr: + video = tag + break + for tag in defQualAudio: + if tag in qualityStr: + audio = tag + break + if video: + descr += typo(video + ': ', 'color kod') + defQualVideo.get(video, '') + '\n' + if audio: + descr += typo(audio + ': ', 'color kod') + defQualAudio.get(audio, '') + '\n' except: descr = '' itemlist.insert(0, diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 5d7de2ac..e579d38b 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -253,7 +253,7 @@ def set_view_mode(item, parent_item): xbmcplugin.setContent(handle=int(sys.argv[1]), content='') xbmc.executebuiltin('Container.SetViewMode(%s)' % 55) - elif (item.contentType in ['movie'] and parent_item.action in ['peliculas']) \ + elif (item.contentType in ['movie'] and parent_item.action in ['peliculas', 'novedades']) \ or (item.channel in ['videolibrary'] and parent_item.action in ['list_movies']) \ or parent_item.action in ['now_on_tv', 'now_on_misc', 'now_on_misc_film']: mode('movie', 'movies')