From c82084a1d79dbb2cf18ab8a4ad7abcab0c96bf8f Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Fri, 17 Jan 2020 12:28:31 +0100 Subject: [PATCH] [ui] command line: add support for filepath expressions in input --- meshroom/multiview.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/meshroom/multiview.py b/meshroom/multiview.py index 73fe6fa5..99983a66 100644 --- a/meshroom/multiview.py +++ b/meshroom/multiview.py @@ -73,12 +73,20 @@ def findFilesByTypeInFolder(folder, recursive=False): if os.path.isfile(currentFolder): output.addFile(currentFolder) continue - if recursive: - for root, directories, files in os.walk(currentFolder): - for filename in files: - output.addFile(os.path.join(root, filename)) + elif os.path.isdir(currentFolder): + if recursive: + for root, directories, files in os.walk(currentFolder): + for filename in files: + output.addFile(os.path.join(root, filename)) + else: + output.addFiles([os.path.join(currentFolder, filename) for filename in os.listdir(currentFolder)]) else: - output.addFiles([os.path.join(currentFolder, filename) for filename in os.listdir(currentFolder)]) + # if not a diretory or a file, it may be an expression + import glob + paths = glob.glob(currentFolder) + filesByType = findFilesByTypeInFolder(paths, recursive=recursive) + output.extend(filesByType) + return output