save intermediate progress, can ignore

Author: yucongalicechen

src/diffpy/labpdfproc/labpdfprocapp.py

@@ -60,10 +60,11 @@ def get_args():
     p.add_argument(
         "-u",
         "--user-metadata",
-        metavar=("KEY=VALUE"),
-        action="append",
-        help="specify key-value pairs to be loaded into metadata by using key=value. "
-        "You can specify multiple paris by calling -u multiple times.",
+        metavar="KEY=VALUE",
+        nargs="+",
+        help="specify (multiple) key-value pairs to be loaded into metadata by using key=value. "
+        "Do not leave whitespaces before or after = sign. "
+        "If a key or value contains whitespace, you should define it with quotes. ",
     )
     args = p.parse_args()
     return args

src/diffpy/labpdfproc/tests/test_tools.py

@@ -13,9 +13,9 @@
 
 
 @pytest.mark.parametrize("inputs, expected", params5)
-def test_load_additional_info(inputs, expected):
+def test_load_user_metadata(inputs, expected):
     actual_parser = ArgumentParser()
-    actual_parser.add_argument("-u", "--user-metadata", action="append", metavar=("KEY=VALUE"))
+    actual_parser.add_argument("-u", "--user-metadata", action="append", metavar="KEY=VALUE", nargs="+")
     actual_args = actual_parser.parse_args([])
     expected_parser = ArgumentParser()
     expected_args = expected_parser.parse_args([])

src/diffpy/labpdfproc/tools.py

@@ -1,19 +1,31 @@
-import sys
+def load_key_value_pair(s):
+    items = s.split("=")
+    key = items[0].strip()
+    if len(items) > 1:
+        value = "=".join(items[1:])
+    return (key, value)
 
 
 def load_user_metadata(args):
     if args.user_metadata:
         for item in args.user_metadata:
-            if not item:
-                sys.exit(
-                    "please provide at least one key-value pair in the format key=value. "
-                    "you can exclude -add if you don't want to provide additional info."
-                )
             if "=" not in item:
-                sys.exit("please provide key-value pairs in the format key=value.")
-            key, value = item.split("=", 1)
-            # if "=" in value:
-            #    sys.exit("please use only one equals sign for key=value.")
+                raise ValueError("please provide key-value pairs in the format key=value.")
+            key, value = load_key_value_pair(item)
             setattr(args, key, value)
     delattr(args, "user_metadata")
     return args
+
+
+# Notes, can ignore
+# ideal inputs: "key1=value1" "key2=value2"
+# (different pairs are separated by white spaces, key and value are separated by =)
+
+# question 1: white spaces in key, value, both?
+# if value contains whitespace, you can specify key="value value" or "key=value value"
+# if key contains whitespace, for example, you have "key key=value",
+# then you can access like getattr(args, 'key key'), but we dont recommend this
+
+# question 2: more than one =?
+# if i have key is hello, value is hello=world, then i can have hello=hello=world to process okay
+# if i have = in key then it's still processing as value => would this be an issue?