more refactoring on cli

extract.py

@@ -2,6 +2,7 @@
 
 import argparse
 import json
+import logging
 import os
 import shutil
 import subprocess
@@ -19,11 +20,23 @@ def parse_arguments():
     parser.add_argument('-c', '--container', help='docker container', default='fkiecad/fact_extractor')
     parser.add_argument('-o', '--output_directory', help='path to extracted files', default=None)
     parser.add_argument('-r', '--report_file', help='write report to a file', default=None)
+    parser.add_argument('-V', '--verbose', action='store_true', default=False, help='increase verbosity')
     parser.add_argument('ARCHIVE', type=str, nargs=1, help='Archive for extraction')
 
     return parser.parse_args()
 
 
+def setup_logging(verbose):
+    console_log = logging.StreamHandler()
+    console_log.setFormatter(
+        logging.Formatter(fmt='[%(asctime)s][%(module)s][%(levelname)s]: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+    )
+
+    logger = logging.getLogger('')
+    logger.setLevel(logging.DEBUG if verbose else logging.INFO)
+    logger.addHandler(console_log)
+
+
 def container_exists(container):
     return subprocess.run('docker history {}'.format(container), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).returncode == 0
 
@@ -39,41 +52,48 @@ def call_docker(input_file, container, target, report_file):
 
     subprocess.run('docker run --rm -v {}:/tmp/extractor -v /dev:/dev --privileged {}'.format(tmp, container), shell=True)
 
-    print('Now taking ownership of the files. You may need to enter your password.')
-    subprocess.run('sudo chown -R {} {}'.format(os.environ['USER'], tmpdir.name), shell=True)
+    logging.warning('Now taking ownership of the files. You may need to enter your password.')
 
+    subprocess.run('sudo chown -R {} {}'.format(os.environ['USER'], tmpdir.name), shell=True)
     with suppress(shutil.Error):
         shutil.copytree(str(Path(tmp, 'files')), target)
 
+    handle_report(report_file, tmp)
+
+    tmpdir.cleanup()
+
+
+def handle_report(report_file, tmp):
     indented_report = json.dumps(json.loads(Path(tmp, 'reports', 'meta.json').read_text()), indent=4)
     if report_file:
         Path(report_file).write_text(indented_report)
     else:
         print(indented_report)
 
-    tmpdir.cleanup()
-
 
 def main():
     arguments = parse_arguments()
+    setup_logging(arguments.verbose)
 
     output_directory = arguments.output_directory if arguments.output_directory else str(Path(__file__).parent / 'extracted_files')
     if Path(output_directory).exists():
-        print('Target directory exists ({}). Please choose a non-existing directory with -o option.'.format(output_directory))
+        logging.error('Target directory exists ({}). Please choose a non-existing directory with -o option.'.format(output_directory))
         return 1
 
     if not container_exists(arguments.container):
-        print('Container {} doesn\'t exist. Please specify an existing container with the -c option.'.format(arguments.container))
+        logging.error('Container {} doesn\'t exist. Please specify an existing container with the -c option.'.format(arguments.container))
         return 1
 
     if not Path(arguments.ARCHIVE[0]).is_file():
-        print('Given input file {} doesn\'t exist. Please give an existing path.'.format(arguments.ARCHIVE[0]))
+        logging.error('Given input file {} doesn\'t exist. Please give an existing path.'.format(arguments.ARCHIVE[0]))
+        return 1
 
     if arguments.report_file and not Path(arguments.report_file).parent.is_dir():
-        print('Report file ({}) can not be created. Check if parent directory exists.'.format(arguments.report_file))
+        logging.error('Report file ({}) can not be created. Check if parent directory exists.'.format(arguments.report_file))
         return 1
+
     if arguments.report_file and Path(arguments.report_file).exists():
-        print('Warning: Report file will be overwritten.')
+        logging.warning('Warning: Report file will be overwritten.')
 
     call_docker(arguments.ARCHIVE[0], arguments.container, output_directory, arguments.report_file)