diff --git a/specials/backup.py b/specials/backup.py index 5802ea1d..824c3f10 100644 --- a/specials/backup.py +++ b/specials/backup.py @@ -3,18 +3,18 @@ # Backup and restore video library # ------------------------------------------------------------ -import os, datetime - -import xbmc +import datetime, xbmc from core import ziptools, videolibrarytools, filetools from platformcode import logger, config, platformtools, xbmc_videolibrary from distutils.dir_util import copy_tree from specials import videolibrary -temp_path = xbmc.translatePath("special://userdata/addon_data/plugin.video.kod/temp/") -movies_path = os.path.join(temp_path, "movies") -tvshows_path = os.path.join(temp_path, "tvshows") +temp_path = u'' + xbmc.translatePath("special://userdata/addon_data/plugin.video.kod/temp/") +movies_path = u'' + filetools.join(temp_path, "movies") +tvshows_path = u'' + filetools.join(temp_path, "tvshows") +videolibrary_movies_path = u'' + videolibrarytools.MOVIES_PATH +videolibrary_tvshows_path = u'' + videolibrarytools.TVSHOWS_PATH def export_videolibrary(item): @@ -23,7 +23,7 @@ def export_videolibrary(item): zip_file_folder = platformtools.dialog_browse(3, config.get_localized_string(80002)) if zip_file_folder == "": return - zip_file = xbmc.translatePath(zip_file_folder + "KoD_video_library-" + str(datetime.date.today()) + ".zip") + zip_file = u'' + xbmc.translatePath(zip_file_folder + "KoD_video_library-" + str(datetime.date.today()) + ".zip") p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(80003)) p_dialog.update(0) @@ -33,10 +33,10 @@ def export_videolibrary(item): filetools.mkdir(temp_path) p_dialog.update(25) filetools.mkdir(movies_path) - copy_tree(videolibrarytools.MOVIES_PATH, movies_path) + copy_tree(videolibrary_movies_path, movies_path) p_dialog.update(50) filetools.mkdir(tvshows_path) - copy_tree(videolibrarytools.TVSHOWS_PATH, tvshows_path) + copy_tree(videolibrary_tvshows_path, tvshows_path) p_dialog.update(75) zipper = ziptools.ziptools() @@ -53,7 +53,7 @@ def export_videolibrary(item): def import_videolibrary(item): logger.info() - zip_file = platformtools.dialog_browse(1, config.get_localized_string(80005)) + zip_file = u'' + platformtools.dialog_browse(1, config.get_localized_string(80005)) if zip_file == "": return if not platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80006)): @@ -73,16 +73,16 @@ def import_videolibrary(item): if config.is_xbmc() and config.get_setting("videolibrary_kodi"): xbmc_videolibrary.clean() p_dialog.update(30) - filetools.rmdirtree(videolibrarytools.MOVIES_PATH) - filetools.rmdirtree(videolibrarytools.TVSHOWS_PATH) + filetools.rmdirtree(videolibrary_movies_path) + filetools.rmdirtree(videolibrary_tvshows_path) p_dialog.update(50) config.verify_directories_created() if filetools.exists(movies_path): - copy_tree(movies_path, videolibrarytools.MOVIES_PATH) + copy_tree(movies_path, videolibrary_movies_path) p_dialog.update(70) if filetools.exists(tvshows_path): - copy_tree(tvshows_path, videolibrarytools.TVSHOWS_PATH) + copy_tree(tvshows_path, videolibrary_tvshows_path) p_dialog.update(90) filetools.rmdirtree(temp_path) diff --git a/specials/videolibrary.py b/specials/videolibrary.py index 12dbb46c..07ed8c9c 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- #from builtins import str -import sys - -from core.support import typo +import sys, xbmc, os, traceback PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int @@ -11,12 +9,10 @@ if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int import xbmc, os, traceback from channelselector import get_thumb, thumb -from core import filetools -from core import scrapertools -from core import videolibrarytools +from core import filetools, scrapertools, videolibrarytools +from core.support import typo from core.item import Item -from platformcode import config, logger -from platformcode import platformtools +from platformcode import config, logger, platformtools from lib import generictools from distutils import dir_util @@ -24,16 +20,15 @@ from distutils import dir_util def mainlist(item): logger.info() - itemlist = list() - itemlist.append(Item(channel=item.channel, action="list_movies", title=config.get_localized_string(60509), - category=config.get_localized_string(70270), - thumbnail=get_thumb("videolibrary_movie.png"))) - itemlist.append(Item(channel=item.channel, action="list_tvshows", title=config.get_localized_string(60600), - category=config.get_localized_string(70271), - thumbnail=get_thumb("videolibrary_tvshow.png"))) - itemlist.append(Item(channel='shortcuts', action="SettingOnPosition", - category=2, setting=1, title=typo(config.get_localized_string(70287),'bold color kod'), - thumbnail = get_thumb("setting_0.png"))) + itemlist = [Item(channel=item.channel, action="list_movies", title=config.get_localized_string(60509), + category=config.get_localized_string(70270), + thumbnail=get_thumb("videolibrary_movie.png")), + Item(channel=item.channel, action="list_tvshows", title=config.get_localized_string(60600), + category=config.get_localized_string(70271), + thumbnail=get_thumb("videolibrary_tvshow.png")), + Item(channel='shortcuts', action="SettingOnPosition", + category=2, setting=1, title=typo(config.get_localized_string(70287),'bold color kod'), + thumbnail = get_thumb("setting_0.png"))] return itemlist @@ -713,12 +708,12 @@ def move_videolibrary(current_path, new_path, current_movies_folder, new_movies_ notify = False progress = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(80011)) - current_path = xbmc.translatePath(current_path) - new_path = xbmc.translatePath(new_path) - current_movies_path = filetools.join(current_path, current_movies_folder) - new_movies_path = filetools.join(new_path, new_movies_folder) - current_tvshows_path = os.path.join(current_path, current_tvshows_folder) - new_tvshows_path = os.path.join(new_path, new_tvshows_folder) + current_path = u'' + xbmc.translatePath(current_path) + new_path = u'' + xbmc.translatePath(new_path) + current_movies_path = u'' + filetools.join(current_path, current_movies_folder) + new_movies_path = u'' + filetools.join(new_path, new_movies_folder) + current_tvshows_path = u'' + filetools.join(current_path, current_tvshows_folder) + new_tvshows_path = u'' + filetools.join(new_path, new_tvshows_folder) logger.info('current_movies_path: ' + current_movies_path) logger.info('new_movies_path: ' + new_movies_path) @@ -1083,7 +1078,7 @@ def delete(item): raiz, carpeta_serie, ficheros = next(filetools.walk(_item.path)) if ficheros == []: filetools.rmdir(_item.path) - elif platformtools.dialog_yesno(heading, config.get_localized_string(70081) % os.path.basename(_item.path)): + elif platformtools.dialog_yesno(heading, config.get_localized_string(70081) % filetools.basename(_item.path)): filetools.rmdirtree(_item.path) logger.info("All links removed")