From 2317394430b6ec82e1d9d3ac257f550628edd60a Mon Sep 17 00:00:00 2001 From: Randall Pittman Date: Thu, 2 Nov 2023 15:23:28 -0700 Subject: [PATCH 1/2] Programmatically normalize all argnames from main() and exit 1 if invalid arg --- sd_file_parser.py | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/sd_file_parser.py b/sd_file_parser.py index 3c9ba15..42390ff 100755 --- a/sd_file_parser.py +++ b/sd_file_parser.py @@ -160,6 +160,7 @@ # Implementation #---------------- # +import inspect import numpy import os @@ -1440,34 +1441,19 @@ def validCommandLineArgument( arg ): # key,val = out - if key.lower() in ['path']: - # - key = 'path' - # - elif key.lower() in ['outputfiletype']: - # - key = 'outputFileType' - # - elif key.lower() in ['spectra']: - # - key = 'spectra' - # - elif key.lower() in ['lffilter']: - # - key = 'lfFilter' - # - elif key.lower() in ['bulkparameters']: - # - key = 'bulkParameters' - # + # normalize arg names to the capitalization required by main() + argnames = list(inspect.signature(main).parameters) + for argname in argnames: + if key.lower() == argname.lower(): + key = argname + break else: # print('ERROR: unknown commandline argument ' + key) - sys.exit() + sys.exit(1) # return( key,val) # - def getVersions( path ): """ This function retrieves sha from sys filenames; if no sha is present From 10fdb71917d3ea308d177aadb2c3153cbaeaf1ed Mon Sep 17 00:00:00 2001 From: Randall Pittman Date: Thu, 2 Nov 2023 15:30:29 -0700 Subject: [PATCH 2/2] exit 1 for invalid arg --- sd_file_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sd_file_parser.py b/sd_file_parser.py index 42390ff..fdf4258 100755 --- a/sd_file_parser.py +++ b/sd_file_parser.py @@ -1437,7 +1437,7 @@ def validCommandLineArgument( arg ): if not (len(out) == 2): # print('ERROR: Unknown commandline argument: ' + arg) - sys.exit() + sys.exit(1) # key,val = out