add merge flag to arc get

nfdi4plants · Jul 13, 2023 · 3ff8697 · 3ff8697
1 parent 7117a76
commit 3ff8697
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/ArcCommander/APIs/GitAPI.fs b/src/ArcCommander/APIs/GitAPI.fs
@@ -28,7 +28,9 @@ module GitAPI =
         let repoDir = GeneralConfiguration.getWorkDirectory arcConfiguration
 
         let remoteAddress = getFieldValueByName "RepositoryAddress" gitArgs
-
+
+        let merge = containsFlag "Merge" gitArgs
+
         let branch = 
             match tryGetFieldValueByName "BranchName" gitArgs with 
             | Some branchName -> $" -b {branchName}"
@@ -40,7 +42,7 @@ module GitAPI =
             else
                 ""
 
-        if System.IO.Directory.GetFileSystemEntries repoDir |> Array.isEmpty then
+        if merge then
             log.Trace("Downloading into current folder.")
             executeGitCommand repoDir $"clone {lfsConfig} {remoteAddress}{branch} ." |> ignore
         else 

diff --git a/src/ArcCommander/CLIArguments/ArcArgs.fs b/src/ArcCommander/CLIArguments/ArcArgs.fs
@@ -72,14 +72,15 @@ type ArcGetArgs =
     | [<Mandatory>][<Unique>][<AltCommandLine("-r")>] RepositoryAddress of repository_address:string
     | [<Unique>][<AltCommandLine("-b")>] BranchName         of branch_name:string
     | [<Unique>][<AltCommandLine("-n")>] NoLFS
+    | [<Unique>][<AltCommandLine("-m")>] Merge
 
     interface IArgParserTemplate with
         member this.Usage =
             match this with
             | RepositoryAddress _ -> "Git remote address from which to pull the ARC"
             | BranchName        _ -> "Branch of the remote address which should be used. If none is given, uses \"main\""
             | NoLFS             _ -> "Does download only the pointers of LFS files, not the file content itself. Ideal for when you're only interested in the experimental metadata, not the data itself."
-
+            | Merge             _ -> "Merges the repository into the current folder. Fails, if the current folder isn't empty."
 
 type ArcServerArgs =
     | [<Unique>][<AltCommandLine("-p")>] Port           of port_address : string