From d925f26c8d77be6f4c75e228adac002538dcb793 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 15 May 2021 12:18:34 +0200 Subject: [PATCH] Alcuni fix --- core/support.py | 2 +- core/tmdb.py | 14 ++++++++++---- platformcode/xbmc_videolibrary.py | 10 ++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/core/support.py b/core/support.py index 59d4dde7..7e89e295 100755 --- a/core/support.py +++ b/core/support.py @@ -1201,7 +1201,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru videoitem.title = findS[0] videoitem.url = findS[1] srv_param = servertools.get_server_parameters(videoitem.server.lower()) - logger.debug(videoitem) + # logger.debug(videoitem) if videoitem.video_urls or srv_param.get('active', False): # dbg() item.title = typo(item.contentTitle.strip(), 'bold') if item.contentType == 'movie' and item.contentTitle or (config.get_localized_string(30161) in item.title) else item.title diff --git a/core/tmdb.py b/core/tmdb.py index 1028de5b..c919688b 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -1374,7 +1374,7 @@ class Tmdb(object): if collection: _id = collection.get('id') if _id: - url = '{}/collection/{}?api_key={}&language={}&append_to_response=images'.format(host, _id, api, self.search_language) + url = '{}/collection/{}?api_key={}&language={}&append_to_response=images&include_image_language={},en,null'.format(host, _id, api, self.search_language, self.search_language) tanslationurl = '{}/collection/{}/translations?api_key={}'.format(host, _id, api) info = self.get_json(url) for t in self.get_json(tanslationurl).get('translations'): @@ -1382,6 +1382,7 @@ class Tmdb(object): translation = t.get('data',{}) break ret['set'] = info.get('name') if info.get('name') else translation.get('name') + ret['setid'] = _id ret['setoverview'] = info.get('overview') if info.get('overview') else translation.get('overview') posters = ['https://image.tmdb.org/t/p/original' + info.get('poster_path')] if info.get('poster_path') else [] fanarts = ['https://image.tmdb.org/t/p/original' + info.get('backdrop_path')] if info.get('backdrop_path') else [] @@ -1577,11 +1578,12 @@ class Tmdb(object): ret_infoLabels = InfoLabels(infoLabels) else: ret_infoLabels = InfoLabels() - # Start Listings l_country = [i.strip() for i in ret_infoLabels['country'].split(',') if ret_infoLabels['country']] l_director = [i.strip() for i in ret_infoLabels['director'].split(',') if ret_infoLabels['director']] + l_director_image = ret_infoLabels.get('director_image', []) l_writer = [i.strip() for i in ret_infoLabels['writer'].split(',') if ret_infoLabels['writer']] + l_writer_image = ret_infoLabels.get('writer_image', []) l_castandrole = ret_infoLabels.get('castandrole', []) if not origen: @@ -1728,9 +1730,11 @@ class Tmdb(object): for crew in v: if crew['job'].lower() == 'director': l_director = list(set(l_director + [crew['name']])) + l_director_image += ['https://image.tmdb.org/t/p/original' + crew['profile_path'] if crew['profile_path'] else ''] elif crew['job'].lower() in ('screenplay', 'writer'): l_writer = list(set(l_writer + [crew['name']])) + l_writer_image += ['https://image.tmdb.org/t/p/original' + crew['profile_path'] if crew['profile_path'] else ''] elif k == 'created_by': for crew in v: @@ -1750,9 +1754,11 @@ class Tmdb(object): if l_country: ret_infoLabels['country'] = ', '.join(sorted(l_country)) if l_director: - ret_infoLabels['director'] = ', '.join(sorted(l_director)) + ret_infoLabels['director'] = ', '.join(l_director) + ret_infoLabels['director_image'] = l_director_image if l_writer: - ret_infoLabels['writer'] = ', '.join(sorted(l_writer)) + ret_infoLabels['writer'] = ', '.join(l_writer) + ret_infoLabels['writer_image'] = l_writer_image return ret_infoLabels diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index ad1486c4..3dfb1e89 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -1170,7 +1170,7 @@ def check_db(path): return ret -def execute_sql_kodi(sql): +def execute_sql_kodi(sql, params=None): """ Run sql query against kodi database @param sql: Valid sql query @@ -1209,7 +1209,13 @@ def execute_sql_kodi(sql): cursor = conn.cursor() logger.debug("Running sql: %s" % sql) - cursor.execute(sql) + if params: + if type(params) == list: + cursor.executemany(sql, params) + else: + cursor.execute(sql, params) + else: + cursor.execute(sql) conn.commit() records = cursor.fetchall()