cleanup

Author: JonasIsensee

src/JLD2.jl

@@ -267,7 +267,7 @@ function initialize_fileobject!(f::JLDFile)
     f.root_group = load_group(f, f.root_group_offset)
 
     # Use lookup_link directly instead of lookup_offset
-    types_offset = getoffset(lookup_link(f.root_group, "_types"))
+    types_offset = getoffset(f.root_group, lookup_link(f.root_group, "_types"))
     if types_offset !== UNDEFINED_ADDRESS
         f.types_group = f.loaded_groups[types_offset] = load_group(f, types_offset)
         for (i, link) in enumerate(values(f.types_group.written_links))

src/explicit_datasets.jl

@@ -321,36 +321,8 @@ function get_dataset(g::Group, name::String)
         return get_dataset(f, group_offset(g), g, name)
     end
 
-    # Use lookup_link and getoffset for simplified resolution
     link = lookup_link(g, name)
-    link === nothing && throw(KeyError(name))
-
-    if is_external_link(link)
-        # For external links, provide informative error message
-        throw(ArgumentError(LazyString(
-            "get_dataset cannot be used on external links.\n",
-            "Link \"", name, "\" points to:\n",
-            "  • External file: \"", link.external_file, "\"\n",
-            "  • Object path: \"", link.path, "\"\n",
-            "Use f[\"", name, "\"] to access the external data directly."
-        )))
-    end
-
-    # Try to get the offset (resolves soft links, returns offset for hard links)
-    offset = getoffset(g, link; erroroninvalid=false)
-    if offset == UNDEFINED_ADDRESS
-        # Either uninitialized hard link or unresolvable soft link
-        if is_soft_link(link)
-            throw(ArgumentError(LazyString(
-                "get_dataset cannot be used on soft links that don't point to regular datasets.\n",
-                "Link \"", name, "\" points to: \"", link.path, "\"\n",
-                "Use f[\"", name, "\"] to access the linked data directly."
-            )))
-        else
-            throw(KeyError(name))  # Uninitialized hard link
-        end
-    end
-
+    offset = getoffset(g, link)
     return get_dataset(f, offset, g, name)
 end
 

src/groups.jl

@@ -32,6 +32,36 @@ function lookup_link(g::Group, name::AbstractString)
     return get(g.unwritten_links, name, Link())
 end
 
+
+"""
+    getoffset(group::Group, link::Link; erroroninvalid::Bool=true) -> RelOffset
+
+Get the offset for a link by resolving it if necessary.
+
+- **Hard links**: Returns `link.offset` directly (may be UNDEFINED_ADDRESS)
+- **Soft links**: Recursively resolves the soft link path and returns the target offset
+- **External links**: Errors if `erroroninvalid=true`, otherwise returns UNDEFINED_ADDRESS
+
+This centralizes link resolution logic and simplifies calling code.
+"""
+function getoffset(g::Group, link::Link; erroroninvalid::Bool=true)
+    if is_hard_link(link)
+        return link.offset
+    elseif is_soft_link(link)
+        # Recursively resolve soft link
+        target_link = lookup_link(g, link.path)
+        if !is_set(target_link)
+            erroroninvalid && throw(ArgumentError("Soft link target not found: $(link.path)"))
+            return UNDEFINED_ADDRESS
+        end
+        # Recursively resolve in case target is also a soft link
+        return getoffset(g, target_link; erroroninvalid)
+    else  # external link
+        erroroninvalid && throw(ArgumentError("Cannot get offset for external link to $(link.external_file):$(link.path)"))
+        return UNDEFINED_ADDRESS
+    end
+end
+
 """
     pathize(g::Group, name::AbstractString, create::Bool) -> Tuple{Group,String}
 

src/object_headers.jl

@@ -85,23 +85,8 @@ function print_header_messages(g::Group, name::AbstractString)
         # This is the group itself
         roffset = g.f.root_group_offset
     else
-        # Use lookup_link and getoffset for simplified resolution
         link = lookup_link(g, name)
-        link === nothing && throw(ArgumentError("did not find a group or dataset named \"$name\""))
-
-        if is_external_link(link)
-            throw(ArgumentError("Cannot print header messages for external link pointing to $(link.external_file):$(link.path)"))
-        end
-
-        # Get the offset (resolves soft links)
-        roffset = getoffset(g, link; erroroninvalid=false)
-        if roffset == UNDEFINED_ADDRESS
-            if is_soft_link(link)
-                throw(ArgumentError("Cannot print header messages for soft link pointing to $(link.path)"))
-            else
-                throw(ArgumentError("Cannot print header messages for uninitialized hard link"))
-            end
-        end
+        roffset = getoffset(g, link; erroroninvalid=true)
     end
     return print_header_messages(g.f, roffset)
 end