From 0af22d5e8e453be070712a1200dc006acbcd7995 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Mon, 26 Oct 2020 13:42:35 +0100 Subject: [PATCH] client: Extracted def build_description --- playbook/templates/client.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/playbook/templates/client.py b/playbook/templates/client.py index a83222a..67baaa3 100755 --- a/playbook/templates/client.py +++ b/playbook/templates/client.py @@ -14,6 +14,13 @@ binding_accept = [ord('l'), ord(' '), ord('\n')] binding_back = [ord('h'), ord('q'), curses.KEY_BACKSPACE] binding_exit = [ord('Q')] +def build_description(base_dir, desc_path): + rel_path = desc_path.relative_to(base_dir) + parts = list(rel_path.parts[:-1]) + parts.append(rel_path.stem) + parts = [part.replace('_', ' ') for part in parts] + return ' - '.join(parts) + def show_pictures(files): files = list(files) # copy list files.insert(0, '/usr/bin/imvr') @@ -74,11 +81,7 @@ def main(): args = parser.parse_args() # build description if requested if args.desc_path is not None: - rel_path = args.desc_path.relative_to(args.dir) - parts = list(rel_path.parts[:-1]) - parts.append(rel_path.stem) - parts = [part.replace('_', ' ') for part in parts] - print(str(' - '.join(parts))) + print(build_description(args.dir, args.desc_path)) return # run menus in protective mode if kiosk mode is enabled def run():