From 0f087f46d7bc2731e24cc94306770fab02eb70a3 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Sun, 5 May 2019 14:32:57 -0400
Subject: [PATCH] Don't show rasterio log warns on init, sm-cluster config

---
 opendm/config.py | 29 ++++++++++++++++++++++-------
 opendm/log.py    | 16 ++++++++--------
 run.py           |  2 +-
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/opendm/config.py b/opendm/config.py
index b052544c..fecce8af 100644
--- a/opendm/config.py
+++ b/opendm/config.py
@@ -22,6 +22,20 @@ def alphanumeric_string(string):
         raise argparse.ArgumentTypeError(msg)
     return string
 
+# Django URL validation regex
+def url_string(string):
+    import re
+    regex = re.compile(
+        r'^(?:http|ftp)s?://' # http:// or https://
+        r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain...
+        r'localhost|' #localhost...
+        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
+        r'(?::\d+)?' # optional port
+        r'(?:/?|[/?]\S+)$', re.IGNORECASE)
+        
+    if re.match(regex, string) is None:
+        raise argparse.ArgumentTypeError("%s is not a valid URL. The URL must be in the format: http(s)://host[:port]/[?token=]" % string)
+    return string
 
 class RerunFrom(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
@@ -517,13 +531,14 @@ def config():
                         'are added to the cluster. This is done to ensure '
                         'that neighboring submodels overlap.')
 
-    parser.add_argument('--split-distributed',
-        action='store_true',
-        default=False,
-        help='Optimizes the split-merge workflow for a distributed computing environment. '
-                'When this is turned on, feature detection and matching on images is '
-                'performed independently on the submodels instead of being computed at once. '
-                'Default: %(default)s')
+    parser.add_argument('--sm-cluster',
+                        metavar='<string>',
+                        type=url_string,
+                        default=None,
+                        help='URL to a nodeodm-proxy instance '
+                            'for distributing a split-merge workflow on '
+                            'multiple nodes in parallel. '
+                            'Default: %(default)s')
 
     parser.add_argument('--merge',
                     metavar='<string>',
diff --git a/opendm/log.py b/opendm/log.py
index 0261267d..10e6d0ae 100644
--- a/opendm/log.py
+++ b/opendm/log.py
@@ -7,15 +7,15 @@ WARNING = '\033[93m'
 FAIL = '\033[91m'
 ENDC = '\033[0m'
 
-# TODO add file handling
+def init():
+    # TODO add file handling
+    logging.addLevelName(logging.INFO, '%s[%s]' % (OKBLUE, logging.getLevelName(logging.INFO)))
+    logging.addLevelName(logging.WARNING, '%s[%s]' % (WARNING, logging.getLevelName(logging.WARNING)))
+    logging.addLevelName(logging.ERROR, '%s[%s]' % (FAIL, logging.getLevelName(logging.ERROR)))
+    logging.addLevelName(logging.DEBUG, '%s[%s]' % (OKGREEN, logging.getLevelName(logging.DEBUG)))
 
-logging.addLevelName(logging.INFO, '%s[%s]' % (OKBLUE, logging.getLevelName(logging.INFO)))
-logging.addLevelName(logging.WARNING, '%s[%s]' % (WARNING, logging.getLevelName(logging.WARNING)))
-logging.addLevelName(logging.ERROR, '%s[%s]' % (FAIL, logging.getLevelName(logging.ERROR)))
-logging.addLevelName(logging.DEBUG, '%s[%s]' % (OKGREEN, logging.getLevelName(logging.DEBUG)))
-
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(levelname)-14s %(message)s' + ENDC)
+    logging.basicConfig(level=logging.DEBUG,
+                        format='%(levelname)-14s %(message)s' + ENDC)
 
 
 ODM_INFO = logging.info
diff --git a/run.py b/run.py
index 86326dfc..c7be42bd 100755
--- a/run.py
+++ b/run.py
@@ -11,7 +11,7 @@ from pipes import quote
 from scripts.odm_app import ODMApp
 
 if __name__ == '__main__':
-
+    log.init()
     args = config.config()
 
     log.ODM_INFO('Initializing OpenDroneMap app - %s' % system.now())