From 091a23c46f2bb74ba639f661552430ccd3045f72 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 3 Feb 2014 01:00:54 +0000 Subject: MAT's cli now returns 1 on failure --- mat | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mat b/mat index b573297..86b904b 100755 --- a/mat +++ b/mat @@ -73,6 +73,7 @@ def list_meta(class_file, filename, force, add2archive): if meta: for key, value in class_file.get_meta().iteritems(): print('\t' + key + ' : ' + str(value)) + return 0 def is_clean(class_file, filename, force, add2archive): @@ -83,6 +84,7 @@ def is_clean(class_file, filename, force, add2archive): print('[+] %s is clean' % filename) else: print('[+] %s is not clean' % filename) + return 0 def clean_meta(class_file, filename, force, add2archive): @@ -91,7 +93,7 @@ def clean_meta(class_file, filename, force, add2archive): ''' if not class_file.is_writable: print('[-] %s is not writable' % filename) - return + return 1 print('[*] Cleaning %s' % filename) if not force and class_file.is_clean(): print('[+] %s is already clean' % filename) @@ -105,10 +107,13 @@ def clean_meta(class_file, filename, force, add2archive): 'It contains unsupported filetypes:' % filename) for i in unsupported_list: print('- %s' % i) - elif class_file.remove_all(): + return 1 + if class_file.remove_all(): print('[+] %s cleaned !' % filename) else: print('[-] Unable to clean %s', filename) + return 1 + return 0 def list_supported(): @@ -141,6 +146,7 @@ def main(): else: # clean the file func = clean_meta + ret = 0 while filenames: filename = filenames.pop() if os.path.isdir(filename): @@ -152,9 +158,11 @@ def main(): class_file = mat.create_class_file(filename, args.backup, add2archive=args.add2archive, low_pdf_quality=args.low_pdf_quality) if class_file: - func(class_file, filename, args.force, args.add2archive) + ret += func(class_file, filename, args.force, args.add2archive) else: - print('Unable to process %s' % filename) + ret = 1 + print('[-] Unable to process %s' % filename) + sys.exit(ret) if __name__ == '__main__': main() -- cgit v1.3