Merge pull request #447 from cchampet/dev_samDoSetHostLogLevel

cchampet · cchampet · commit 95bbc2889505 · 2015-08-03T12:04:59.000+02:00
sam do: set host log level
diff --git a/applications/sam/common/samDoUtils.py b/applications/sam/common/samDoUtils.py
@@ -28,6 +28,10 @@ def __init__(self, inputCommandLine, recursive):
         self._graph = []
         self._recursive = recursive
 
+        # check if there is a command
+        if not len(inputCommandLine):
+            return
+
         # Get general graph from the command line
         generalGraph = SplitCmdGraph(inputCommandLine)
 
@@ -259,31 +263,29 @@ def __init__(self, option_strings, dest, nargs=None, **kwargs):
         super(SamDoSetVerboseAction, self).__init__(option_strings, dest, **kwargs)
 
     def __call__(self, parser, namespace, values, option_string=None):
-        # if the given number is upper than the max tuttle verbose level, set verbose to trace
+        # if the given number is upper than the max sam verbose level, set to trace
         try:
             if int(values) > 6:
-                setattr(namespace, self.dest, 0)
+                setattr(namespace, self.dest, 5)
                 return
         except Exception:
             pass
 
-        if values == '0' or values.lower() == 'none':
-            setattr(namespace, self.dest, None)
-        elif values == '1' or values.lower() == 'fatal':
-            setattr(namespace, self.dest, 5)
-        elif values == '2' or values.lower() == 'error':
-            setattr(namespace, self.dest, 4)
-        elif values == '3' or values.lower() == 'warn':
-            setattr(namespace, self.dest, 3)
-        elif values == '4' or values.lower() == 'info':
-            setattr(namespace, self.dest, 2)
-        elif values == '5' or values.lower() == 'debug':
-            setattr(namespace, self.dest, 1)
-        elif values == '6' or values.lower() == 'trace':
+        if values == '0' or values.lower() == 'fatal':
             setattr(namespace, self.dest, 0)
-        # if the level is not recognized, no verbosity
+        elif values == '1' or values.lower() == 'error':
+            setattr(namespace, self.dest, 1)
+        elif values == '2' or values.lower() == 'warn':
+            setattr(namespace, self.dest, 2)
+        elif values == '3' or values.lower() == 'info':
+            setattr(namespace, self.dest, 3)
+        elif values == '4' or values.lower() == 'debug':
+            setattr(namespace, self.dest, 4)
+        elif values == '5' or values.lower() == 'trace':
+            setattr(namespace, self.dest, 5)
+        # if the level is not recognized, set to warning
         else:
-            setattr(namespace, self.dest, None)
+            setattr(namespace, self.dest, 2)
 
 
 class ProgressHandle(tuttle.IProgressHandle):
@@ -311,6 +313,9 @@ def samDoCompleter(prefix, parsed_args, **kwargs):
     Custom Completer to manage auto competion when looking for openFX nodes.
     @warning The autocompletion works only for TuttleOFX plugins.
     """
+    # preload OFX plugins (to have auto completion of plugins name, their parameters...)
+    tuttle.core().preload(True)
+
     # get plugins
     pluginsId = tuttle.core().getImageEffectPluginCache().getPluginsByID()
     pluginsStr = [str(id).replace('tuttle.', '') for id in pluginsId]
diff --git a/applications/sam/common/samUtils.py b/applications/sam/common/samUtils.py
@@ -62,9 +62,25 @@ def setLogLevel(self, tuttleVerboseLevel):
         """
         Set log level of all handlers of the logger.
         """
-        if tuttleVerboseLevel is not None:
-            for handler in self.logger.handlers:
-                handler.setLevel(10*tuttleVerboseLevel) # fit to python logging levels
+        for handler in self.logger.handlers:
+            if tuttleVerboseLevel is 0:
+                # CRITICAL
+                handler.setLevel(50)
+            elif tuttleVerboseLevel is 1:
+                # ERROR
+                handler.setLevel(40)
+            elif tuttleVerboseLevel is 2:
+                # WARNING
+                handler.setLevel(30)
+            elif tuttleVerboseLevel is 3:
+                # INFO
+                handler.setLevel(20)
+            elif tuttleVerboseLevel >= 4:
+                # DEBUG (and trace)
+                handler.setLevel(10)
+            else:
+                # WARNING
+                handler.setLevel(30)
 
 
 def completion():
diff --git a/applications/sam/sam_do.py b/applications/sam/sam_do.py
@@ -76,9 +76,6 @@ def __init__(self):
         Continues whatever happens:        sam do reader in.@.dpx // writer out.@.exr --continue-on-error
         '''
 
-        # preload OFX plugins (to have auto completion of plugins name, their parameters...)
-        tuttle.core().preload(False)
-
     def fillParser(self, parser):
         # Arguments
         parser.add_argument('inputs', nargs='*', action='store', help='command line to process').completer = samDoUtils.samDoCompleter
@@ -92,7 +89,7 @@ def fillParser(self, parser):
         parser.add_argument('--stop-on-missing-files', dest='stopOnMissingFiles', action='store_true', default=False, help='stop the process if missing files')
         parser.add_argument('--no-plugin-cache', dest='noPluginCache', action='store_true', default=False, help='load plugins without using the cache file')
         parser.add_argument('--rebuild-plugin-cache', dest='rebuildPluginCache', action='store_true', default=False, help='load plugins and rebuild the cache file')
-        parser.add_argument('-v', '--verbose', dest='verbose', action=samDoUtils.SamDoSetVerboseAction, help='verbose level (0/none(by default), 1/fatal, 2/error, 3/warn, 4/info, 5/debug, 6(or upper)/trace)')
+        parser.add_argument('-v', '--verbose', dest='verbose', action=samDoUtils.SamDoSetVerboseAction, default=0, help='verbose level (0/fatal (by default), 1/error, 2/warn, 3/info, 4/debug, 5(or upper)/trace)')
         # parser.add_argument('-h', '--help', dest='help', action='store_true', help='show this help message and exit')
 
     def _setTimeRanges(self, computeOptions, ranges):
@@ -332,6 +329,17 @@ def _displayNodeHelp(self, nodeFullName, node):
                     name=colored.green('Output'),
                     bitdepth=', '.join(bitDepthOutputStr)))
 
+    def _displayCommandLineHelp(self, parser):
+        """
+        Display sam-do command line help.
+        """
+        subparser = samUtils.getSubParser(parser, 'do')
+        # if sam-do is called from sam main command line
+        if subparser is not None:
+            puts(subparser.format_help())
+        else:
+            parser.print_help()
+
     def _getTuttleGraph(self, splitCmd):
         """
         Return the tuple (tuttle graph, its nodes) which corresponds to the given split command.
@@ -405,8 +413,15 @@ def run(self, parser):
         # Parse command-line
         args, unknown = parser.parse_known_args()
 
-        # Set log level
+        # sam-do --help
+        if len(args.inputs) == 0 and ('-h' in unknown or '--help' in unknown):
+            self._displayCommandLineHelp(parser)
+            exit(0)
+
+        # Set sam log level
         self.setLogLevel(args.verbose)
+        # set tuttle host log level
+        tuttle.core().getFormatter().setLogLevel_int(args.verbose)
 
         # Clear plugin cache
         if args.rebuildPluginCache:
@@ -428,15 +443,6 @@ def run(self, parser):
             self._displayFileFormats()
             exit(0)
 
-        # sam-do --help
-        if len(args.inputs) == 0:
-            subparser = samUtils.getSubParser(parser, 'do')
-            if subparser is not None:
-                puts(subparser.format_help())
-                exit(0)
-            parser.print_help()
-            exit(0)
-
         # Add unknown options to the command line to process
         args.inputs.extend(unknown)
 
@@ -453,8 +459,7 @@ def run(self, parser):
             # Options of process
             options = tuttle.ComputeOptions()
             # sam-do --verbose
-            if args.verbose is not None:
-                options.setVerboseLevel(args.verbose)
+            options.setVerboseLevel(args.verbose)
             # sam-do --ranges
             if args.ranges is not None:
                 self._setTimeRanges(options, args.ranges)
diff --git a/libraries/tuttle/src/tuttle/common/utils/Formatter.cpp b/libraries/tuttle/src/tuttle/common/utils/Formatter.cpp
@@ -69,37 +69,37 @@ void Formatter::setLogLevel_int( const int level )
 {
 	switch( level )
 	{
-		case 0: setLogLevel( boost::log::trivial::trace ); break;
-		case 1: setLogLevel( boost::log::trivial::debug ); break;
-		case 2: setLogLevel( boost::log::trivial::info ); break;
-		case 3: setLogLevel( boost::log::trivial::warning ); break;
-		case 4: setLogLevel( boost::log::trivial::error ); break;
-		case 5: setLogLevel( boost::log::trivial::fatal ); break;
+		case 0: setLogLevel( boost::log::trivial::fatal ); break;
+		case 1: setLogLevel( boost::log::trivial::error ); break;
+		case 2: setLogLevel( boost::log::trivial::warning ); break;
+		case 3: setLogLevel( boost::log::trivial::info ); break;
+		case 4: setLogLevel( boost::log::trivial::debug ); break;
+		case 5: setLogLevel( boost::log::trivial::trace ); break;
 		default:
 			setLogLevel( boost::log::trivial::warning );
-			TUTTLE_LOG_WARNING( "Unrecognized log level " << level << ", fallback to \"warning\" (3)." );
+			TUTTLE_LOG_WARNING( "Unrecognized log level " << level << ", fallback to \"warning\" (2)." );
 			break;
 	}
 }
 
 int logLevel_stringToInt( const std::string& level )
 {
 	static const std::vector<std::string> m = boost::assign::list_of
-		("trace")
-		("debug")
-		("info")
-		("warning")
+		("fatal")
 		("error")
-		("fatal");
+		("warning")
+		("info")
+		("debug")
+		("trace");
 	std::string lowerStrLevel = level;
 	boost::algorithm::to_lower(lowerStrLevel);
 	
 	std::vector<std::string>::const_iterator v = std::find(m.begin(), m.end(), lowerStrLevel);
 	
 	if( v == m.end() )
 	{
-		TUTTLE_LOG_WARNING( "Unrecognized log level " << quotes(level) << ", fallback to \"warning\" (3)." );
-		return 3;
+		TUTTLE_LOG_WARNING( "Unrecognized log level " << quotes(level) << ", fallback to \"warning\" (2)." );
+		return 2;
 	}
 	return std::distance(m.begin(), v);
 }
diff --git a/libraries/tuttle/src/tuttle/host/ComputeOptions.hpp b/libraries/tuttle/src/tuttle/host/ComputeOptions.hpp
@@ -55,12 +55,12 @@ struct TimeRange
 
 enum EVerboseLevel
 {
-	eVerboseLevelTrace   = boost::log::trivial::trace,
-	eVerboseLevelDebug   = boost::log::trivial::debug,
-	eVerboseLevelInfo    = boost::log::trivial::info,
-	eVerboseLevelWarning = boost::log::trivial::warning,
-	eVerboseLevelError   = boost::log::trivial::error,
-	eVerboseLevelFatal   = boost::log::trivial::fatal
+	eVerboseLevelFatal,
+	eVerboseLevelError,
+	eVerboseLevelWarning,
+	eVerboseLevelInfo,
+	eVerboseLevelDebug,
+	eVerboseLevelTrace
 };
 
 class ComputeOptions
@@ -224,7 +224,7 @@ class ComputeOptions
 	 */
 	This& setVerboseLevel( const EVerboseLevel level )
 	{
-		tuttle::common::Formatter::get()->setLogLevel( static_cast<boost::log::trivial::severity_level>( level ) );
+		tuttle::common::Formatter::get()->setLogLevel_int( static_cast<int>( level ) );
 		return *this;
 	}
 	
