From 771f6c1deead5754d4194d368a83538705d6191e Mon Sep 17 00:00:00 2001 From: flaskfarm Date: Mon, 17 Oct 2022 16:16:50 +0900 Subject: [PATCH] update --- .gitignore | 1 + lib/framework/init_main.py | 2 +- lib/framework/init_plugin.py | 4 ++-- lib/framework/version.py | 2 +- lib/support/sc/Windows/sc.cp310-win_amd64.pyd | Bin 20480 -> 20480 bytes 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 237a098..af53984 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ pre_start.sh false *copy.py *.sh +data/ \ No newline at end of file diff --git a/lib/framework/init_main.py b/lib/framework/init_main.py index 15c1b34..343e4f8 100644 --- a/lib/framework/init_main.py +++ b/lib/framework/init_main.py @@ -309,7 +309,7 @@ class Framework: else: self.config['config_filepath'] = self.config['arg_config'] if os.path.exists(self.config['config_filepath']) == False: - if self.config.get('running_type').startswith('docker'): + if self.config.get('running_type', '').startswith('docker'): with open(self.config['config_filepath'], 'w', encoding='utf8') as f: yaml.dump({'path_data':'/data'}, f, default_flow_style=False, allow_unicode=True) else: diff --git a/lib/framework/init_plugin.py b/lib/framework/init_plugin.py index 1fafe7f..3d20540 100644 --- a/lib/framework/init_plugin.py +++ b/lib/framework/init_plugin.py @@ -210,11 +210,11 @@ class PluginManager: elif entity['version'] == '4': mod_menu = getattr(entity['P'], 'menu') - if mod_menu: + if mod_menu and cls.all_package_list[key]['loading'] != False: cls.plugin_menus[key]= {'menu':mod_menu, 'match':False} if entity['version'] == '4': setting_menu = getattr(entity['P'], 'setting_menu') - if setting_menu != None: + if setting_menu != None and cls.all_package_list[key]['loading'] != False: cls.setting_menus.append(setting_menu) diff --git a/lib/framework/version.py b/lib/framework/version.py index b7f48bd..ae1ef18 100644 --- a/lib/framework/version.py +++ b/lib/framework/version.py @@ -1 +1 @@ -VERSION="4.0.11" \ No newline at end of file +VERSION="4.0.14" \ No newline at end of file diff --git a/lib/support/sc/Windows/sc.cp310-win_amd64.pyd b/lib/support/sc/Windows/sc.cp310-win_amd64.pyd index 98cabed375a036aa8e1112002993054b53cf47b0..13de7e2955c605ee04a9b67969480f4f74d8ae10 100644 GIT binary patch delta 25 ecmZozz}T>Waf1LO)6Y+vg%}^1f#`4MToM3>e+s?; delta 25 ecmZozz}T>Waf1LO(*w25LX3~hK=e0rE(rj2X$bTH