diff --git a/fishbook/backend/database.py b/fishbook/backend/database.py index b9ce3d2..dbc989f 100644 --- a/fishbook/backend/database.py +++ b/fishbook/backend/database.py @@ -231,7 +231,7 @@ def populate_datasets(data_path, update=False): inserts = Datasets.get_template_tuple() inserts["dataset_id"] = dset_name - inserts["data_source"] = data_path + inserts["data_source"] = os.path.abspath(data_path) inserts["data_host"] = socket.getfqdn() inserts["experimenter"] = experimenter inserts["recording_date"] = rec_date @@ -434,7 +434,6 @@ def scan_folder_for_repros(dataset): repro_settings, stim_indices = read_stimuli_file(dataset["data_source"]) repro_counts = {} cell_id = (Cells * CellDatasetMap * (Datasets & "dataset_id = '%s'" % dataset["dataset_id"])).fetch("cell_id", limit=1)[0] - total = len(repro_settings) for i, (rs, si) in enumerate(zip(repro_settings, stim_indices)): rp = Repros.get_template_tuple() path = [] @@ -449,8 +448,7 @@ def scan_folder_for_repros(dataset): if not find_key_recursive(rs, "repro", path): find_key_recursive(rs, "RePro", path) rp["repro_name"] = deep_get(rs, path, "None") - progress(i+1, total, "scanning repro %s" % rp["repro_name"]) - + path = [] if rp["repro_name"] in repro_counts.keys(): repro_counts[rp["repro_name"]] += 1 @@ -469,7 +467,10 @@ def scan_folder_for_repros(dataset): repro.pop("repro_name") repro.pop("start") repro.pop("duration") + + total = len(si.keys()) for j, k in enumerate(si.keys()): + progress(j+1, total, "scanning repro %s" % rp["repro_name"]) s = int(si[k]) stim_start = 0. path = [] @@ -495,7 +496,9 @@ def scan_folder_for_repros(dataset): stim["stimulus_name"] = "" stim.update(repro) Stimuli.insert1(stim, skip_duplicates=True) - print("\n") + print(" " *120, end='\r') + #if i < len(repro_settings): + # print((" " * 150), end="\r") def populate_repros(data_path):