From 89daed44af398b435399c423c3f0a4063177a47c Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Tue, 24 Jul 2018 20:33:16 +0200 Subject: [PATCH] =?UTF-8?q?Marcado=20de=20v=C3=ADdoes=20vistos/no=20vistos?= =?UTF-8?q?:=20blindaje=20de=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/videolibrary.py | 50 ++++++++++------------ plugin.video.alfa/videolibrary_service.py | 14 +++--- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/plugin.video.alfa/channels/videolibrary.py b/plugin.video.alfa/channels/videolibrary.py index c03bbf5f..3f7d979d 100644 --- a/plugin.video.alfa/channels/videolibrary.py +++ b/plugin.video.alfa/channels/videolibrary.py @@ -9,6 +9,7 @@ from core import videolibrarytools from core.item import Item from platformcode import config, logger from platformcode import platformtools +from lib import generictools def mainlist(item): @@ -34,8 +35,6 @@ def channel_config(item): def list_movies(item, silent=False): logger.info() itemlist = [] - from platformcode import xbmc_videolibrary - from lib import generictools for raiz, subcarpetas, ficheros in filetools.walk(videolibrarytools.MOVIES_PATH): for f in ficheros: @@ -44,7 +43,9 @@ def list_movies(item, silent=False): #Sincronizamos las películas vistas desde la videoteca de Kodi con la de Alfa try: - xbmc_videolibrary.mark_content_as_watched_on_alfa(nfo_path) + if config.is_xbmc(): #Si es Kodi, lo hacemos + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_content_as_watched_on_alfa(nfo_path) except: pass @@ -109,7 +110,6 @@ def list_movies(item, silent=False): def list_tvshows(item): logger.info() itemlist = [] - from platformcode import xbmc_videolibrary # Obtenemos todos los tvshow.nfo de la videoteca de SERIES recursivamente for raiz, subcarpetas, ficheros in filetools.walk(videolibrarytools.TVSHOWS_PATH): @@ -120,7 +120,9 @@ def list_tvshows(item): #Sincronizamos los episodios vistos desde la videoteca de Kodi con la de Alfa try: - xbmc_videolibrary.mark_content_as_watched_on_alfa(tvshow_path) + if config.is_xbmc(): #Si es Kodi, lo hacemos + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_content_as_watched_on_alfa(tvshow_path) except: pass @@ -318,7 +320,6 @@ def get_episodes(item): def findvideos(item): logger.info() - from lib import generictools # logger.debug("item:\n" + item.tostring('\n')) itemlist = [] @@ -418,28 +419,23 @@ def findvideos(item): pass list_servers = [] - try: - # FILTERTOOLS - # si el canal tiene filtro se le pasa el nombre que tiene guardado para que filtre correctamente. - if "list_language" in item_json: - # si se viene desde la videoteca del addon - if "library_filter_show" in item: - item_json.show = item.library_filter_show.get(nom_canal, "") + # FILTERTOOLS + # si el canal tiene filtro se le pasa el nombre que tiene guardado para que filtre correctamente. + if "list_language" in item_json: + # si se viene desde la videoteca del addon + if "library_filter_show" in item: + item_json.show = item.library_filter_show.get(nom_canal, "") - # Ejecutamos find_videos, del canal o común - item_json.contentChannel = 'videolibrary' - if hasattr(channel, 'findvideos'): - from core import servertools - list_servers = getattr(channel, 'findvideos')(item_json) - list_servers = servertools.filter_servers(list_servers) - else: - from core import servertools - list_servers = servertools.find_video_items(item_json) - except Exception, ex: - logger.error("Ha fallado la funcion findvideos para el canal %s" % nom_canal) - template = "An exception of type %s occured. Arguments:\n%r" - message = template % (type(ex).__name__, ex.args) - logger.error(message) + # Ejecutamos find_videos, del canal o común + item_json.contentChannel = 'videolibrary' + if hasattr(channel, 'findvideos'): + from core import servertools + list_servers = getattr(channel, 'findvideos')(item_json) + list_servers = servertools.filter_servers(list_servers) + else: + from core import servertools + list_servers = servertools.find_video_items(item_json) + # Cambiarle el titulo a los servers añadiendoles el nombre del canal delante y # las infoLabels y las imagenes del item si el server no tiene diff --git a/plugin.video.alfa/videolibrary_service.py b/plugin.video.alfa/videolibrary_service.py index 97a64523..ecbde844 100644 --- a/plugin.video.alfa/videolibrary_service.py +++ b/plugin.video.alfa/videolibrary_service.py @@ -9,12 +9,11 @@ from core import channeltools, filetools, videolibrarytools from platformcode import config, logger from platformcode import platformtools from channels import videolibrary +from lib import generictools def update(path, p_dialog, i, t, serie, overwrite): logger.info("Actualizando " + path) - from lib import generictools - from platformcode import xbmc_videolibrary insertados_total = 0 head_nfo, it = videolibrarytools.read_nfo(path + '/tvshow.nfo') @@ -81,7 +80,9 @@ def update(path, p_dialog, i, t, serie, overwrite): #Sincronizamos los episodios vistos desde la videoteca de Kodi con la de Alfa try: - xbmc_videolibrary.mark_content_as_watched_on_alfa(path + '/tvshow.nfo') + if config.is_xbmc(): #Si es Kodi, lo hacemos + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_content_as_watched_on_alfa(path + '/tvshow.nfo') except: pass @@ -90,8 +91,7 @@ def update(path, p_dialog, i, t, serie, overwrite): def check_for_update(overwrite=True): logger.info("Actualizando series...") - from lib import generictools - from platformcode import xbmc_videolibrary + p_dialog = None serie_actualizada = False update_when_finished = False @@ -136,7 +136,9 @@ def check_for_update(overwrite=True): if overwrite_forced == False: #Sincronizamos los episodios vistos desde la videoteca de Kodi con la de Alfa, aunque la serie esté desactivada try: - xbmc_videolibrary.mark_content_as_watched_on_alfa(path + '/tvshow.nfo') + if config.is_xbmc(): #Si es Kodi, lo hacemos + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_content_as_watched_on_alfa(path + '/tvshow.nfo') except: pass