Merge pull request #486 from cchampet/clean_samTools

Clean sam do/ls

Author: cchampet

applications/sam/sam.py

@@ -83,7 +83,7 @@ def getBestSamTools():
             tool.command,
             help=tool.help,
             description=tool.description,
-            epilog=(tool.epilog if tool.epilog else None),
+            epilog=tool.epilog,
             formatter_class=argparse.RawTextHelpFormatter,
             add_help=(False if tool.command == 'do' else True))
         tool.fillParser(toolParser)

applications/sam/sam_do.py

@@ -36,15 +36,19 @@ def __init__(self):
         self._geometryPorcessing = colored.blue('Geometry processing during conversion')
         self._colorProcessing = colored.blue('Color processing during conversion')
         self._imgSeqNumbering = colored.blue('Image Sequence Numbering')
-        self.processingOptions = colored.blue('Processing options')
+        self._processingOptions = colored.blue('Processing options')
+        self._tuttleVersion = colored.green('TuttleOFX project [v' + str(tuttle.TUTTLE_HOST_VERSION_MAJOR)+'.'+str(tuttle.TUTTLE_HOST_VERSION_MINOR)+'.'+str(tuttle.TUTTLE_HOST_VERSION_MICRO)+']')
+        self._tuttleWebSite = colored.green('http://www.tuttleofx.org/')
         if clintVersion >= '0.3.3':
             self._pluginOption.bold=True
             self._generatorsAndViewers.bold=True
             self._imgSeqConversion.bold=True
             self._geometryPorcessing.bold=True
             self._colorProcessing.bold=True
             self._imgSeqNumbering.bold=True
-            self.processingOptions.bold=True
+            self._processingOptions.bold=True
+            self._tuttleVersion.bold=True
+            self._tuttleWebSite.bold=True
 
         self.epilog = '''
     ''' + self._pluginOption + '''
@@ -88,11 +92,12 @@ def __init__(self):
         Frames 1 to 100 padding 5:         image.#####.jpg
         Printf style padding 4:            image.%04d.jpg
 
-    ''' + self.processingOptions + '''
+    ''' + self._processingOptions + '''
         Range process:                     sam do reader [email protected] // writer [email protected] --ranges 50 100
         Single process:                    sam do reader [email protected] // writer [email protected] --ranges 59
         Continues whatever happens:        sam do reader [email protected] // writer [email protected] --continue-on-error
-        '''
+        
+    ''' + self._tuttleVersion + '''            ''' + self._tuttleWebSite
 
     def fillParser(self, parser):
         # Arguments
@@ -155,7 +160,7 @@ def _displayPlugins(self):
         plugins = []
         for plugin in tuttle.core().getPlugins():
             plugins.append(plugin.getIdentifier().ljust(30) + ' (v' + str(plugin.getVersionMajor()) + '.' + str(plugin.getVersionMinor()) + ')')
-        for plugin in sorted(plugins):
+        for plugin in sorted(set(plugins)):
             puts(plugin)
 
     def _displayFileFormats(self):
@@ -391,7 +396,7 @@ def _getTuttleGraph(self, splitCmdGraph):
                 # Plugin not found
                 if not nodeFullName:
                     nodeFullName = splitCmdNode._pluginId
-                self.logger.warning('Cannot create node "' + nodeFullName + '": the node will be skipped from the command line.')
+                self.logger.error('Cannot create node "' + nodeFullName + '": the node will be skipped from the command line.')
                 self.logger.debug(e)
                 continue
             # sam-do node --help
@@ -448,11 +453,6 @@ def run(self, parser):
         # Parse command-line
         args, unknown = parser.parse_known_args()
 
-        # 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
@@ -478,6 +478,11 @@ def run(self, parser):
             self._displayFileFormats()
             exit(0)
 
+        # sam-do --help
+        if len(args.inputs) == 0 and (len(unknown) == 0 or '-h' in unknown or '--help' in unknown):
+            self._displayCommandLineHelp(parser)
+            exit(0)
+
         # Add unknown options to the command line to process
         args.inputs.extend(unknown)
 
@@ -532,7 +537,7 @@ def run(self, parser):
             try:
                 graph.compute(nodes[-1], options)
             except Exception as e:
-                self.logger.error('Tuttle graph computation failed.')
+                self.logger.error('Tuttle graph computation has failed.')
                 self.logger.debug(e)
             self.logger.info('Memory usage: ' + str(int(samUtils.memoryUsageResource())) + 'KB')
 

applications/sam/sam_ls.py

@@ -38,7 +38,7 @@ def fillParser(self, parser):
         parser.add_argument('-d', '--directories', dest='directories', action='store_true', help='handle directories')
         parser.add_argument('-s', '--sequences', dest='sequences', action='store_true', help='handle sequences')
         parser.add_argument('-f', '--files', dest='files', action='store_true', help='handle files')
-        parser.add_argument('-e', '--expression', dest='expression', help='use a specific pattern, ex: "*.jpg", "*.png"')
+        parser.add_argument('-e', '--expression', dest='expression', action='append', default=[], help='use a specific pattern, ex: "*.jpg", "*.png"')
 
         parser.add_argument('-l', '--long-listing', dest='longListing', action='store_true', help='use a long listing format (display in this order: type | permissions | owner | group | last update | minSize | maxSize | totalSize | name)')
         parser.add_argument('--format', dest='format', choices=['default', 'nuke', 'rv'], default='default', help='specify formatting of the sequence padding')
@@ -201,9 +201,14 @@ def run(self, parser):
 
         # inputs to scan
         inputs = []
-        if args.inputs:
-            inputs = args.inputs
-        else:
+        for input in args.inputs:
+            # if exists add the path
+            if os.path.exists(input):
+                inputs.append(input)
+            # else use it as a filter expression
+            else:
+                args.expression.append(input)
+        if not inputs:
             inputs.append(os.getcwd())
 
         # sam-ls -a
@@ -221,8 +226,8 @@ def run(self, parser):
 
         # sam-ls -e
         filters = []
-        if args.expression:
-            filters.append(args.expression)
+        for expression in args.expression:
+            filters.append(expression)
 
         # get list of items for each inputs
         for input in inputs:

libraries/tuttle/src/tuttle/host/tuttle.i

@@ -1,8 +1,9 @@
-
 %module tuttle
 
 %module(directors="1", threads="1") tuttle
 
+%include <tuttle/host/version.hpp>
+
 %include "global.i"
 %include "Core.i"
 %include "ImageEffectNode.i"
@@ -17,4 +18,3 @@
 %include "thumbnail/ThumbnailDiskCache.i"
 %include "Callback.i"
 %include <tuttle/common/utils/Formatter.i>
-