Rename delete -> delete! and create -> create!

Fix save_project for delete and create

Author: c42f

src/FileTree.jl

@@ -389,7 +389,7 @@ newfile(tree::FileTree, path::AbstractString; kws...) =
 newfile(func::Function, tree::FileTree, path::AbstractString; kws...) =
     newfile(func, tree, RelPath(path); kws...)
 Base.delete!(tree::FileTree, path::AbstractString) =
-    delete!(tree, RelPath(path))
+    Base.delete!(tree, RelPath(path))
 
 function _check_writeable(tree)
     if !iswriteable(tree.root)
@@ -457,7 +457,7 @@ function Base.delete!(tree::FileTree, path::RelPath)
     _check_writeable(tree)
     relpath = joinpath(tree.path, path)
     root = tree.root
-    delete!(root, relpath)
+    Base.delete!(root, relpath)
 end
 
 function Base.open(f::Function, ::Type{FileTree}, tree::FileTree)

src/data_project.jl

@@ -250,7 +250,7 @@ end
 
 function Base.setindex!(proj::DataProject, data::DataSet, name::AbstractString)
     if haskey(proj, name) && proj[name] !== data
-        throw(ArgumentError("Cannot replace existing dataset with name \"$name\". Try DataSets.delete() first."))
+        throw(ArgumentError("Cannot replace existing dataset with name \"$name\". Try delete!() first."))
     end
     if isnothing(data_project(data))
         setfield!(data, :project, proj)
@@ -260,8 +260,8 @@ function Base.setindex!(proj::DataProject, data::DataSet, name::AbstractString)
     proj.datasets[name] = data
 end
 
-function delete(proj::DataProject, name::AbstractString)
-    delete!(proj.datasets, name)
+function Base.delete!(proj::DataProject, name::AbstractString)
+    Base.delete!(proj.datasets, name)
 end
 
 #-------------------------------------------------------------------------------
@@ -321,20 +321,20 @@ function Base.show(io::IO, mime::MIME"text/plain", stack::StackedDataProject)
     end
 end
 
-function create(stack::StackedDataProject, name; kws...)
+function create!(stack::StackedDataProject, name; kws...)
     for proj in stack.projects
-        ds = create(proj, name; kws...)
+        ds = create!(proj, name; kws...)
         if !isnothing(ds)
             return ds
         end
     end
     return nothing
 end
 
-function delete(stack::StackedDataProject, name)
+function Base.delete!(stack::StackedDataProject, name)
     for proj in stack.projects
         if haskey(proj, name)
-            delete(proj, name)
+            Base.delete!(proj, name)
             return
         end
     end
@@ -401,15 +401,21 @@ function config!(name::AbstractString; kws...)
     config!(PROJECT, name; kws...)
 end
 
-function create(name::AbstractString; kws...)
-    ds = create(PROJECT, name; kws...)
+function create!(name::AbstractString; kws...)
+    ds = create!(PROJECT, name; kws...)
     if isnothing(ds)
         error("Could not create dataset in any available data project")
     end
     return ds
 end
 
-function delete(name::AbstractString)
-    delete(PROJECT, name)
+# Version of `delete!` for acting on the global data project.
+#
+# Unfortunately this can't be a method of `Base.delete!`, as that'd be type
+# piracy...
+function delete!(name::AbstractString)
+    Base.delete!(PROJECT, name)
 end
 
+# DataSets.delete! is just Base.delete! in other cases
+delete!(xs...) = Base.delete!(xs...)

src/file_data_projects.jl

@@ -147,14 +147,21 @@ function config!(proj::AbstractTomlFileDataProject, dataset::DataSet; kws...)
     if data_project(dataset) !== proj
         error("dataset must belong to project")
     end
-    # Here we accept the update independently of the project - Data.toml should
-    # be able to manage any dataset config.
-    config!(nothing, dataset; kws...)
-    set_cache(proj, project_toml(get_cache(proj, false)))
+    _save_project(proj) do inner_proj
+        # Here we accept the update independently of the project - Data.toml
+        # should be able to manage any dataset config.
+        config!(nothing, dataset; kws...)
+        inner_proj
+    end
     return dataset
 end
 
-function create(proj::AbstractTomlFileDataProject, name;
+function _save_project(f::Function, proj::AbstractTomlFileDataProject)
+    p = f(get_cache(proj, false))
+    set_cache(proj, project_toml(p))
+end
+
+function create!(proj::AbstractTomlFileDataProject, name;
         # One of the following required
         source::Union{Nothing,DataSet}=nothing,
         driver::Union{Nothing,AbstractString}=nothing,
@@ -228,28 +235,26 @@ end
 project_name(proj::TomlFileDataProject) = proj.path
 
 function Base.setindex!(proj::TomlFileDataProject, data::DataSet, name::AbstractString)
-    p = get_cache(proj)
-    p[name] = data
-    save_project(proj.path, p)
+    _save_project(proj) do inner_proj
+        inner_proj[name] = data
+        inner_proj
+    end
 end
 
-function delete(proj::TomlFileDataProject, name::AbstractString)
-    # FIXME: Make this safe for concurrent use in-process
-    # (or better, between processes?)
-    p = get_cache(proj)
+function Base.delete!(proj::TomlFileDataProject, name::AbstractString)
+    _save_project(proj) do inner_proj
+        ds = dataset(inner_proj, name)
+        # Assume all datasets which don't have the "linked" property are linked.
+        # This prevents us accidentally deleting data.
+        if get(ds, "linked", true)
+            @info "Linked dataset is preserved on data storage" name
+        else
+            driver = _find_driver(ds)
+            delete_storage(proj, driver, ds)
+        end
 
-    ds = dataset(p, name)
-    # Assume all datasets which don't have the "linked" property are linked.
-    # This prevents us accidentally deleting data.
-    if get(ds, "linked", true)
-        @info "Linked dataset is preserved on data storage" name
-    else
-        driver = _find_driver(ds)
-        delete_storage(proj, driver, ds)
+        Base.delete!(inner_proj, name)
     end
-
-    delete(p, name)
-    save_project(proj.path, p)
 end
 
 #-------------------------------------------------------------------------------