diff --git a/tempbox/src/modules/tempbox_functions.py b/tempbox/src/modules/tempbox_functions.py index 0df94a4..62a1e15 100644 --- a/tempbox/src/modules/tempbox_functions.py +++ b/tempbox/src/modules/tempbox_functions.py @@ -29,12 +29,15 @@ def execute_as_subprocess(command, base_path, verbosity=False): """executes the string given with the '-c, --command' flag.""" logger.debug("Entered execute_as_subprocess()") - logger.debug(f"Path:\t{base_path}\nCommand:\t{command}") + logger.debug(f"Path:\t{base_path}\nCommand:\t\t\t{command}") + # Decicion if the terminal output is verbose or not if verbosity: + # Verbose output logger.info("Running subprocess with terminal output.") subprocess.run(command, cwd=base_path, shell=True) else: + # Suppressed output logger.info("Running with suppressed stdout and stderr") subprocess.run( command, @@ -43,5 +46,4 @@ def execute_as_subprocess(command, base_path, verbosity=False): stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT, ) - logger.debug("Exited execute_as_subprocess()") diff --git a/tempbox/src/modules/tempbox_logger.py b/tempbox/src/modules/tempbox_logger.py index b987ecf..5e469ad 100644 --- a/tempbox/src/modules/tempbox_logger.py +++ b/tempbox/src/modules/tempbox_logger.py @@ -13,5 +13,5 @@ logging.basicConfig( ) logger = logging.getLogger() -logger.debug(f"Log path:\t{log_dir}") -logger.debug(f"Log file:\t{log_file}") +# logger.debug(f"Log path:\t{log_dir}") +# logger.debug(f"Log file:\t{log_file}") diff --git a/tempbox/src/tempbox.py b/tempbox/src/tempbox.py index a30af2a..be53347 100644 --- a/tempbox/src/tempbox.py +++ b/tempbox/src/tempbox.py @@ -5,12 +5,13 @@ from modules.tempbox_functions import execute_as_subprocess from modules.tempbox_logger import logger tempbox_version = "Tempbox Beta b0.2.1" + # Argument parsing parser = argparse.ArgumentParser( prog="tempbox", description="This program accepts an\ command whicht it executes in an temporary directory in /temp.", - # epilog="helloooooooo", + epilog=tempbox_version, ) parser.add_argument( @@ -19,20 +20,19 @@ parser.add_argument( action="store_true", help="Activates or deactivates verbose output. (default=%(default)s)", ) - parser.add_argument( "-c", "--command", help="Takes the string right after the flag to execute it.", ) - parser.add_argument("-V", "--version", action="version", version=tempbox_version) - args = parser.parse_args() + +# Begin of script logic if args.command is not None: with tempfile.TemporaryDirectory() as temp_dir: - logger.debug(f"'{temp_dir}' was created") + logger.info(f"'{temp_dir}' was created") if args.command is not None: execute_as_subprocess( args.command, @@ -41,7 +41,4 @@ if args.command is not None: ) else: parser.print_help() - logger.info("Printed Version") - - -# Creates a temporary directory and executes the command in it. + logger.debug("Printed Version")