From 14ac54b346c78c45f21ee50e263db96483cf1c7b Mon Sep 17 00:00:00 2001 From: lifegpc Date: Sat, 27 Aug 2022 12:05:22 +0800 Subject: [PATCH] Change ways to store base, path in file --- comic_library_info.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/comic_library_info.py b/comic_library_info.py index 87148c0..823fe10 100644 --- a/comic_library_info.py +++ b/comic_library_info.py @@ -402,7 +402,10 @@ def run(args: Optional[List[str]] = None): if args.verbose > 1: print(args) if args.ACTION in ['d', 'dump']: - data = {'path': args.PATH, 'base': args.base, 'tree': {}} + args.base = abspath(args.base) + data = {'path': [], 'base': args.base, 'tree': {}} + for p in args.PATH: + data['path'].append(relpath(abspath(p), args.base)) elif args.ACTION in ['m', 'modify']: if args.type == 'json': with open(args.file, 'r', encoding='UTF-8') as f: @@ -411,9 +414,12 @@ def run(args: Optional[List[str]] = None): with open(args.file, 'r', encoding='UTF-8') as f: data = loadyaml(f, SafeLoader) if args.PATH is None: - args.PATH = data['path'] + for p in data['path']: + args.PATH.append(join(args.base, p)) if args.base is None: args.base = data['base'] + else: + args.base = abspath(args.base) if args.verbose > 2: print(data) for p in args.PATH: