make sure that update will work

mx3L · Apr 23, 2020 · e28d647 · e28d647
1 parent 2d6cd59
commit e28d647
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 5 deletions.
diff --git a/build/plugin/src/engine/addon.py b/build/plugin/src/engine/addon.py
@@ -9,7 +9,7 @@
 from tools import util, parser
 from Plugins.Extensions.archivCZSK import _, log
 from Plugins.Extensions.archivCZSK import settings
-from Plugins.Extensions.archivCZSK.resources.addons import config as addon_config
+from Plugins.Extensions.archivCZSK.resources.repositories import config as addon_config
 from Plugins.Extensions.archivCZSK.gui import menu
 from Plugins.Extensions.archivCZSK.gui import info
 from Plugins.Extensions.archivCZSK.gui import shortcuts

diff --git a/build/plugin/src/engine/contentprovider.py b/build/plugin/src/engine/contentprovider.py
@@ -27,7 +27,7 @@
 from Plugins.Extensions.archivCZSK.settings import VIDEO_EXTENSIONS, SUBTITLES_EXTENSIONS
 from Plugins.Extensions.archivCZSK.engine.exceptions.addon import AddonError
 from Plugins.Extensions.archivCZSK.engine.player.player import Player 
-from Plugins.Extensions.archivCZSK.resources.addons import repo_modules
+from Plugins.Extensions.archivCZSK.resources.repositories import repo_modules
 from Plugins.Extensions.archivCZSK.engine.tools.util import toString, is_hls_url, url_get_data_async, get_streams_from_manifest, download_web_file
 from downloader import DownloadManager
 from items import PVideo, PFolder, PPlaylist, PDownload, PCategory, PVideoAddon, \

diff --git a/build/plugin/src/engine/repository.py b/build/plugin/src/engine/repository.py
@@ -67,7 +67,8 @@ def __init__(self, config_file):
 
             addon_info = AddonInfo(os.path.join(addon_path, self.addon_xml_relpath))
             if addon_info.type not in Repository.SUPPORTED_ADDONS:
-                raise Exception("%s '%s' addon not in supported type of addons %s " % (self, addon_info.type, Repository.SUPPORTED_ADDONS))
+                log.logError("Load not supported type of addon %s failed, skipping...\n" % (addon_dir,) )
+                continue
             if addon_info.type == 'video':
                 try:
                     tmp = os.path.join(addon_path, addon_info.script)

diff --git a/build/plugin/src/gui/menu.py b/build/plugin/src/gui/menu.py
@@ -11,7 +11,7 @@
 from Screens.VirtualKeyBoard import VirtualKeyBoard
 
 from Plugins.Extensions.archivCZSK import _, settings, log, removeDiac
-from Plugins.Extensions.archivCZSK.resources.addons import \
+from Plugins.Extensions.archivCZSK.resources.repositories import \
     config as addon_config
 from base import BaseArchivCZSKScreen
 from common import Tabs

diff --git a/build/plugin/src/resources/addons/.gitignore → ...gin/src/resources/repositories/.gitignore b/build/plugin/src/resources/addons/.gitignore → ...gin/src/resources/repositories/.gitignore
diff --git a/...d/plugin/src/resources/addons/Makefile.am → ...in/src/resources/repositories/Makefile.am b/...d/plugin/src/resources/addons/Makefile.am → ...in/src/resources/repositories/Makefile.am
diff --git a/...d/plugin/src/resources/addons/__init__.py → ...in/src/resources/repositories/__init__.py b/...d/plugin/src/resources/addons/__init__.py → ...in/src/resources/repositories/__init__.py
diff --git a/build/plugin/src/resources/addons/addon.xml → ...c/resources/repositories/addons/addon.xml b/build/plugin/src/resources/addons/addon.xml → ...c/resources/repositories/addons/addon.xml
diff --git a/build/plugin/src/resources/addons/config.py → ...ugin/src/resources/repositories/config.py b/build/plugin/src/resources/addons/config.py → ...ugin/src/resources/repositories/config.py
diff --git a/build/plugin/src/resources/addons/modules.py → ...gin/src/resources/repositories/modules.py b/build/plugin/src/resources/addons/modules.py → ...gin/src/resources/repositories/modules.py
diff --git a/build/plugin/src/settings.py b/build/plugin/src/settings.py
@@ -22,7 +22,7 @@
 PLUGIN_PATH = os.path.join(ENIGMA_PLUGIN_PATH, 'archivCZSK')
 IMAGE_PATH = os.path.join(PLUGIN_PATH, 'gui/icon')
 SKIN_PATH = os.path.join(PLUGIN_PATH, 'gui/skins')
-REPOSITORY_PATH = os.path.join(PLUGIN_PATH, 'resources/addons')
+REPOSITORY_PATH = os.path.join(PLUGIN_PATH, 'resources/repositories/addons')
 
 CUSTOM_FONTS_PATH = os.path.join(SKIN_PATH,'font.json')
 CUSTOM_COLORS_PATH = os.path.join(SKIN_PATH,'color.json')