Skip to content

Commit 7700637

Browse files
committed
Merge pull request #481 from cchampet/fix_samMvPythonErrorWhenLogNotSequence
sam ls/mv: fix some errors
2 parents eeaf8bb + b3195b9 commit 7700637

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

applications/sam/common/samUtils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ def __init__(self):
3232
# Add a console handler
3333
self.addConsoleHandler()
3434

35+
# Set default log level of all sam tools to warning
36+
self.setLogLevel(2)
37+
3538
def fillParser(self, parser):
3639
"""
3740
To fill the given parser.

applications/sam/sam_ls.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,10 @@ def run(self, parser):
236236
sequence = sequenceParser.Sequence()
237237
isSequence = sequenceParser.browseSequence(sequence, input)
238238
if isSequence:
239-
items.append(sequenceParser.Item(sequence, os.getcwd()))
239+
item = sequenceParser.Item(sequence, os.getcwd())
240+
# check if the sequence contains at least one element
241+
if len(item.explode()):
242+
items.append(item)
240243
# else error
241244
else:
242245
self.logger.warning(e)
@@ -254,7 +257,10 @@ def run(self, parser):
254257
# new browse
255258
items += sequenceParser.browse(newBrowsePath, detectionMethod, newFilter)
256259

257-
self.printItems(items, args, detectionMethod, filters)
260+
if not len(items):
261+
self.logger.warning('No items found for input "' + input + '".')
262+
else:
263+
self.printItems(items, args, detectionMethod, filters)
258264

259265

260266
if __name__ == '__main__':

applications/sam/sam_mv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def _getSequenceItemFromPath(self, inputPath, detectNegative):
155155

156156
inputItem = inputItems[0]
157157
if inputItem.getType() != sequenceParser.eTypeSequence:
158-
self.logger.error('Input is not a sequence: ', inputItem.getFilename())
158+
self.logger.error('Input is not a sequence: ' + inputItem.getFilename())
159159
exit(-1)
160160

161161
return inputItem

0 commit comments

Comments
 (0)