Merge branch 'MUMC_beta' into MUMC-Latest

terrelsa13 · Jan 20, 2025 · 1287945 · 1287945
2 parents d383b17 + a10cbf2
commit 1287945
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/mumc_modules/mumc_config_builder.py b/mumc_modules/mumc_config_builder.py
@@ -174,7 +174,7 @@ def build_configuration_file(the_dict,orig_dict={}):
     the_dict['advanced_settings']['REMOVE_FILES']=False
 
     print('----------------------------------------------------------------------------------------')
-    
+
     #Build and save new yaml config file
     if (not the_dict['advanced_settings']['UPDATE_CONFIG']):
         yaml_configurationBuilder(the_dict)

diff --git a/mumc_modules/mumc_configuration_yaml.py b/mumc_modules/mumc_configuration_yaml.py
@@ -629,12 +629,15 @@ def yaml_configurationBuilder(the_dict):
     config_data=yaml_configurationLayout(config_data,config_data['admin_settings']['server']['brand'])
 
     config_data['basic_settings']['filter_statements'].pop('audio')
+
     if (the_dict['admin_settings']['server']['brand'] == 'jellyfin'):
         config_data['basic_settings']['filter_statements'].pop('audiobook')
+
     config_data['basic_settings'].pop('filter_tags')
     config_data['advanced_settings'].pop('filter_statements')
     config_data['advanced_settings'].pop('behavioral_statements')
     config_data['advanced_settings'].pop('behavioral_tags')
+
     if (the_dict['advanced_settings']['whitetags']['global'] == []):
         config_data['advanced_settings'].pop('whitetags')
     else:
@@ -653,14 +656,16 @@ def yaml_configurationBuilder(the_dict):
         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('radarr')
     config_data['advanced_settings'].pop('sonarr')
-    config_data['advanced_settings'].pop('lidarr')
-    config_data['advanced_settings'].pop('readarr')
+    #config_data['advanced_settings'].pop('lidarr')
+    #config_data['advanced_settings'].pop('readarr')
     config_data['advanced_settings'].pop('trakt_fix')
     config_data['advanced_settings'].pop('console_controls')
     config_data['advanced_settings'].pop('UPDATE_CONFIG')
+
     if ((the_dict['admin_settings']['behavior']['list'] == 'blacklist') and (the_dict['admin_settings']['behavior']['matching'] == 'byId') and (the_dict['admin_settings']['behavior']['users']['monitor_disabled'])):
         config_data['admin_settings'].pop('behavior')
     else:

diff --git a/mumc_modules/mumc_versions.py b/mumc_modules/mumc_versions.py
@@ -1,10 +1,11 @@
 import platform
 from mumc_modules.mumc_url import requestURL,build_emby_jellyfin_request_message
+from mumc_modules.mumc_url import requestURL,build_emby_jellyfin_request_message
 
 
 #Get the current script version
 def get_script_version():
-    return '5.10.3'
+    return '5.10.4'
 
 
 #Get the min config version
@@ -20,6 +21,7 @@ def get_server_version(the_dict):
     #Get additonal item information
     url=the_dict['admin_settings']['server']['url'] + '/System/Info'
 
+    req=build_emby_jellyfin_request_message(url=url,the_dict=the_dict)
     req=build_emby_jellyfin_request_message(url=url,the_dict=the_dict)
 
     #api call