From acc3a4dcccdebffc185a62281bfdd6f35dbb4180 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 2 May 2021 02:16:34 -0600 Subject: [PATCH] Add extract_tool() function --- scripts/wk/kit/tools.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/wk/kit/tools.py b/scripts/wk/kit/tools.py index ca44e61e..4aef66e3 100644 --- a/scripts/wk/kit/tools.py +++ b/scripts/wk/kit/tools.py @@ -101,6 +101,15 @@ def extract_archive(archive, out_path, *args, mode='x', silent=True): run_program(cmd) +def extract_tool(folder): + """Extract tool.""" + extract_archive( + find_kit_dir('.cbin').joinpath(folder).with_suffix('.7z'), + find_kit_dir('.bin').joinpath(folder), + '-aos', f'-p{ARCHIVE_PASSWORD}', + ) + + def find_kit_dir(name=None): """Find folder in kit, returns pathlib.Path. @@ -157,11 +166,7 @@ def run_tool( # Extract from .cbin if cbin: - extract_archive( - find_kit_dir('.cbin').joinpath(folder).with_suffix('.7z'), - find_kit_dir('.bin').joinpath(folder), - '-aos', f'-p{ARCHIVE_PASSWORD}', - ) + extract_tool(folder) # Download tool if download: