From cea7a01b543d43d78d9aac43327fbbb37d7aece4 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 16 Apr 2025 14:12:15 +0200 Subject: [PATCH] code styling --- app/orm.py | 4 ++-- app/util.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/orm.py b/app/orm.py index e2dd0bc..89235b0 100644 --- a/app/orm.py +++ b/app/orm.py @@ -5,7 +5,7 @@ from sqlalchemy import Column, VARCHAR, CHAR, ForeignKey, DATETIME, update, and_ from sqlalchemy.engine import Engine from sqlalchemy.orm import sessionmaker, declarative_base -from util import NV +from util import DriverMatrix Base = declarative_base() @@ -25,7 +25,7 @@ class Origin(Base): return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})' def serialize(self) -> dict: - _ = NV().find(self.guest_driver_version) + _ = DriverMatrix().find(self.guest_driver_version) return { 'origin_ref': self.origin_ref, diff --git a/app/util.py b/app/util.py index 1aae17b..f6a2efb 100644 --- a/app/util.py +++ b/app/util.py @@ -1,4 +1,5 @@ import logging +from json import load as json_load from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey, generate_private_key @@ -84,29 +85,28 @@ def load_file(filename: str) -> bytes: return content -class NV: +class DriverMatrix: __DRIVER_MATRIX_FILENAME = 'static/driver_matrix.json' __DRIVER_MATRIX: None | dict = None # https://docs.nvidia.com/grid/ => "Driver Versions" def __init__(self): self.log = logging.getLogger(self.__class__.__name__) - if NV.__DRIVER_MATRIX is None: - from json import load as json_load + if DriverMatrix.__DRIVER_MATRIX is None: try: - file = open(NV.__DRIVER_MATRIX_FILENAME) - NV.__DRIVER_MATRIX = json_load(file) + file = open(DriverMatrix.__DRIVER_MATRIX_FILENAME) + DriverMatrix.__DRIVER_MATRIX = json_load(file) file.close() - self.log.debug(f'Successfully loaded "{NV.__DRIVER_MATRIX_FILENAME}".') + self.log.debug(f'Successfully loaded "{DriverMatrix.__DRIVER_MATRIX_FILENAME}".') except Exception as e: - NV.__DRIVER_MATRIX = {} # init empty dict to not try open file everytime, just when restarting app + DriverMatrix.__DRIVER_MATRIX = {} # init empty dict to not try open file everytime, just when restarting app # self.log.warning(f'Failed to load "{NV.__DRIVER_MATRIX_FILENAME}": {e}') @staticmethod def find(version: str) -> dict | None: - if NV.__DRIVER_MATRIX is None: + if DriverMatrix.__DRIVER_MATRIX is None: return None - for idx, (key, branch) in enumerate(NV.__DRIVER_MATRIX.items()): + for idx, (key, branch) in enumerate(DriverMatrix.__DRIVER_MATRIX.items()): for release in branch.get('$releases'): linux_driver = release.get('Linux Driver') windows_driver = release.get('Windows Driver')