From d025a57346d2157f20391d571651a3d48367a0e0 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 17 Sep 2024 15:02:55 +0200 Subject: [PATCH] Reformat files with black --- npbackup/core/upgrade_runner.py | 5 +++-- npbackup/upgrade_client/upgrader.py | 4 +--- upgrade_server/upgrade_server/api.py | 4 +++- upgrade_server/upgrade_server/crud.py | 6 ++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/npbackup/core/upgrade_runner.py b/npbackup/core/upgrade_runner.py index 5ee27a0..34b1a2a 100644 --- a/npbackup/core/upgrade_runner.py +++ b/npbackup/core/upgrade_runner.py @@ -107,8 +107,9 @@ def run_upgrade(full_config: dict, ignore_errors: bool = False) -> bool: logger.warning(f"Missing auto upgrade info, cannot launch auto upgrade") return False - - evaluated_full_config = npbackup.configuration.evaluate_variables(full_config, full_config) + evaluated_full_config = npbackup.configuration.evaluate_variables( + full_config, full_config + ) auto_upgrade_host_identity = evaluated_full_config.g( "global_options.auto_upgrade_host_identity" ) diff --git a/npbackup/upgrade_client/upgrader.py b/npbackup/upgrade_client/upgrader.py index 11bc7c7..5302578 100644 --- a/npbackup/upgrade_client/upgrader.py +++ b/npbackup/upgrade_client/upgrader.py @@ -148,9 +148,7 @@ def auto_upgrader( if IS_LEGACY: platform_and_arch += "-legacy" try: - host_id = "{}/{}/{}".format( - auto_upgrade_host_identity, npbackup_version, group - ) + host_id = "{}/{}/{}".format(auto_upgrade_host_identity, npbackup_version, group) id_record = "{}/{}".format(platform_and_arch, host_id) except TypeError: id_record = platform_and_arch diff --git a/upgrade_server/upgrade_server/api.py b/upgrade_server/upgrade_server/api.py index 700ca9f..da27fe3 100644 --- a/upgrade_server/upgrade_server/api.py +++ b/upgrade_server/upgrade_server/api.py @@ -124,7 +124,9 @@ async def current_version( ) -@app.get("/upgrades/{platform}/{arch}", response_model=Union[FileSend, dict], status_code=200) +@app.get( + "/upgrades/{platform}/{arch}", response_model=Union[FileSend, dict], status_code=200 +) @app.get( "/upgrades/{platform}/{arch}/{auto_upgrade_host_identity}", response_model=Union[FileSend, dict], diff --git a/upgrade_server/upgrade_server/crud.py b/upgrade_server/upgrade_server/crud.py index da662d6..06f3d14 100644 --- a/upgrade_server/upgrade_server/crud.py +++ b/upgrade_server/upgrade_server/crud.py @@ -86,7 +86,9 @@ def get_current_version() -> Optional[CurrentVersion]: logger.error("Trace:", exc_info=True) -def get_file(file: FileGet, content: bool = False) -> Optional[Union[FileSend, bytes, dict]]: +def get_file( + file: FileGet, content: bool = False +) -> Optional[Union[FileSend, bytes, dict]]: possible_filename = "npbackup.zip" path = os.path.join( config_dict["upgrades"]["data_root"], @@ -104,7 +106,7 @@ def get_file(file: FileGet, content: bool = False) -> Optional[Union[FileSend, b "filename": None, "file_length": 0, } - + with open(path, "rb") as fh: bytes = fh.read() if content: