Only check git committed datasets

make_artifacts.jl

@@ -25,7 +25,7 @@ Create a artifact tarball for a folder.
 - `folder`: subfolders in `datasets/` folder, e.g. `"Si2"`
 - `local_url`: use local file path for the url, for testing only
 """
-function create_artifact(folder::AbstractString; local_url::Bool = false)
+function create_artifact(folder::AbstractString; local_url::Bool=false)
     fullpath = joinpath(datasets_dir, folder)
     isdir(fullpath) || return
 
@@ -98,7 +98,7 @@ end
 """
 Get the git hash of the latest commit of a file.
 """
-function git_hash(path::AbstractString; branch::AbstractString = "HEAD")
+function git_hash(path::AbstractString; branch::AbstractString="HEAD")
     return read(`git log -n 1 --pretty=format:"%H" $branch -- "$path"`, String)
 end
 
@@ -111,6 +111,16 @@ function git_date(githash::AbstractString)
     return unix2datetime(parse(Float64, g))
 end
 
+"""
+Get the list of files in a git tree.
+"""
+function git_lstree(path::AbstractString; args::AbstractVector{<:AbstractString}=String[], branch::AbstractString="HEAD")
+    cmd = `git ls-tree $args --name-only $branch -- "$path"`
+    output = chomp(read(cmd, String))
+    isempty(output) && return String[]
+    return split(output, '\n')
+end
+
 """
 Get list of artifact tarballs in the deploy branch.
 """
@@ -120,9 +130,16 @@ function list_previous_artifacts()
     # you need to run at least once
     # `git checkout artifacts`
     # to create the artifacts branch
-    files = split(read(`git ls-tree -r --name-only $deploy_branch`, String))
+    files = try
+        git_lstree("."; args=["-r"], branch=deploy_branch)
+    catch e
+        @warn "Failed to list previous artifacts, perhaps you need to run \
+            `git checkout artifacts` at least once to create the branch?"
+        throw(e)
+        String[]
+    end
     filter!(f -> endswith(f, ".tar.gz"), files)
-    return Dict(f => git_hash(f; branch = deploy_branch) for f in files)
+    return Dict(f => git_hash(f; branch=deploy_branch) for f in files)
 end
 
 """
@@ -133,7 +150,13 @@ function list_new_folders()
     prev_artifacts = list_previous_artifacts()
 
     new_folders = String[]
-    for data in readdir(datasets_dir)
+    # This include all the folders in `datasets/`
+    # dirs = readdir(datasets_dir)
+    # This only include the folders that have been git committed to the main branch
+    # Note it needs exactly the `datasets/` as path: not abosulute path, with
+    # trailing slash to list subfolders.
+    dirs = map(basename, git_lstree(basename(datasets_dir) * "/"; branch="main"))
+    for data in dirs
         startswith(data, "_") && continue
         startswith(data, ".") && continue
         isdir(joinpath(datasets_dir, data)) || continue
@@ -161,7 +184,7 @@ function clean_artifacts_dir()
         println("Aborting...")
         return false
     end
-    rm(artifacts_dir; force = true, recursive = true)
+    rm(artifacts_dir; force=true, recursive=true)
     mkpath(artifacts_dir)
     println("Cleaned `$(artifacts_dir)` folder.")
     return true