From 0079b4e8e92ea89a2ce692fa3ca0cedf51c002a1 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 10 Jun 2018 00:07:49 +0200
Subject: [PATCH] Improve a bit how we're handling "problematic" files in the
CLI
---
mat2 | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/mat2 b/mat2
index 87fa66c..7a210d5 100755
--- a/mat2
+++ b/mat2
@@ -13,7 +13,10 @@ from libmat2 import parser_factory, unsupported_extensions
__version__ = '0.1.1'
def __check_file(filename: str, mode: int = os.R_OK) -> bool:
- if not os.path.isfile(filename):
+ if not os.path.exists(filename):
+ print("[-] %s is doesn't exist." % filename)
+ return False
+ elif not os.path.isfile(filename):
print("[-] %s is not a regular file." % filename)
return False
elif not os.access(filename, mode):
@@ -89,12 +92,14 @@ def show_parsers():
def __get_files_recursively(files):
for f in files:
- if os.path.isfile(f):
- yield f
- else:
+ if os.path.isdir(f):
for path, _, _files in os.walk(f):
for _f in _files:
- yield os.path.join(path, _f)
+ fname = os.path.join(path, _f)
+ if __check_file(fname):
+ yield fname
+ elif __check_file(f):
+ yield f
def main():
arg_parser = create_arg_parser()
--
GitLab