From 253d498a4e5348cf1e3c91d08ac4a454066c13fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 5 Aug 2025 21:55:05 +0200 Subject: [PATCH] [scripts/util] add 'trim()' helper --- scripts/generate_test_result.py | 2 +- scripts/init.py | 8 ++------ scripts/util.py | 4 ++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/generate_test_result.py b/scripts/generate_test_result.py index faf7c456..9e9cd5f2 100755 --- a/scripts/generate_test_result.py +++ b/scripts/generate_test_result.py @@ -140,7 +140,7 @@ def main(): LOG.info("Collecting data for '%s'", args.url) result = generate_test_result(args) - LOG.info("Writing '%s' results to '%s'", args.url, path) + LOG.info("Writing '%s' results to '%s'", args.url, util.trim(path)) insert_test_result(args, result, lines) with util.lazy(path) as fp: diff --git a/scripts/init.py b/scripts/init.py index e9570c6b..c92b21a1 100755 --- a/scripts/init.py +++ b/scripts/init.py @@ -60,7 +60,7 @@ def create_extractor_module(args): category = args.category path = util.path("gallery_dl", "extractor", f"{category}.py") - LOG.info("Creating '%s'", trim_path(path)) + LOG.info("Creating '%s'", util.trim(path)) type = args.type if type == "manga": @@ -218,7 +218,7 @@ BASE_PATTERN = r"(?:https?://)?{subdomain}{re.escape(domain)}" def create_test_results_file(args): path = util.path("test", "results", f"{args.category}.py") - LOG.info("Creating '%s'", trim_path(path)) + LOG.info("Creating '%s'", util.trim(path)) import_stmt = generate_test_result_import(args) with util.open(path, "x") as fp: @@ -311,10 +311,6 @@ def insert_into_supportedsites(args): ############################################################################### # General ##################################################################### -def trim_path(path): - return path[len(util.ROOTDIR)+1:] - - def parse_args(args=None): parser = argparse.ArgumentParser(args) diff --git a/scripts/util.py b/scripts/util.py index 7579d25e..fcbf8265 100644 --- a/scripts/util.py +++ b/scripts/util.py @@ -19,6 +19,10 @@ def path(*segments): return result +def trim(path): + return path[len(ROOTDIR)+1:] + + def open(path, mode="r"): return builtins.open(path, mode, encoding="utf-8", newline="\n")