diff options
| author | Dylan Araps <dylan.araps@gmail.com> | 2018-04-02 16:44:47 +1000 |
|---|---|---|
| committer | Dylan Araps <dylan.araps@gmail.com> | 2018-04-02 16:44:47 +1000 |
| commit | 8f331d1ef18574033dc4aadb61d6866b527d77cb (patch) | |
| tree | eeded5ace63c75be7109907424794377c49e40c6 | |
| parent | 0b3e8fafbf87cd4059ed022e8e9d272b3d3b24e3 (diff) | |
args: cleanup
| -rw-r--r-- | pywal/__main__.py | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/pywal/__main__.py b/pywal/__main__.py index 360f8e0..4ed87d8 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -26,7 +26,7 @@ from . import util from . import wallpaper -def get_args(args): +def get_args(): """Get the script arguments.""" description = "wal - Generate colorschemes on the fly" arg = argparse.ArgumentParser(description=description) @@ -88,31 +88,27 @@ def get_args(args): arg.add_argument("-e", action="store_true", help="Skip reloading gtk/xrdb/i3/sway/polybar") - return arg.parse_args(args) + return arg -def process_args_exit(args): +def parse_args_exit(parser): """Process args that exit.""" - if not len(sys.argv) > 1: - print("error: wal needs to be given arguments to run.\n" - " Refer to \"wal -h\" for more info.") - sys.exit(1) - - if args.i and args.theme: - print("error: Conflicting arguments -i and -f.\n" - " Refer to \"wal -h\" for more info.") - sys.exit(1) + args = parser.parse_args() - if not args.i and not args.theme and not args.R: - print("error: No input specified.\n" - " --theme, -i or -R are required.\n" - " Refer to \"wal -h\" for more info.") - sys.exit(1) + if not len(sys.argv) > 1: + parser.error("wal needs to be given arguments to run.") if args.v: print("wal", __version__) sys.exit(0) + if args.i and args.theme: + parser.error("Conflicting arguments -i and -f.") + + if not args.i and not args.theme and not args.R: + parser.error("No input specified.\n" + "--theme, -i or -R are required.") + if args.r: reload.colors() sys.exit(0) @@ -129,8 +125,10 @@ def process_args_exit(args): sys.exit(0) -def process_args(args): +def parse_args(parser): """Process args.""" + args = parser.parse_args() + if args.q: logging.getLogger().disabled = True sys.stdout = sys.stderr = open(os.devnull, "w") @@ -181,9 +179,10 @@ def process_args(args): def main(): """Main script function.""" util.setup_logging() - args = get_args(sys.argv[1:]) - process_args_exit(args) - process_args(args) + parser = get_args() + + parse_args_exit(parser) + parse_args(parser) if __name__ == "__main__": |
