From 453cbe4cb57112e5e64138ce963f0aec2b2da93d Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Tue, 3 Aug 2021 20:52:07 +0200 Subject: [PATCH] Fix aggiungi videoteca su altadefinizionecommunity->ricerca, tmdb e rimosso URL shortner per "apri nel browser" in mancanza di browser --- channels/altadefinizionecommunity.py | 2 ++ core/support.py | 1 - core/tmdb.py | 9 +++------ platformcode/launcher.py | 14 +++++++------- .../language/resource.language.en_gb/strings.po | 2 +- .../language/resource.language.it_it/strings.po | 4 ++-- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/channels/altadefinizionecommunity.py b/channels/altadefinizionecommunity.py index 79247c9b..ac33dcbc 100644 --- a/channels/altadefinizionecommunity.py +++ b/channels/altadefinizionecommunity.py @@ -198,7 +198,9 @@ def findvideos(item): video_url = playWindow.match if '/tvshow' in video_url: item.data = playWindow.data + item.contentType = 'tvshow' return episodios(item) + item.contentType = 'movie' itemlist.append(item.clone(action='play', url=support.match(video_url.replace('/watch-unsubscribed', '/watch-external'), patron='src="([^"]+)').match, quality='')) itemlist.append(item.clone(action='play', server='directo', title=support.config.get_localized_string(30137), diff --git a/core/support.py b/core/support.py index a494bc20..9ac8ab52 100755 --- a/core/support.py +++ b/core/support.py @@ -627,7 +627,6 @@ def scrape(func): thumbnail=thumb(), prevthumb=item.prevthumb if item.prevthumb else item.thumbnail)) - if inspect.stack()[1][3] not in ['find_episodes']: if addVideolibrary and (item.infoLabels["title"] or item.fulltitle): # item.fulltitle = item.infoLabels["title"] diff --git a/core/tmdb.py b/core/tmdb.py index bddacd2b..6813dca1 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -210,11 +210,8 @@ def set_infoLabels_itemlist(item_list, seekTmdb=False, search_language=def_lang, def sub_thread(_item, _i, _seekTmdb): # semaphore.acquire() ret = 0 - try: - ret = set_infoLabels_item(_item, _seekTmdb, search_language, lock) - except: - import traceback - logger.error(traceback.format_exc(1)) + ret = set_infoLabels_item(_item, _seekTmdb, search_language, lock) + if lock and lock.locked(): lock.release() # logger.debug(str(ret) + "item: " + _item.tostring()) @@ -968,7 +965,7 @@ class Tmdb(object): # http://api.themoviedb.org/3/tv/1407?api_key=a1ab8b8669da03637a4b98fa39c39228&language=es # &append_to_response=images,videos,external_ids,credits&include_image_language=es,null url = ('{}/{}/{}?api_key={}&language={}&append_to_response=images,videos,external_ids,credits&include_image_language={},null'.format(host, self.search_type, self.search_id, api, self.search_language, self.search_language)) - searching = "id_Tmdb: " + self.search_id + searching = "id_Tmdb: " + str(self.search_id) else: # http://api.themoviedb.org/3/find/%s?external_source=imdb_id&api_key=a1ab8b8669da03637a4b98fa39c39228 url = ('{}/find/{}?external_source={}&api_key={}8&language={}'.format(host, self.search_id, source, api, self.search_language)) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index d11216fc..94439077 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -2,7 +2,12 @@ # ------------------------------------------------------------ # XBMC Launcher (xbmc / kodi) # ------------------------------------------------------------ +import datetime +import json import sys, os + +import requests + PY3 = False if sys.version_info[0] >= 3:PY3 = True; unicode = str; unichr = chr; long = int @@ -142,14 +147,9 @@ def run(item=None): if not webbrowser.open(item.url): import xbmc if xbmc.getCondVisibility('system.platform.linux') and xbmc.getCondVisibility('system.platform.android'): # android - xbmc.executebuiltin('StartAndroidActivity("", "android.intent.action.VIEW", "", "%s")' % (item.url)) + xbmc.executebuiltin('StartAndroidActivity("", "android.intent.action.VIEW", "", "%s")' % item.url) else: - try: - import urllib.request as urllib - except ImportError: - import urllib - short = urllib.urlopen('https://u.nu/api.php?action=shorturl&format=simple&url=' + item.url).read().decode('utf-8') - platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(70740) % short) + platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(70740) % "\n".join((item.url[j:j+57] for j in range(0, len(item.url), 57)))) elif item.action == "gotopage": page = platformtools.dialog_numeric(0, config.get_localized_string(70513)) if page: diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index da5a632b..7a276cd0 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -5760,7 +5760,7 @@ msgid "Open in browser" msgstr "" msgctxt "#70740" -msgid "Your system does not have a web browser, so here's the short link you can open in another device:\n%s" +msgid "Your system does not have a web browser, so here's the link you can open in another device:\n%s" msgstr "" msgctxt "#70741" diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po index 8c0632da..e5e3e7c2 100644 --- a/resources/language/resource.language.it_it/strings.po +++ b/resources/language/resource.language.it_it/strings.po @@ -5760,8 +5760,8 @@ msgid "Open in browser" msgstr "Apri nel browser" msgctxt "#70740" -msgid "Your system does not have a web browser, so here's the short link you can open in another device:\n%s" -msgstr "Il tuo sistema non ha un browser, quindi ecco un link corto che puoi aprire in un altro dispositivo\n%s" +msgid "Your system does not have a web browser, so here's the link you can open in another device:\n%s" +msgstr "Il tuo sistema non ha un browser, quindi ecco il link che puoi aprire in un altro dispositivo:\n%s" msgctxt "#70741" msgid "Search %s"