diff --git a/corrlib/__init__.py b/corrlib/__init__.py index 4e1b364..afc6776 100644 --- a/corrlib/__init__.py +++ b/corrlib/__init__.py @@ -22,3 +22,4 @@ from .meas_io import load_records as load_records from .find import find_project as find_project from .find import find_record as find_record from .find import list_projects as list_projects +from .config import * diff --git a/corrlib/initialization.py b/corrlib/initialization.py index 14bcaf0..130cea8 100644 --- a/corrlib/initialization.py +++ b/corrlib/initialization.py @@ -63,7 +63,7 @@ def create(path: str) -> None: Create folder of backlogs. """ - create(path) + dl.create(path) _create_db(os.path.join(path, 'backlogger.db')) os.chmod(os.path.join(path, 'backlogger.db'), 0o666) # why does this not work? _create_config(path) diff --git a/corrlib/toml.py b/corrlib/toml.py index 7b02e33..11065fe 100644 --- a/corrlib/toml.py +++ b/corrlib/toml.py @@ -10,12 +10,10 @@ the import of projects via TOML. import tomllib as toml import shutil - -import datalad.api as dl -from .tracker import save from .input import sfcf, openQCD from .main import import_project, update_aliases from .meas_io import write_measurement +import datalad.api as dl import os from .input.implementations import codes as known_codes from typing import Any @@ -152,7 +150,7 @@ def import_toml(path: str, file: str, copy_file: bool=True) -> None: if copy_file: import_file = os.path.join(path, "toml_imports", uuid, file.split("/")[-1]) shutil.copy(file, import_file) - save(path, files=[import_file], message="Import using " + import_file) + dl.save(import_file, message="Import using " + import_file, dataset=path) print("File copied to " + import_file) print("Imported project.") return diff --git a/corrlib/tracker.py b/corrlib/tracker.py index 7f63e9b..fcf3994 100644 --- a/corrlib/tracker.py +++ b/corrlib/tracker.py @@ -3,7 +3,7 @@ from configparser import ConfigParser from .trackers import datalad as dl -def get_tracker(path: str) -> str: +def get_tracker(path): config_path = os.path.join(path, '.corrlib') config = ConfigParser() if os.path.exists(config_path): @@ -12,7 +12,7 @@ def get_tracker(path: str) -> str: return tracker -def get(path: str, file: str) -> None: +def get(path, file): tracker = get_tracker(path) if tracker == 'datalad': dl.get_file(path, file) @@ -21,18 +21,9 @@ def get(path: str, file: str) -> None: return -def save(path: str, message: str, files: list[str]) -> None: +def save(path, message, files): tracker = get_tracker(path) if tracker == 'datalad': dl.save(files, message=message, dataset=path) else: raise ValueError(f"Tracker {tracker} is not supported.") - - -def create(path: str) -> None: - tracker = get_tracker(path) - if tracker == 'datalad': - dl.create(path) - else: - raise ValueError(f"Tracker {tracker} is not supported.") - return diff --git a/corrlib/trackers/datalad.py b/corrlib/trackers/datalad.py index 4eccf0f..e9a6e9f 100644 --- a/corrlib/trackers/datalad.py +++ b/corrlib/trackers/datalad.py @@ -18,8 +18,3 @@ def save(path, message, files= None): files = [os.path.join(path, f) for f in files] dl.save(files, message=message, dataset=path) return - - -def create(path): - dl.create(path) - return