From 35dca4bf1cb4d47ea39b844db599eccfe40288bb Mon Sep 17 00:00:00 2001
From: Simon Magnin <smagnin@smagnin.org>
Date: Thu, 11 Oct 2018 08:28:02 -0700
Subject: [PATCH] add recursivity for archive style files
---
mat2 | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/mat2 b/mat2
index 987e439..cc193e9 100755
--- a/mat2
+++ b/mat2
@@ -65,18 +65,26 @@ def show_meta(filename: str):
if p is None:
print("[-] %s's format (%s) is not supported" % (filename, mtype))
return
-
print("[+] Metadata for %s:" % filename)
- metadata = p.get_meta().items()
+ metadata = p.get_meta().items() # type: dict
+ __print_meta(metadata)
+
+
+def __print_meta(metadata: dict):
if not metadata:
print(" No metadata found")
return
for k, v in metadata:
- try: # FIXME this is ugly.
- print(" %s: %s" % (k, v))
- except UnicodeEncodeError:
- print(" %s: harmful content" % k)
+ if isinstance(v, dict):
+ __print_meta(v)
+ else:
+ try: # FIXME this is ugly.
+ print(" %s: %s" % (k, v))
+ except UnicodeEncodeError:
+ print(" %s: harmful content" % k)
+ return
+
def clean_meta(filename: str, is_lightweight: bool, policy: UnknownMemberPolicy) -> bool:
if not __check_file(filename, os.R_OK|os.W_OK):
--
GitLab