From 6ab4fcf22060f188ea5109aef3bafb55cfac501f Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Fri, 22 May 2020 22:16:04 +0200 Subject: [PATCH] Altri Fix --- core/support.py | 4 ++-- core/tmdb.py | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/support.py b/core/support.py index 245a6cd1..321934db 100755 --- a/core/support.py +++ b/core/support.py @@ -336,8 +336,8 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t infoLabels=infolabels, thumbnail=item.thumbnail if function == 'episodios' or not scraped["thumb"] else scraped["thumb"], args=item.args, - contentSerieName= item.contentSerieName if item.contentSerieName else title if 'movie' not in [item.contentType, CT] and function == 'episodios' else item.fulltitle, - contentTitle=item.contentTitle if item.contentTitle else title if 'movie' in [item.contentType, CT] else '', + contentSerieName= item.contentSerieName if item.contentSerieName and function == 'peliculas' else title if 'movie' not in [item.contentType, CT] and function == 'episodios' else item.fulltitle, + contentTitle=item.contentTitle if item.contentTitle and function == 'peliculas' else title if 'movie' in [item.contentType, CT] and function == 'peliculas' else '', contentLanguage = lang1, contentEpisodeNumber=episode if episode else '', news= item.news if item.news else '', diff --git a/core/tmdb.py b/core/tmdb.py index 2fd82ba5..9fa9e655 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -462,11 +462,11 @@ def set_infoLabels_item(item, seekTmdb=True, idioma_busqueda=def_lang, lock=None year=item.infoLabels['year']) else: # Busqueda de pelicula por titulo... - if item.infoLabels['year'] or item.infoLabels['filtro']: - # ...y año o filtro - searched_title = item.contentTitle if item.contentTitle else item.fulltitle - otmdb = Tmdb(texto_buscado=searched_title, tipo=tipo_busqueda, idioma_busqueda=idioma_busqueda, - filtro=item.infoLabels.get('filtro', {}), year=item.infoLabels['year']) + # if item.infoLabels['year'] or item.infoLabels['filtro']: + # ...y año o filtro + searched_title = item.contentTitle if item.contentTitle else item.fulltitle + otmdb = Tmdb(texto_buscado=searched_title, tipo=tipo_busqueda, idioma_busqueda=idioma_busqueda, + filtro=item.infoLabels.get('filtro', {}), year=item.infoLabels['year']) if otmdb is not None: if otmdb.get_id() and config.get_setting("tmdb_plus_info", default=False): # Si la busqueda ha dado resultado y no se esta buscando una lista de items, @@ -480,7 +480,6 @@ def set_infoLabels_item(item, seekTmdb=True, idioma_busqueda=def_lang, lock=None # La busqueda ha encontrado un resultado valido __leer_datos(otmdb) return len(item.infoLabels) - # La busqueda en tmdb esta desactivada o no ha dado resultado # item.contentType = item.infoLabels['mediatype'] return -1 * len(item.infoLabels)