summaryrefslogtreecommitdiff
path: root/megapixels/app/utils/file_utils.py
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-12-17 20:20:04 +0100
committerJules Laplace <julescarbon@gmail.com>2018-12-17 20:20:04 +0100
commit6626e3086ca9c5ce2317f437aae94afacd6f1360 (patch)
treeb6a35419eacd6f3853f1042a9c2ceb234bada0d6 /megapixels/app/utils/file_utils.py
parente67871d26f2e73861187e86110e240dd7718ea51 (diff)
parentc7e73f613fc5189c0adeda9fd693cb6aca3d4247 (diff)
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'megapixels/app/utils/file_utils.py')
-rw-r--r--megapixels/app/utils/file_utils.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/megapixels/app/utils/file_utils.py b/megapixels/app/utils/file_utils.py
index 80239fe2..5c7b39d1 100644
--- a/megapixels/app/utils/file_utils.py
+++ b/megapixels/app/utils/file_utils.py
@@ -40,10 +40,16 @@ log = logging.getLogger(cfg.LOGGER_NAME)
# File I/O read/write little helpers
# ------------------------------------------
-def glob_multi(dir_in, exts):
+def glob_multi(dir_in, exts, recursive=False):
files = []
- for e in exts:
- files.append(glob(join(dir_in, '*.{}'.format(e))))
+ for ext in exts:
+ if recursive:
+ fp_glob = join(dir_in, '**/*.{}'.format(ext))
+ log.info(f'glob {fp_glob}')
+ files += glob(fp_glob, recursive=True)
+ else:
+ fp_glob = join(dir_in, '*.{}'.format(ext))
+ files += glob(fp_glob)
return files