Skip to content

Commit

Permalink
v5.9.x Simplify tag yaml structure
Browse files Browse the repository at this point in the history 
See feature request #127
  • Loading branch information
@terrelsa13
terrelsa13 committed Aug 22, 2024
1 parent a5e4584 commit 72f4761
Show file tree
Hide file tree
Showing 9 changed files with 375 additions and 89 deletions.
8 changes: 4 additions & 4 deletions mumc_modules/mumc_config_builder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ def build_configuration_file(the_dict,orig_dict={}):
print('----------------------------------------------------------------------------------------')

#Initialize for compare with other tag to prevent using the same tag in both blacktag and whitetag
the_dict['advanced_settings']['blacktags']=[]
the_dict['advanced_settings']['whitetags']=[]
the_dict['advanced_settings']['blacktags']['global']=[]
the_dict['advanced_settings']['whitetags']['global']=[]

#ask user for global blacktag(s)
the_dict['advanced_settings']['blacktags']=get_tag_name('blacktag',the_dict['advanced_settings']['whitetags'])
the_dict['advanced_settings']['blacktags']['global']=get_tag_name('blacktag',the_dict['advanced_settings']['whitetags']['global'])
print('----------------------------------------------------------------------------------------')

#ask user for global whitetag(s)
the_dict['advanced_settings']['whitetags']=get_tag_name('whitetag',the_dict['advanced_settings']['blacktags'])
the_dict['advanced_settings']['whitetags']['global']=get_tag_name('whitetag',the_dict['advanced_settings']['blacktags']['global'])
print('----------------------------------------------------------------------------------------')

#Updating the config; Prepare to run the config editor
Expand Down
138 changes: 101 additions & 37 deletions mumc_modules/mumc_config_default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['movie']['whitetagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['movie']['whitetagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['movie']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['movie']['whitetagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['movie']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['movie']['whitetagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['movie']['blacktagged']['action']=merge['advanced_settings']['behavioral_statements']['movie']['blacktagged']['action']
Expand All @@ -520,10 +520,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['movie']['blacktagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['movie']['blacktagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['movie']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['movie']['blacktagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['movie']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['movie']['blacktagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['movie']['whitelisted']['action']=merge['advanced_settings']['behavioral_statements']['movie']['whitelisted']['action']
Expand Down Expand Up @@ -632,10 +632,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['episode']['whitetagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['episode']['whitetagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['episode']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['episode']['whitetagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['episode']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['episode']['whitetagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['episode']['blacktagged']['action']=merge['advanced_settings']['behavioral_statements']['episode']['blacktagged']['action']
Expand All @@ -657,10 +657,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['episode']['blacktagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['episode']['blacktagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['episode']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['episode']['blacktagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['episode']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['episode']['blacktagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['episode']['whitelisted']['action']=merge['advanced_settings']['behavioral_statements']['episode']['whitelisted']['action']
Expand Down Expand Up @@ -765,10 +765,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['audio']['whitetagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['audio']['whitetagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['audio']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['audio']['whitetagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['audio']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['audio']['whitetagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['audio']['blacktagged']['action']=merge['advanced_settings']['behavioral_statements']['audio']['blacktagged']['action']
Expand All @@ -790,10 +790,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['audio']['blacktagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['audio']['blacktagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['audio']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['audio']['blacktagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['audio']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['audio']['blacktagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['audio']['whitelisted']['action']=merge['advanced_settings']['behavioral_statements']['audio']['whitelisted']['action']
Expand Down Expand Up @@ -837,7 +837,6 @@ def merge_configuration(default_base,merge):
except:
pass

#loop thru in reverse to preserve order
if (server_brand == 'jellyfin'):
try:
default_base['advanced_settings']['behavioral_statements']['audiobook']['favorited']['action']=merge['advanced_settings']['behavioral_statements']['audiobook']['favorited']['action']
Expand Down Expand Up @@ -904,10 +903,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['tags']=merge['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['action']=merge['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['action']
Expand All @@ -929,10 +928,10 @@ def merge_configuration(default_base,merge):
default_base['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['dynamic_behavior']=merge['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['dynamic_behavior']
except:
pass
try:
default_base['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['tags']
except:
pass
#try:
#default_base['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['tags']=merge['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['tags']
#except:
#pass

try:
default_base['advanced_settings']['behavioral_statements']['audiobook']['whitelisted']['action']=merge['advanced_settings']['behavioral_statements']['audiobook']['whitelisted']['action']
Expand Down Expand Up @@ -1062,13 +1061,78 @@ def merge_configuration(default_base,merge):
'''

try:
default_base['advanced_settings']['whitetags']=merge['advanced_settings']['whitetags']
default_base['advanced_settings']['whitetags']['global']=merge['advanced_settings']['whitetags']['global']
except:
pass
try:
default_base['advanced_settings']['whitetags']['global']=merge['advanced_settings']['whitetags']
except:
pass
try:
default_base['advanced_settings']['blacktags']=merge['advanced_settings']['blacktags']
default_base['advanced_settings']['whitetags']['movie']=merge['advanced_settings']['whitetags']['movie']
except:
pass
try:
default_base['advanced_settings']['whitetags']['movie']=merge['advanced_settings']['behavioral_statements']['movie']['whitetagged']['tags']
except:
pass
try:
default_base['advanced_settings']['whitetags']['episode']=merge['advanced_settings']['whitetags']['episode']
except:
try:
default_base['advanced_settings']['whitetags']['episode']=merge['advanced_settings']['behavioral_statements']['episode']['whitetagged']['tags']
except:
pass
try:
default_base['advanced_settings']['whitetags']['audio']=merge['advanced_settings']['whitetags']['audio']
except:
try:
default_base['advanced_settings']['whitetags']['audio']=merge['advanced_settings']['behavioral_statements']['audio']['whitetagged']['tags']
except:
pass
if (server_brand == 'jellyfin'):
try:
default_base['advanced_settings']['whitetags']['audiobook']=merge['advanced_settings']['whitetags']['audiobook']
except:
try:
default_base['advanced_settings']['whitetags']['audiobook']=merge['advanced_settings']['behavioral_statements']['audiobook']['whitetagged']['tags']
except:
pass

try:
default_base['advanced_settings']['blacktags']['global']=merge['advanced_settings']['blacktags']['global']
except:
try:
default_base['advanced_settings']['blacktags']['global']=merge['advanced_settings']['blacktags']
except:
pass
try:
default_base['advanced_settings']['blacktags']['movie']=merge['advanced_settings']['blacktags']['movie']
except:
try:
default_base['advanced_settings']['blacktags']['movie']=merge['advanced_settings']['behavioral_statements']['movie']['blacktagged']['tags']
except:
pass
try:
default_base['advanced_settings']['blacktags']['episode']=merge['advanced_settings']['blacktags']['episode']
except:
try:
default_base['advanced_settings']['blacktags']['episode']=merge['advanced_settings']['behavioral_statements']['episode']['blacktagged']['tags']
except:
pass
try:
default_base['advanced_settings']['blacktags']['audio']=merge['advanced_settings']['blacktags']['audio']
except:
try:
default_base['advanced_settings']['blacktags']['audio']=merge['advanced_settings']['behavioral_statements']['audio']['blacktagged']['tags']
except:
pass
if (server_brand == 'jellyfin'):
try:
default_base['advanced_settings']['blacktags']['audiobook']=merge['advanced_settings']['blacktags']['audiobook']
except:
try:
default_base['advanced_settings']['blacktags']['audiobook']=merge['advanced_settings']['behavioral_statements']['audiobook']['blacktagged']['tags']
except:
pass

try:
default_base['advanced_settings']['delete_empty_folders']['episode']['season']=merge['advanced_settings']['delete_empty_folders']['episode']['season']
Expand Down
Loading

0 comments on commit 72f4761

Please sign in to comment.