Fix aggiungi videoteca su altadefinizionecommunity->ricerca, tmdb e rimosso URL shortner per "apri nel browser" in mancanza di browser

This commit is contained in:
mac12m99
2021-08-03 21:18:24 +02:00
parent c13b7fcda1
commit 25d4522e1c
6 changed files with 10 additions and 18 deletions

View File

@@ -199,7 +199,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),

View File

@@ -576,7 +576,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"]

View File

@@ -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())
@@ -966,7 +963,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))

View File

@@ -2,7 +2,6 @@
# ------------------------------------------------------------
# XBMC Launcher (xbmc / kodi)
# ------------------------------------------------------------
import sys, os
PY3 = False
if sys.version_info[0] >= 3:PY3 = True; unicode = str; unichr = chr; long = int
@@ -143,14 +142,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))))
else:
# Checks if channel exists
if os.path.isfile(os.path.join(config.get_runtime_path(), 'channels', item.channel + ".py")):

View File

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

View File

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