From c7a6b2ece7b186f1157b95d44ed7b35db9687707 Mon Sep 17 00:00:00 2001 From: J08nY Date: Fri, 28 Feb 2025 15:21:52 +0100 Subject: Fix aux dset dir warning. Fixes #482. --- src/sec_certs/dataset/cc.py | 16 ++++++++++------ src/sec_certs/dataset/fips.py | 10 ++++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/sec_certs/dataset/cc.py b/src/sec_certs/dataset/cc.py index fa95f5cf..fdd0d48d 100644 --- a/src/sec_certs/dataset/cc.py +++ b/src/sec_certs/dataset/cc.py @@ -101,12 +101,16 @@ class CCDataset(Dataset[CCCertificate], ComplexSerializableType): super().__init__(certs, root_dir, name, description, state, aux_handlers) if aux_handlers is None: self.aux_handlers = { - CPEDatasetHandler: CPEDatasetHandler(self.auxiliary_datasets_dir), - CVEDatasetHandler: CVEDatasetHandler(self.auxiliary_datasets_dir), - CPEMatchDictHandler: CPEMatchDictHandler(self.auxiliary_datasets_dir), - CCSchemeDatasetHandler: CCSchemeDatasetHandler(self.auxiliary_datasets_dir), - ProtectionProfileDatasetHandler: ProtectionProfileDatasetHandler(self.auxiliary_datasets_dir), - CCMaintenanceUpdateDatasetHandler: CCMaintenanceUpdateDatasetHandler(self.auxiliary_datasets_dir), + CPEDatasetHandler: CPEDatasetHandler(self.auxiliary_datasets_dir if self.is_backed else None), + CVEDatasetHandler: CVEDatasetHandler(self.auxiliary_datasets_dir if self.is_backed else None), + CPEMatchDictHandler: CPEMatchDictHandler(self.auxiliary_datasets_dir if self.is_backed else None), + CCSchemeDatasetHandler: CCSchemeDatasetHandler(self.auxiliary_datasets_dir if self.is_backed else None), + ProtectionProfileDatasetHandler: ProtectionProfileDatasetHandler( + self.auxiliary_datasets_dir if self.is_backed else None + ), + CCMaintenanceUpdateDatasetHandler: CCMaintenanceUpdateDatasetHandler( + self.auxiliary_datasets_dir if self.is_backed else None + ), } def to_pandas(self) -> pd.DataFrame: diff --git a/src/sec_certs/dataset/fips.py b/src/sec_certs/dataset/fips.py index a64ca3d7..0f756b0a 100644 --- a/src/sec_certs/dataset/fips.py +++ b/src/sec_certs/dataset/fips.py @@ -68,10 +68,12 @@ class FIPSDataset(Dataset[FIPSCertificate], ComplexSerializableType): super().__init__(certs, root_dir, name, description, state, aux_handlers) if aux_handlers is None: self.aux_handlers = { - CPEDatasetHandler: CPEDatasetHandler(self.auxiliary_datasets_dir), - CVEDatasetHandler: CVEDatasetHandler(self.auxiliary_datasets_dir), - FIPSAlgorithmDatasetHandler: FIPSAlgorithmDatasetHandler(self.auxiliary_datasets_dir), - CPEMatchDictHandler: CPEMatchDictHandler(self.auxiliary_datasets_dir), + CPEDatasetHandler: CPEDatasetHandler(self.auxiliary_datasets_dir if self.is_backed else None), + CVEDatasetHandler: CVEDatasetHandler(self.auxiliary_datasets_dir if self.is_backed else None), + FIPSAlgorithmDatasetHandler: FIPSAlgorithmDatasetHandler( + self.auxiliary_datasets_dir if self.is_backed else None + ), + CPEMatchDictHandler: CPEMatchDictHandler(self.auxiliary_datasets_dir if self.is_backed else None), } LIST_OF_CERTS_HTML: Final[dict[str, str]] = { -- cgit v1.3.1