From 5f816db5c02e75285fede587c77869af9c78c4e1 Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Wed, 1 Feb 2023 19:16:13 +0100 Subject: [PATCH] Reformat files with black --- npbackup/__main__.py | 12 +++++++++--- npbackup/upgrade_client/upgrader.py | 17 +++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/npbackup/__main__.py b/npbackup/__main__.py index ec6cbd9..ca7a583 100644 --- a/npbackup/__main__.py +++ b/npbackup/__main__.py @@ -216,9 +216,13 @@ This is free software, and you are welcome to redistribute it under certain cond parser.add_argument("--license", action="store_true", help="Show license") parser.add_argument( - "--auto-upgrade", action="store_true", help="Auto upgrade NPBackup") + "--auto-upgrade", action="store_true", help="Auto upgrade NPBackup" + ) parser.add_argument( - "--upgrade-conf", action="store_true", help="Add new configuration elements after upgrade") + "--upgrade-conf", + action="store_true", + help="Add new configuration elements after upgrade", + ) args = parser.parse_args() if args.version: @@ -338,7 +342,9 @@ This is free software, and you are welcome to redistribute it under certain cond "auto_upgrade_server_password" ] except KeyError as exc: - logger.error("Missing auto upgrade info: %s, cannot launch auto upgrade", exc) + logger.error( + "Missing auto upgrade info: %s, cannot launch auto upgrade", exc + ) else: if args.auto_upgrade: logger.info("Running user initiated auto upgrade") diff --git a/npbackup/upgrade_client/upgrader.py b/npbackup/upgrade_client/upgrader.py index 6b4daea..ce4e899 100644 --- a/npbackup/upgrade_client/upgrader.py +++ b/npbackup/upgrade_client/upgrader.py @@ -40,7 +40,7 @@ def sha256sum_data(data): def need_upgrade(upgrade_interval: int) -> bool: """ Basic counter which allows an upgrade only every X times this is called so failed operations won't end in an endless upgrade loop - + We need to make to select a write counter file that is writable So we actually test a local file and a temp file (less secure for obvious reasons) We just have to make sure that once we can write to one file, we stick to it unless proven otherwise @@ -48,11 +48,11 @@ def need_upgrade(upgrade_interval: int) -> bool: The for loop logic isn't straight simple, but allows file fallback """ # file counter, local, home, or temp if not available - counter_file = 'npbackup.autoupgrade.log' + counter_file = "npbackup.autoupgrade.log" def _write_count(file: str, counter: int) -> bool: try: - with open(file, 'w') as fpw: + with open(file, "w") as fpw: fpw.write(str(counter)) return True except OSError: @@ -61,7 +61,7 @@ def need_upgrade(upgrade_interval: int) -> bool: def _get_count(file: str) -> Optional[int]: try: - with open(file, 'r') as fpr: + with open(file, "r") as fpr: count = int(fpr.read()) return count except OSError: @@ -71,12 +71,13 @@ def need_upgrade(upgrade_interval: int) -> bool: logger.error("Bogus upgrade counter in %s", file) return None - - - for file in [os.path.join(CURRENT_DIR, counter_file), os.path.join(tempfile.gettempdir(), counter_file)]: + for file in [ + os.path.join(CURRENT_DIR, counter_file), + os.path.join(tempfile.gettempdir(), counter_file), + ]: if not os.path.isfile(file): if _write_count(file, 1): - logger.debug('Initial upgrade counter written to %s', file) + logger.debug("Initial upgrade counter written to %s", file) else: logger.debug("Cannot write to upgrade counter file %s", file) continue