From de6dcd6c084703c228a9b8175d1501b2b4f8e659 Mon Sep 17 00:00:00 2001 From: Lucas Vivo Date: Fri, 13 Nov 2026 10:41:22 +0100 Subject: [PATCH] feat(wallpaper_changer): argparse: add version, config_dir, temp_dir(wallpapers), move to src add mode which determines wallpaper folder add conf_dir where wallpaper/wp.conf etc are located move all files to new src dir --- .../wallpaper_changer/argument_parser.py | 83 +++++++++++++++---- 1 file changed, 65 insertions(+), 18 deletions(-) rename wallpaper_changer/{ => src}/wallpaper_changer/argument_parser.py (65%) diff --git a/wallpaper_changer/wallpaper_changer/argument_parser.py b/wallpaper_changer/src/wallpaper_changer/argument_parser.py similarity index 65% rename from wallpaper_changer/wallpaper_changer/argument_parser.py rename to wallpaper_changer/src/wallpaper_changer/argument_parser.py index 5586a88..85ba8e7 100644 --- a/wallpaper_changer/wallpaper_changer/argument_parser.py +++ b/wallpaper_changer/src/wallpaper_changer/argument_parser.py @@ -2,10 +2,15 @@ import shlex import sys from argparse import ArgumentParser, Namespace from collections.abc import Sequence +from importlib.metadata import version +from pathlib import Path from serverlibrary import parser_add_loglevel from wallpaper_changer.config import Config +from wallpaper_changer.logging_utils import get_logger + +logger = get_logger(__name__) def build_parser() -> ArgumentParser: @@ -13,6 +18,12 @@ def build_parser() -> ArgumentParser: prog="wallpaperchanger", description="Wallpaper changer and encrypted wallpaper vault manager", ) + parser.add_argument( + "-v", + "--version", + action="version", + version=f"%(prog)s {version('wallpaper-changer')}", + ) parser.add_argument( "-t", @@ -34,6 +45,14 @@ def build_parser() -> ArgumentParser: ) parser.add_argument("-l", "--log", action="store_true", help="Enable logging") + parser.add_argument( + "-cf", + "--conf-dir", + type=str, + default="~/.wallpaper/", + help="Set the config file directory", + ) + parser.add_argument( "-clear", "--clear", @@ -45,30 +64,53 @@ def build_parser() -> ArgumentParser: "-mon", "--monitor-config", type=int, default=0, help="Use monitors.cfg" ) parser.add_argument("-screen", help="Override screen size") - - folder_group = parser.add_mutually_exclusive_group() - folder_group.add_argument( + parser.add_argument( + "-td", + "--temp-dir", + type=str, + help="Set the temporary directory for wallpaper images", + ) + parser.add_argument( + "-pk", + "--private-key", + type=str, + help="Set the private key file for encryption/decryption", + ) + parser.add_argument( "-f", "--folder", - type=str.lower, - choices=("x", "insta", "default"), + type=str, metavar="FOLDER", - default="default", - help="Select the image folder: x or insta", + help="Select a folder path or a folder relative to the wallpaper directory", ) - folder_group.add_argument( + parser.add_argument( + "-m", + "--mode", + choices=("default", "x", "i"), + default="default", + help="Select the default, corrupt (x), or insta (i) folder mode", + ) + mode_group = parser.add_mutually_exclusive_group() + mode_group.add_argument( + "-d", + dest="mode", + action="store_const", + const="default", + help="Select default mode", + ) + mode_group.add_argument( "-x", - dest="folder", + dest="mode", action="store_const", const="x", - help="Alias for --folder x", + help="Select corrupt mode", ) - folder_group.add_argument( + mode_group.add_argument( "-i", - dest="folder", + dest="mode", action="store_const", - const="insta", - help="Alias for --folder insta", + const="i", + help="Select insta mode", ) parser.add_argument( @@ -79,7 +121,7 @@ def build_parser() -> ArgumentParser: action="store_true", help="Skip encryption and decryption when building a wallpaper", ) - parser.add_argument("-replace", action="store_true", help="Replace encrypted image") + parser.add_argument("--replace", action="store_true", help="Replace encrypted image") parser.add_argument( "-ch-enc", "--check-encryption", @@ -116,17 +158,22 @@ def build_parser() -> ArgumentParser: parser_add_loglevel(parser) return parser - def parse_args(argv: Sequence[str] | None = None) -> Namespace: command_line = list(sys.argv[1:] if argv is None else argv) parser = build_parser() initial_args, _ = parser.parse_known_args(command_line) if not initial_args.config: + logger.debug("No confiig file used") return parser.parse_args(command_line) - + logger.debug("Use config File") + if initial_args.mode == "default": + conf_file = Path(initial_args.conf_dir).expanduser().resolve() / "wp.conf" + else: + conf_file = Path(initial_args.conf_dir).expanduser().resolve() / "wpX.conf" config_tokens = shlex.split( - Config.argument_config_file().read_text(), + Config.argument_config_file(conf_file).read_text(), comments=True, ) config_args = parser.parse_args(config_tokens) + return parser.parse_args(command_line, namespace=config_args)