remove temporary non-datalad implementation
This commit is contained in:
parent
3e6c7a4fdb
commit
bc57087a5a
3 changed files with 53 additions and 40 deletions
|
|
@ -6,7 +6,7 @@ from .git_tools import move_submodule
|
|||
import shutil
|
||||
from .find import _project_lookup_by_id
|
||||
from .tools import list2str, str2list, get_db_file
|
||||
from .tracker import get, save
|
||||
from .tracker import get, save, unlock, init, clone, drop
|
||||
from typing import Union, Optional
|
||||
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ def create_project(path: str, uuid: str, owner: Union[str, None]=None, tags: Uni
|
|||
if known_projects.fetchone():
|
||||
raise ValueError("Project already imported, use update_project() instead.")
|
||||
|
||||
dl.unlock(db, dataset=path)
|
||||
unlock(path, db_file)
|
||||
alias_str = ""
|
||||
if aliases is not None:
|
||||
alias_str = list2str(aliases)
|
||||
|
|
@ -80,7 +80,7 @@ def update_aliases(path: str, uuid: str, aliases: list[str]) -> None:
|
|||
|
||||
if not len(new_alias_list) == len(known_alias_list):
|
||||
alias_str = list2str(new_alias_list)
|
||||
dl.unlock(db, dataset=path)
|
||||
unlock(path, db_file)
|
||||
update_project_data(path, uuid, "aliases", alias_str)
|
||||
save(path, message="Updated aliases for project " + uuid, files=[db_file])
|
||||
return
|
||||
|
|
@ -113,12 +113,7 @@ def import_project(path: str, url: str, owner: Union[str, None]=None, tags: Opti
|
|||
|
||||
"""
|
||||
tmp_path = os.path.join(path, 'projects/tmp')
|
||||
if not isDataset:
|
||||
dl.create(tmp_path, dataset=path)
|
||||
shutil.copytree(url + "/*", path + '/projects/tmp/')
|
||||
save(path, message="Created temporary project dataset", files=['projects/tmp'])
|
||||
else:
|
||||
dl.install(path=tmp_path, source=url, dataset=path)
|
||||
clone(path, source=url, target=tmp_path)
|
||||
tmp_ds = dl.Dataset(tmp_path)
|
||||
conf = dlc.ConfigManager(tmp_ds)
|
||||
uuid = str(conf.get("datalad.dataset.id"))
|
||||
|
|
@ -126,9 +121,8 @@ def import_project(path: str, url: str, owner: Union[str, None]=None, tags: Opti
|
|||
raise ValueError("The dataset does not have a uuid!")
|
||||
if not os.path.exists(path + "/projects/" + uuid):
|
||||
db_file = get_db_file(path)
|
||||
db = os.path.join(path, db_file)
|
||||
get(path, db_file)
|
||||
dl.unlock(db, dataset=path)
|
||||
unlock(path, db_file)
|
||||
create_project(path, uuid, owner, tags, aliases, code)
|
||||
move_submodule(path, 'projects/tmp', 'projects/' + uuid)
|
||||
os.mkdir(path + '/import_scripts/' + uuid)
|
||||
|
|
@ -151,6 +145,6 @@ def drop_project_data(path: str, uuid: str, path_in_project: str = "") -> None:
|
|||
"""
|
||||
Drop (parts of) a project to free up diskspace
|
||||
"""
|
||||
dl.drop(path + "/projects/" + uuid + "/" + path_in_project)
|
||||
drop(path + "/projects/" + uuid + "/" + path_in_project)
|
||||
return
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue