Use Rel

internal/activities/validate_structure.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
-	"strings"
 
 	"github.com/artefactual-sdps/preprocessing-sfa/internal/enums"
 	"github.com/artefactual-sdps/preprocessing-sfa/internal/fsutil"
@@ -45,8 +44,10 @@ func (a *ValidateStructure) Execute(
 		}
 
 		if path != params.SIP.Path {
-			// Assemble relative path.
-			relativePath := strings.Replace(path, params.SIP.Path+"/", "", 1)
+			relativePath, err := filepath.Rel(params.SIP.Path, path)
+			if err != nil {
+				return err
+			}
 
 			// Initialize this directory's total number of immediate children.
 			if d.IsDir() {
@@ -66,7 +67,7 @@ func (a *ValidateStructure) Execute(
 	// Report any empty subdirectories.
 	for path, children := range paths {
 		if children == 0 {
-			failures = append(failures, fmt.Sprintf("SIP subdirectory '%s' is empty", path))
+			failures = append(failures, fmt.Sprintf("SIP subdirectory %q is empty", path))
 		}
 	}