From 9d2c35f4665e3697deb91849d83560379de2b2e0 Mon Sep 17 00:00:00 2001 From: CPD Date: Tue, 4 Mar 2025 17:50:59 +0100 Subject: [PATCH] Auto add number when dir exists --- cpdctrl/utility/data.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/cpdctrl/utility/data.py b/cpdctrl/utility/data.py index e1836c3..4bc68a6 100644 --- a/cpdctrl/utility/data.py +++ b/cpdctrl/utility/data.py @@ -11,12 +11,12 @@ METADATA_FILENAME = "_measurement_metadata.pkl" class DataCollector: columns = ["idx", "t [s]", "V [V]", "LED [%]"] - def __init__(self, + def __init__(self, data_path: str, - data_name: str="CPData", + data_name: str="CPData", metadata: dict[str, str]={}, dirname: str|None=None, - dir_exists_is_ok=False, + add_number_if_dir_exists=True, ): self.data = [] self.fulldata = None # if loaded, this contains the final numpy array @@ -30,10 +30,17 @@ class DataCollector: self.dirpath = os.path.join(self.path, self.dirname) if os.path.exists(self.dirpath): - if not dir_exists_is_ok: - raise Exception(f"Directory '{self.dirname}' already exists. Provide a different directory or pass `dir_exists_is_ok=True` to ignore this") - else: - os.makedirs(self.dirpath) + if not add_number_if_dir_exists: + raise Exception(f"Directory '{self.dirname}' already exists. Provide a different directory or pass `add_number_if_dir_exists=True` to ignore this") + else: + i = 1 + dirpath = f"{self.dirpath}-{i}" + while os.path.exists(dirpath): + i += 1 + dirpath = f"{self.dirpath}-{i}" + print(f"Directory '{self.dirname}' already exists. Trying '{dirpath}' instead") + self.dirpath = dirpath + os.makedirs(self.dirpath) self.flushed = False