From ba13dc56c3ddc0a65c9376d61c5cff647b078750 Mon Sep 17 00:00:00 2001
From: Kentaro Wada <www.kentaro.wada@gmail.com>
Date: Tue, 14 Jan 2020 13:36:57 +0000
Subject: [PATCH] Fix the use of --config arg in main.py

---
 labelme/config/__init__.py | 20 ++++++++++++++++----
 labelme/main.py            |  8 +-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/labelme/config/__init__.py b/labelme/config/__init__.py
index 392ffab..5682604 100644
--- a/labelme/config/__init__.py
+++ b/labelme/config/__init__.py
@@ -55,13 +55,25 @@ def validate_config_item(key, value):
         )
 
 
-def get_config(config_specified=None):
+def get_config(config_file_or_yaml=None, config_from_args=None):
     # 1. default config
     config = get_default_config()
 
-    # 2. command line argument or specified config file
-    if config_specified is not None:
-        update_dict(config, config_specified,
+    # 2. specified as file or yaml
+    if config_file_or_yaml is not None:
+        config_from_yaml = yaml.safe_load(config_file_or_yaml)
+        if not isinstance(config_from_yaml, dict):
+            with open(config_from_yaml) as f:
+                logger.info(
+                    'Loading config file from: {}'.format(config_from_yaml)
+                )
+                config_from_yaml = yaml.safe_load(f)
+        update_dict(config, config_from_yaml,
+                    validate_item=validate_config_item)
+
+    # 3. command line argument or specified config file
+    if config_from_args is not None:
+        update_dict(config, config_from_args,
                     validate_item=validate_config_item)
 
     return config
diff --git a/labelme/main.py b/labelme/main.py
index 4291841..1343371 100644
--- a/labelme/main.py
+++ b/labelme/main.py
@@ -142,13 +142,7 @@ def main():
     filename = config_from_args.pop('filename')
     output = config_from_args.pop('output')
     config_file_or_yaml = config_from_args.pop('config')
-    config = yaml.safe_load(config_file_or_yaml)
-    if not isinstance(config, dict):
-        logger.info('Loading config file from: {}'.format(config))
-        with open(config) as f:
-            config = yaml.safe_load(f)
-    config.update(config_from_args)  # prioritize config_from_args
-    config = get_config(config)
+    config = get_config(config_file_or_yaml, config_from_args)
 
     if not config['labels'] and config['validate_label']:
         logger.error('--labels must be specified with --validatelabel or '
-- 
GitLab