bug fixes

Author: dehann

src/DataBlobs/services/AbstractDataEntries.jl

@@ -233,25 +233,30 @@ function incrDataLabelSuffix(
 ) where {S <: Union{Symbol, <:AbstractString}}
     count = 1
     hasund = false
+    len = 0
     try
         de,_ = getData(dfg, Symbol(vla), bllb)
         bllb = string(bllb)
         # bllb *= bllb[end] != '_' ? "_" : ""
         datalabel[] = string(de.label)
         dlb = match(r"\d*", reverse(datalabel[]))
         # slightly complicated search if blob name already has an underscore number suffix, e.g. `_4`
-        count, hasund = if occursin(Regex(dlb.match*"_"), reverse(datalabel[]))
-        parse(Int, dlb.match |> reverse)+1, true
+        count, hasund, len = if occursin(Regex(dlb.match*"_"), reverse(datalabel[]))
+            parse(Int, dlb.match |> reverse)+1, true, length(dlb.match)
         else
-        1, datalabel[][end] == '_'
+            1, datalabel[][end] == '_', 0
         end
     catch err
         # append latest count
         if !(err isa KeyError)
         throw(err)
         end
     end
-    bllb *= !hasund || bllb[end] != '_' ? "_" : ""
+    # the piece from old label without the suffix count number
+    bllb = datalabel[][1:(end-len)]
+    if !hasund || bllb[end] != '_'
+        bllb *= "_"
+    end
     bllb *= string(count)
 
     S(bllb)

test/consol_DataEntryBlobTests.jl

@@ -96,10 +96,12 @@ ade,adb = addData!(dfg, :filestore, :x1, :another_1, dataset1)
 gde,gdb = getData(dfg, :x1, :random)
 
 @test incrDataLabelSuffix(dfg,:x1,:random) == :random_1
-@test incrDataLabelSuffix(dfg,:x1,:another) == :another_2
+@test incrDataLabelSuffix(dfg,:x1,:another_1) == :another_2
+# @test incrDataLabelSuffix(dfg,:x1,:another) == :another_2 # TODO exand support for Regex likely search on labels
 # @test incrDataLabelSuffix(dfg,:x1,"random") == "random_1" # TODO expand support for label::String
 
 dde,ddb = deleteData!(dfg, :x1, :random)
+dde,ddb = deleteData!(dfg, :x1, :another_1)
 
 @test ade == gde == dde
 @test adb == gdb == ddb