[cuegui] Fix inconsistencies on cuegui.yaml (#1495)

Some fields were expected to be read as dictionaries and others as direct keys. email fields are now read directly and output_viewer fields are now treated as a dict. --------- Signed-off-by: Diego Tavares <[email protected]>
AcademySoftwareFoundation · Sep 10, 2024 · 0b60722 · 0b60722
1 parent a62a393
commit 0b60722
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/cuegui/cuegui/Constants.py b/cuegui/cuegui/Constants.py
@@ -183,11 +183,11 @@ def __packaged_version():
 
 RESOURCE_LIMITS = __config.get('resources')
 
-OUTPUT_VIEWER_ACTION_TEXT = __config.get('output_viewer.action_text')
-OUTPUT_VIEWER_EXTRACT_ARGS_REGEX = __config.get('output_viewer.extract_args_regex')
-OUTPUT_VIEWER_CMD_PATTERN = __config.get('output_viewer.cmd_pattern')
-OUTPUT_VIEWER_DIRECT_CMD_CALL = __config.get('output_viewer.direct_cmd_call')
-OUTPUT_VIEWER_STEREO_MODIFIERS = __config.get('output_viewer.stereo_modifiers')
+OUTPUT_VIEWER_ACTION_TEXT = __config.get('output_viewer', {}).get('action_text')
+OUTPUT_VIEWER_EXTRACT_ARGS_REGEX = __config.get('output_viewer', {}).get('extract_args_regex')
+OUTPUT_VIEWER_CMD_PATTERN = __config.get('output_viewer', {}).get('cmd_pattern')
+OUTPUT_VIEWER_DIRECT_CMD_CALL = __config.get('output_viewer', {}).get('direct_cmd_call')
+OUTPUT_VIEWER_STEREO_MODIFIERS = __config.get('output_viewer', {}).get('stereo_modifiers')
 FINISHED_JOBS_READONLY_FRAME = __config.get('finished_jobs_readonly.frame', False)
 FINISHED_JOBS_READONLY_LAYER = __config.get('finished_jobs_readonly.layer', False)
 

diff --git a/cuegui/cuegui/config/cuegui.yaml b/cuegui/cuegui/config/cuegui.yaml
@@ -101,16 +101,15 @@ links.issue.bug: '?labels=bug&template=bug_report.md'
 allowed_tags: ['general', 'desktop', 'playblast', 'util', 'preprocess', 'wan', 'cuda', 'splathw',
                'naiad', 'massive']
 
-email:
-  subject_prefix: 'cuemail: please check '
-  body_prefix: 'Your Support Team requests that you check '
-  body_suffix: "\n\n"
-  domain: 'your.domain.com'
-  # A template for what email should be used for show support.
-  #  - {domain} is required and will be replaced by email.domain
-  #  - {show} is not required and will be replaced by the job show
-  #  - Multiple addresses might be provided in a comma separated list
-  show_support_cc_template: "{show}-support@{domain}"
+email.subject_prefix: 'cuemail: please check '
+email.body_prefix: 'Your Support Team requests that you check '
+email.body_suffix: "\n\n"
+email.domain: 'your.domain.com'
+# A template for what email should be used for show support.
+#  - {domain} is required and will be replaced by email.domain
+#  - {show} is not required and will be replaced by the job show
+#  - Multiple addresses might be provided in a comma-separated list
+email.show_support_cc_template: "{show}-support@{domain}"
 
 # Unix epoch timestamp. If the user last viewed the startup notice before this time, the
 # notice will be shown.