fix: removes leading / from link target

Author: jyeshe

src/hb_store.erl

@@ -311,36 +311,40 @@ sync(FromStore, ToStore) ->
     FromStoreOpts = maps:put(<<"resolve">>, false, FromStore),
     {ok, Entries} = hb_store:list(FromStore, <<"/">>),
     ValidEntries = lists:filter(fun(Key) -> Key =/= <<"lmdb">> end, Entries),
-    case sync_entries(ValidEntries, <<"">>, FromStoreOpts, ToStore) of
+    case sync_entries(ValidEntries, <<"/">>, FromStoreOpts, ToStore) of
         [] -> ok;
         FailedKeyValues -> {error, {sync_failed, FailedKeyValues}}
     end.
 
 sync_entries(Entries, ParentDir, FromStore, ToStore) ->
     ?event({sync_entries, ParentDir, Entries}),
     lists:foldl(fun(Key, Acc) ->
-        Path = <<ParentDir/binary, "/", Key/binary>>,
-        case type(FromStore, Path) of
+        NewPath =  
+            case ParentDir of
+                Bin when Bin == <<"">> orelse Bin == <<"/">> -> Key;
+                _ -> <<ParentDir/binary, "/", Key/binary>>
+            end,
+        case type(FromStore, NewPath) of
             Type when Type == simple orelse Type == link ->
-                case hb_store:read(FromStore, Path) of
+                case hb_store:read(FromStore, NewPath) of
                     {ok, Value} when Type == simple ->
-                        case hb_store:write(ToStore, Path, Value) of
+                        case hb_store:write(ToStore, NewPath, Value) of
                             ok -> Acc;
-                            _Error -> [{Path, Value} | Acc]
+                            _Error -> [{NewPath, Value} | Acc]
                         end;
                     {ok, LinkTarget} when Type == link ->
-                        ok = hb_store:make_link(ToStore, LinkTarget, Path),
+                        ok = hb_store:make_link(ToStore, LinkTarget, NewPath),
                         Acc;
                     _Error ->
-                        [{Path, undefined} | Acc]
+                        [{NewPath, undefined} | Acc]
                 end;
             composite ->
-                case hb_store:make_group(ToStore, Path) of
+                case hb_store:make_group(ToStore, NewPath) of
                     ok ->
-                        {ok, Entries2} = hb_store:list(FromStore, Path),
-                        Acc ++ sync_entries(Entries2, Path, FromStore, ToStore);
+                        {ok, Entries2} = hb_store:list(FromStore, NewPath),
+                        Acc ++ sync_entries(Entries2, NewPath, FromStore, ToStore);
                     _Error ->
-                        [{Path, undefined} | Acc]
+                        [{NewPath, undefined} | Acc]
                 end;
             not_found ->
                 Acc

src/hb_store_fs.erl

@@ -47,7 +47,10 @@ reset(#{ <<"name">> := DataDir }) ->
 %% @doc Read a key from the store, following symlinks as needed.
 read(#{<<"resolve">> := false} = Opts, Key) ->
     maybe {prefixed_link, LinkTarget} ?= read_path(add_prefix(Opts, Key), false),
-        {ok, remove_prefix(Opts, LinkTarget)}
+        case remove_prefix(Opts, LinkTarget) of
+            <<"/", Path/binary>> -> {ok, Path};
+            Path -> {ok, Path}
+        end
     end;
 read(Opts, Key) ->
     read_path(add_prefix(Opts, resolve(Opts, Key)), true).

src/hb_store_lmdb.erl

@@ -489,9 +489,9 @@ make_link(Opts, Existing, New) when is_list(Existing) ->
     ExistingBin = to_path(Existing),
     make_link(Opts, ExistingBin, New);
 make_link(Opts, Existing, New) ->
-    % ensure key-value is binary pair
+    % ensure key-value is binary pair 
     ExistingBin = hb_util:bin(Existing),
-    NewBin = maybe <<"/", Path/binary>> ?= hb_util:bin(New), Path end,
+    NewBin = hb_util:bin(New),
     % Ensure parent groups exist for the new link path (like filesystem ensure_dir)
     ensure_parent_groups(Opts, NewBin),
     write(Opts, NewBin, <<"link:", ExistingBin/binary>>).