From fc625d1815b1a8c87ce5c51ed1af1e65cb850ea2 Mon Sep 17 00:00:00 2001 From: vg Date: Fri, 16 Sep 2022 15:05:18 +0200 Subject: git-sync on seele --- Makefile | 2 +- gamechestcli/gamechest/cliactions/install.py | 4 +--- gamechestcli/gamechest/cliactions/remove.py | 6 ++---- gamechestcli/gamechest/config.py | 5 +++-- gamechestcli/gamechest/processor.py | 2 +- gamechestcli/gamechest/runners/download.py | 2 +- gamechestcli/gamechest/runners/extract.py | 2 +- gamechestcli/gamechest/runners/install.py | 6 +++--- gamechestcli/gamechest/runners/remove.py | 4 ++-- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 567e21a..6dde37e 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,3 @@ static-fix: - isort -rc gamechestcli + isort --order-by-type --atomic gamechestcli diff --git a/gamechestcli/gamechest/cliactions/install.py b/gamechestcli/gamechest/cliactions/install.py index ed62760..9d55883 100644 --- a/gamechestcli/gamechest/cliactions/install.py +++ b/gamechestcli/gamechest/cliactions/install.py @@ -1,8 +1,6 @@ import functools -from .. import gamedb -from .. import paths -from .. import processor +from .. import gamedb, paths, processor from ..runners.install import Install from ..statusdb import StatusDB diff --git a/gamechestcli/gamechest/cliactions/remove.py b/gamechestcli/gamechest/cliactions/remove.py index c187ae1..2024b4b 100644 --- a/gamechestcli/gamechest/cliactions/remove.py +++ b/gamechestcli/gamechest/cliactions/remove.py @@ -2,12 +2,10 @@ import contextlib import functools import selectors -from rich.progress import Progress as RichProgress from rich import print +from rich.progress import Progress as RichProgress -from .. import gamedb -from .. import paths -from .. import processor +from .. import gamedb, paths, processor from ..runners.remove import Remove from ..statusdb import StatusDB diff --git a/gamechestcli/gamechest/config.py b/gamechestcli/gamechest/config.py index 38b02fd..cd0c7e8 100644 --- a/gamechestcli/gamechest/config.py +++ b/gamechestcli/gamechest/config.py @@ -1,8 +1,9 @@ +from dataclasses import asdict, dataclass from pathlib import Path -from dataclasses import dataclass, asdict import yaml -from xdg.BaseDirectory import load_first_config, save_config_path, xdg_data_home +from xdg.BaseDirectory import (load_first_config, save_config_path, + xdg_data_home) CONFIG_PATH_TUPLE = ('org.devys.gamechest', 'config.yaml') diff --git a/gamechestcli/gamechest/processor.py b/gamechestcli/gamechest/processor.py index 794deb8..89a340c 100644 --- a/gamechestcli/gamechest/processor.py +++ b/gamechestcli/gamechest/processor.py @@ -1,8 +1,8 @@ import contextlib import selectors -from rich.progress import Progress as RichProgress from rich import print +from rich.progress import Progress as RichProgress def process_task(title, task): diff --git a/gamechestcli/gamechest/runners/download.py b/gamechestcli/gamechest/runners/download.py index 0dfbd05..8629b16 100644 --- a/gamechestcli/gamechest/runners/download.py +++ b/gamechestcli/gamechest/runners/download.py @@ -57,8 +57,8 @@ class Download(RunnerBase): if __name__ == '__main__': - import sys import contextlib + import sys with contextlib.ExitStack() as stack: stack.enter_context(contextlib.suppress(KeyboardInterrupt)) runner = stack.enter_context(Download(sys.argv[1], sys.argv[2])) diff --git a/gamechestcli/gamechest/runners/extract.py b/gamechestcli/gamechest/runners/extract.py index e8011a7..12f4d2f 100644 --- a/gamechestcli/gamechest/runners/extract.py +++ b/gamechestcli/gamechest/runners/extract.py @@ -85,8 +85,8 @@ class Extract(RunnerBase): if __name__ == '__main__': - import sys import contextlib + import sys with contextlib.suppress(KeyboardInterrupt): with Extract(sys.argv[1], sys.argv[2]) as runner: while runner.poll() is None: diff --git a/gamechestcli/gamechest/runners/install.py b/gamechestcli/gamechest/runners/install.py index a827e25..36b0153 100644 --- a/gamechestcli/gamechest/runners/install.py +++ b/gamechestcli/gamechest/runners/install.py @@ -1,10 +1,10 @@ import functools import os -from .runnermulti import MultiSequencialRunnerBase from .download import Download from .extract import Extract from .remove import Remove +from .runnermulti import MultiSequencialRunnerBase class Install(MultiSequencialRunnerBase): @@ -21,10 +21,10 @@ class Install(MultiSequencialRunnerBase): if __name__ == '__main__': - import sys import contextlib - import time import selectors + import sys + import time print('main test') with contextlib.ExitStack() as stack: stack.enter_context(contextlib.suppress(KeyboardInterrupt)) diff --git a/gamechestcli/gamechest/runners/remove.py b/gamechestcli/gamechest/runners/remove.py index 99c4247..87177f3 100644 --- a/gamechestcli/gamechest/runners/remove.py +++ b/gamechestcli/gamechest/runners/remove.py @@ -133,10 +133,10 @@ class Remove(RunnerBase): if __name__ == '__main__': - import sys import contextlib - import time import selectors + import sys + import time with contextlib.ExitStack() as stack: stack.enter_context(contextlib.suppress(KeyboardInterrupt)) -- cgit v1.2.3