From d9385827caab2434559820334ccafa6489063afd Mon Sep 17 00:00:00 2001 From: terrelsa13 Date: Fri, 20 Sep 2024 19:58:03 -0400 Subject: [PATCH] v5.9.x Fix issue with making minimum config Fix issue with config check and windows dirs Fix issue with user builder not showing single user --- mumc_modules/mumc_builder_user.py | 2 +- mumc_modules/mumc_configuration_yaml.py | 20 ++++++++++---------- mumc_modules/mumc_versions.py | 2 +- mumc_modules/mumc_yaml_check.py | 10 ++++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mumc_modules/mumc_builder_user.py b/mumc_modules/mumc_builder_user.py index f2c6a20..2c92bc5 100755 --- a/mumc_modules/mumc_builder_user.py +++ b/mumc_modules/mumc_builder_user.py @@ -58,7 +58,7 @@ def show_hide_gui_disabled_users(the_dict): def print_users_to_console(the_dict): - if (len(the_dict['all_users_dict']) > 1): + if (len(the_dict['all_users_dict']) >= 1): for user in the_dict['all_users_dict']: the_dict['user_index_total']=the_dict['all_users_dict'].index(user) the_dict['all_users_dict'][the_dict['user_index_total']]['userPosition']=the_dict['user_index_total'] diff --git a/mumc_modules/mumc_configuration_yaml.py b/mumc_modules/mumc_configuration_yaml.py index 2ff0b53..082800f 100755 --- a/mumc_modules/mumc_configuration_yaml.py +++ b/mumc_modules/mumc_configuration_yaml.py @@ -493,20 +493,20 @@ def yaml_configurationBuilder(the_dict): config_data['advanced_settings'].pop('whitetags') else: config_data['advanced_settings']['whitetags']['global']=the_dict['advanced_settings']['whitetags']['global'] - config_data['advanced_settings']['whitetags'].pop('movie') - config_data['advanced_settings']['whitetags'].pop('episode') - config_data['advanced_settings']['whitetags'].pop('audio') - if (the_dict['admin_settings']['server']['brand'] == 'jellyfin'): - config_data['advanced_settings']['whitetags'].pop('audiobook') + config_data['advanced_settings']['whitetags'].pop('movie') + config_data['advanced_settings']['whitetags'].pop('episode') + config_data['advanced_settings']['whitetags'].pop('audio') + if (the_dict['admin_settings']['server']['brand'] == 'jellyfin'): + config_data['advanced_settings']['whitetags'].pop('audiobook') if (the_dict['advanced_settings']['blacktags']['global'] == []): config_data['advanced_settings'].pop('blacktags') else: config_data['advanced_settings']['blacktags']['global']=the_dict['advanced_settings']['blacktags']['global'] - config_data['advanced_settings']['blacktags'].pop('movie') - config_data['advanced_settings']['blacktags'].pop('episode') - config_data['advanced_settings']['blacktags'].pop('audio') - if (the_dict['admin_settings']['server']['brand'] == 'jellyfin'): - config_data['advanced_settings']['blacktags'].pop('audiobook') + config_data['advanced_settings']['blacktags'].pop('movie') + config_data['advanced_settings']['blacktags'].pop('episode') + config_data['advanced_settings']['blacktags'].pop('audio') + if (the_dict['admin_settings']['server']['brand'] == 'jellyfin'): + config_data['advanced_settings']['blacktags'].pop('audiobook') config_data['advanced_settings'].pop('delete_empty_folders') config_data['advanced_settings'].pop('episode_control') config_data['advanced_settings'].pop('trakt_fix') diff --git a/mumc_modules/mumc_versions.py b/mumc_modules/mumc_versions.py index 94aa8af..aef9453 100755 --- a/mumc_modules/mumc_versions.py +++ b/mumc_modules/mumc_versions.py @@ -4,7 +4,7 @@ #Get the current script version def get_script_version(): - return '5.9.12-beta' + return '5.9.13-beta' #Get the min config version diff --git a/mumc_modules/mumc_yaml_check.py b/mumc_modules/mumc_yaml_check.py index eabc53f..f5ed384 100755 --- a/mumc_modules/mumc_yaml_check.py +++ b/mumc_modules/mumc_yaml_check.py @@ -132,15 +132,17 @@ def cfgCheckYAML_forLibraries(check_list, user_id_check_list, user_name_check_li if ('path' in libinfo): path_found += 1 check_item=check_irt[user_elements][int(check_irt[user_elements].index(libinfo))]['path'] - #Check path is string - if (not ((isinstance(check_item,str) and check_item.find('\\') < 0) or (check_item == '') or (check_item == None))): + #Check path is string; checking for backslashes does not work for windows + #if (not ((isinstance(check_item,str) and (check_item.find('\\') < 0)) or (check_item == '') or (check_item == None))): + if (not (isinstance(check_item,str) or (check_item == '') or (check_item == None))): error_found_in_mumc_config_yaml+='ConfigValueError: ' + config_var_name + ' > user_id: ' + str(check_irt['user_id']) + ' > ' + user_elements + ' > library_id: ' + str(libinfo['lib_id']) + ' > path: ' + str(check_item) + ' is not an expected string value\n' if ('network_path' in libinfo): network_path_found += 1 check_item=check_irt[user_elements][int(check_irt[user_elements].index(libinfo))]['network_path'] - #Check network_path is string - if (not ((isinstance(check_item,str) and check_item.find('\\') < 0) or (check_item == '') or (check_item == None))): + #Check network_path is string; checking for backslashes does not work for windows + #if (not ((isinstance(check_item,str) and (check_item.find('\\') < 0)) or (check_item == '') or (check_item == None))): + if (not (isinstance(check_item,str) or (check_item == '') or (check_item == None))): error_found_in_mumc_config_yaml+='ConfigValueError: ' + config_var_name + ' > user_id: ' + str(check_irt['user_id']) + ' > ' + user_elements + ' > library_id: ' + str(libinfo['lib_id']) + ' > network_path: ' + str(check_item) + ' is not an expected string value\n' if ('subfolder_id' in libinfo):