chore: apply pending code updates

This commit is contained in:
2026-03-17 11:39:27 +01:00
parent e5fae0a0a2
commit 92bd55ada1
45 changed files with 2236 additions and 2130 deletions

View File

@@ -36,10 +36,10 @@ class ConfigEncryption:
def _ensure_key_exists(self) -> None:
"""Ensure encryption key exists or create one."""
if not self.key_file.exists():
logger.info(f"Creating new encryption key at {self.key_file}")
logger.info("Creating new encryption key at %s", self.key_file)
self._generate_new_key()
else:
logger.info(f"Using existing encryption key from {self.key_file}")
logger.info("Using existing encryption key from %s", self.key_file)
def _generate_new_key(self) -> None:
"""Generate and store a new encryption key."""
@@ -56,7 +56,7 @@ class ConfigEncryption:
logger.info("Generated new encryption key")
except IOError as e:
logger.error(f"Failed to generate encryption key: {e}")
logger.error("Failed to generate encryption key: %s", e)
raise
def _load_key(self) -> bytes:
@@ -77,7 +77,7 @@ class ConfigEncryption:
key = self.key_file.read_bytes()
return key
except IOError as e:
logger.error(f"Failed to load encryption key: {e}")
logger.error("Failed to load encryption key: %s", e)
raise
def _get_cipher(self) -> Fernet:
@@ -117,7 +117,7 @@ class ConfigEncryption:
return encrypted_str
except Exception as e:
logger.error(f"Failed to encrypt value: {e}")
logger.error("Failed to encrypt value: %s", e)
raise
def decrypt_value(self, encrypted_value: str) -> str:
@@ -149,7 +149,7 @@ class ConfigEncryption:
return decrypted_str
except Exception as e:
logger.error(f"Failed to decrypt value: {e}")
logger.error("Failed to decrypt value: %s", e)
raise
def encrypt_config(self, config: Dict[str, Any]) -> Dict[str, Any]:
@@ -191,9 +191,9 @@ class ConfigEncryption:
'encrypted': True,
'value': self.encrypt_value(value)
}
logger.debug(f"Encrypted config field: {key}")
logger.debug("Encrypted config field: %s", key)
except Exception as e:
logger.warning(f"Failed to encrypt {key}: {e}")
logger.warning("Failed to encrypt %s: %s", key, e)
encrypted_config[key] = value
else:
encrypted_config[key] = value
@@ -222,9 +222,9 @@ class ConfigEncryption:
decrypted_config[key] = self.decrypt_value(
value['value']
)
logger.debug(f"Decrypted config field: {key}")
logger.debug("Decrypted config field: %s", key)
except Exception as e:
logger.error(f"Failed to decrypt {key}: {e}")
logger.error("Failed to decrypt %s: %s", key, e)
decrypted_config[key] = None
else:
decrypted_config[key] = value
@@ -248,7 +248,7 @@ class ConfigEncryption:
if self.key_file.exists():
backup_path = self.key_file.with_suffix('.key.bak')
self.key_file.rename(backup_path)
logger.info(f"Backed up old key to {backup_path}")
logger.info("Backed up old key to %s", backup_path)
# Generate new key
if new_key_file:

View File

@@ -276,13 +276,13 @@ class DatabaseIntegrityChecker:
removed += 1
self.session.commit()
logger.info(f"Removed {removed} orphaned records")
logger.info("Removed %s orphaned records", removed)
return removed
except Exception as e:
self.session.rollback()
logger.error(f"Error removing orphaned records: {e}")
logger.error("Error removing orphaned records: %s", e)
raise

View File

@@ -39,13 +39,15 @@ class FileIntegrityManager:
self.checksums = json.load(f)
count = len(self.checksums)
logger.info(
f"Loaded {count} checksums from {self.checksum_file}"
"Loaded %d checksums from %s",
count,
self.checksum_file,
)
except (json.JSONDecodeError, IOError) as e:
logger.error(f"Failed to load checksums: {e}")
logger.error("Failed to load checksums: %s", e)
self.checksums = {}
else:
logger.info(f"Checksum file does not exist: {self.checksum_file}")
logger.info("Checksum file does not exist: %s", self.checksum_file)
self.checksums = {}
def _save_checksums(self) -> None:
@@ -56,10 +58,12 @@ class FileIntegrityManager:
json.dump(self.checksums, f, indent=2)
count = len(self.checksums)
logger.debug(
f"Saved {count} checksums to {self.checksum_file}"
"Saved %d checksums to %s",
count,
self.checksum_file,
)
except IOError as e:
logger.error(f"Failed to save checksums: {e}")
logger.error("Failed to save checksums: %s", e)
def calculate_checksum(
self, file_path: Path, algorithm: str = "sha256"
@@ -94,12 +98,15 @@ class FileIntegrityManager:
checksum = hash_obj.hexdigest()
filename = file_path.name
logger.debug(
f"Calculated {algorithm} checksum for {filename}: {checksum}"
"Calculated %s checksum for %s: %s",
algorithm,
filename,
checksum,
)
return checksum
except IOError as e:
logger.error(f"Failed to read file {file_path}: {e}")
logger.error("Failed to read file %s: %s", file_path, e)
raise
def store_checksum(
@@ -126,7 +133,7 @@ class FileIntegrityManager:
self.checksums[key] = checksum
self._save_checksums()
logger.info(f"Stored checksum for {file_path.name}")
logger.info("Stored checksum for %s", file_path.name)
return checksum
def verify_checksum(
@@ -197,10 +204,10 @@ class FileIntegrityManager:
if key in self.checksums:
del self.checksums[key]
self._save_checksums()
logger.info(f"Removed checksum for {file_path.name}")
logger.info("Removed checksum for %s", file_path.name)
return True
else:
logger.debug(f"No checksum found to remove for {file_path.name}")
logger.debug("No checksum found to remove for %s", file_path.name)
return False
def has_checksum(self, file_path: Path) -> bool: