Actually use Dataset.__init__.

4 files changed, 9 insertions, 40 deletions

diff --git a/src/sec_certs/dataset/cc.py b/src/sec_certs/dataset/cc.py
index b86a03f3..dc1c52b4 100644
--- a/src/sec_certs/dataset/cc.py
+++ b/src/sec_certs/dataset/cc.py
@@ -98,17 +98,9 @@ class CCDataset(Dataset[CCCertificate], ComplexSerializableType):
         state: Dataset.DatasetInternalState | None = None,
         aux_handlers: dict[type[AuxiliaryDatasetHandler], AuxiliaryDatasetHandler] | None = None,
     ):
-        self.certs = certs if certs is not None else {}
-        self.timestamp = datetime.now()
-        self.sha256_digest = "not implemented"
-        self.name = name if name else type(self).__name__ + " dataset"
-        self.description = description if description else datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-        self.state = state if state else self.DatasetInternalState()
-        self.root_dir = Path(root_dir)
-        self.aux_handlers = (
-            aux_handlers
-            if aux_handlers is not None
-            else {
+        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),
@@ -116,9 +108,6 @@ class CCDataset(Dataset[CCCertificate], ComplexSerializableType):
                 ProtectionProfileDatasetHandler: ProtectionProfileDatasetHandler(self.auxiliary_datasets_dir),
                 CCMaintenanceUpdateDatasetHandler: CCMaintenanceUpdateDatasetHandler(self.auxiliary_datasets_dir),
             }
-        )
-        # Make sure that the auxiliary handlers (if supplied by the user) have the correct root_dir
-        self._set_local_paths()
 
     def to_pandas(self) -> pd.DataFrame:
         """
diff --git a/src/sec_certs/dataset/dataset.py b/src/sec_certs/dataset/dataset.py
index af7a56ae..dafb597b 100644
--- a/src/sec_certs/dataset/dataset.py
+++ b/src/sec_certs/dataset/dataset.py
@@ -63,8 +63,8 @@ class Dataset(Generic[CertSubType], ComplexSerializableType, ABC):
 
         self.timestamp = datetime.now()
         self.sha256_digest = "not implemented"
-        self.name = name if name else type(self).__name__.lower() + "_dataset"
-        self.description = description if description else "No description provided"
+        self.name = name if name else type(self).__name__
+        self.description = description if description else datetime.now().strftime("%d/%m/%Y %H:%M:%S")
         self.state = state if state else self.DatasetInternalState()
         self.root_dir = Path(root_dir)
         self.aux_handlers = aux_handlers if aux_handlers is not None else {}
diff --git a/src/sec_certs/dataset/fips.py b/src/sec_certs/dataset/fips.py
index 90d6b5df..cbe4b6b2 100644
--- a/src/sec_certs/dataset/fips.py
+++ b/src/sec_certs/dataset/fips.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import datetime
 import itertools
 import logging
 import shutil
@@ -66,25 +65,14 @@ class FIPSDataset(Dataset[FIPSCertificate], ComplexSerializableType):
         state: Dataset.DatasetInternalState | None = None,
         aux_handlers: dict[type[AuxiliaryDatasetHandler], AuxiliaryDatasetHandler] | None = None,
     ):
-        self.certs = certs if certs is not None else {}
-        self.timestamp = datetime.datetime.now()
-        self.sha256_digest = "not implemented"
-        self.name = name if name else type(self).__name__ + " dataset"
-        self.description = description if description else datetime.datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-        self.state = state if state else self.DatasetInternalState()
-        self.root_dir = Path(root_dir)
-        self.aux_handlers = (
-            aux_handlers
-            if aux_handlers is not None
-            else {
+        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),
             }
-        )
-        # Make sure that the auxiliary handlers (if supplied by the user) have the correct root_dir
-        self._set_local_paths()
 
     LIST_OF_CERTS_HTML: Final[dict[str, str]] = {
         "fips_modules_active.html": constants.FIPS_ACTIVE_MODULES_URL,
diff --git a/src/sec_certs/dataset/protection_profile.py b/src/sec_certs/dataset/protection_profile.py
index d5457e7f..b4200795 100644
--- a/src/sec_certs/dataset/protection_profile.py
+++ b/src/sec_certs/dataset/protection_profile.py
@@ -1,5 +1,4 @@
 import shutil
-from datetime import datetime
 from pathlib import Path
 from typing import ClassVar, Literal
 
@@ -46,14 +45,7 @@ class ProtectionProfileDataset(Dataset[ProtectionProfile], ComplexSerializableTy
         state: Dataset.DatasetInternalState | None = None,
         aux_handlers: dict[type[AuxiliaryDatasetHandler], AuxiliaryDatasetHandler] | None = None,
     ):
-        self.certs = certs if certs is not None else {}
-        self.timestamp = datetime.now()
-        self.sha256_digest = "not implemented"
-        self.name = name if name else type(self).__name__ + " dataset"
-        self.description = description if description else datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-        self.state = state if state else self.DatasetInternalState()
-        self.aux_handlers = aux_handlers if aux_handlers is not None else {}
-        self.root_dir = Path(root_dir)
+        super().__init__(certs, root_dir, name, description, state, aux_handlers)
 
     @property
     def json_path(self) -> Path: