Merge pull request #352 from JuliaRobotics/fix/1Q20/306

fix save load DFG issues 344

Author: dehann

Project.toml

@@ -17,6 +17,7 @@ Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 Unmarshal = "cbff2730-442d-58d7-89d1-8e530c41eb02"
 
 [compat]

src/DistributedFactorGraphs.jl

@@ -25,6 +25,7 @@ using Unmarshal
 using JSON2 # JSON2 requires all properties to be in correct sequence, can't guarantee that from DB.
 using LinearAlgebra
 using SparseArrays
+using UUIDs
 
 
 ##==============================================================================

src/FileDFG/services/FileDFG.jl

@@ -58,11 +58,15 @@ function saveDFG(dfg::AbstractDFG, folder::String; compress::Symbol=:null)
         close(io)
     end
 
-    savedir = dirname(savepath)
+    savedir = dirname(savepath) # is this a path of just local name? #344 -- workaround with unique names
     savename = basename(string(savepath))
     @assert savename != ""
     destfile = joinpath(savedir, savename*".tar.gz")
-    run( pipeline(`tar -zcf - -C $savedir $savename`, stdout="$destfile"))
+    if length(savedir) != 0
+      run( pipeline(`tar -zcf - -C $savedir $savename`, stdout="$destfile"))
+    else
+      run( pipeline(`tar -zcf - $savename`, stdout="$destfile"))
+    end
     Base.rm(joinpath(savedir,savename), recursive=true)
 end
 
@@ -82,7 +86,14 @@ loadDFG("/tmp/savedgraph.tar.gz", IncrementalInference, dfg)
 ls(dfg)
 ```
 """
-function loadDFG(dst::String, iifModule, dfgLoadInto::G; loaddir=joinpath("/","tmp","caesar","random")) where G <: AbstractDFG
+function loadDFG(dst::String,
+                 iifModule::Module,
+                 dfgLoadInto::G) where G <: AbstractDFG
+
+
+    #
+    # loaddir gets deleted so needs to be unique
+    loaddir=joinpath("/","tmp","caesar","random", string(uuid1()))
     # Check if zipped destination (dst) by first doing fuzzy search from user supplied dst
     folder = dst  # working directory for fileDFG variable and factor operations
     dstname = dst # path name could either be legacy FileDFG dir or .tar.gz file of FileDFG files.
@@ -149,9 +160,9 @@ function loadDFG(dst::String, iifModule, dfgLoadInto::G; loaddir=joinpath("/","t
 
     # remove the temporary unzipped file
     if unzip
-      @info "DFG.loadDFG is deleting a temp folder created during unzip, $folder"
+      @info "DFG.loadDFG is deleting a temp folder created during unzip, $loaddir"
       # need this because the number of files created in /tmp/caesar/random is becoming redonkulous.
-      Base.rm(folder, recursive=true)
+      Base.rm(loaddir, recursive=true)
     end
 
     return dfgLoadInto