Add nested archive cataloging (#5260)

Signed-off-by: Kudryavcev Nikolay <kydry.nikolau@gmail.com>
Signed-off-by: Thomas Bechtold <thomasbechtold@jpberlin.de>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Co-authored-by: Kudryavcev Nikolay <kydry.nikolau@gmail.com>
Co-authored-by: Thomas Bechtold <thomasbechtold@jpberlin.de>
Co-authored-by: Alex Goodman <wagoodman@users.noreply.github.com>

internal/unknown/coordinate_error.go

@@ -23,9 +23,9 @@ var _ error = (*CoordinateError)(nil)
 
 func (u *CoordinateError) Error() string {
 	if u.Coordinates.FileSystemID == "" {
-		return fmt.Sprintf("%s: %v", u.Coordinates.RealPath, u.Reason)
+		return fmt.Sprintf("%s: %v", u.Coordinates.FullNestedPath(), u.Reason)
 	}
-	return fmt.Sprintf("%s (%s): %v", u.Coordinates.RealPath, u.Coordinates.FileSystemID, u.Reason)
+	return fmt.Sprintf("%s (%s): %v", u.Coordinates.FullNestedPath(), u.Coordinates.FileSystemID, u.Reason)
 }
 
 // New returns a new CoordinateError unless the reason is a CoordinateError itself, in which case

internal/unknown/coordinate_error_test.go

@@ -169,9 +169,7 @@ func Test_Join(t *testing.T) {
 }
 
 func Test_flatten(t *testing.T) {
-	coords := file.Coordinates{
-		RealPath: "real/path",
-	}
+	coords := file.NewCoordinates("real/path", "")
 	e1 := fmt.Errorf("e1")
 	e2 := fmt.Errorf("e2")
 	c1 := New(coords, fmt.Errorf("c1"))

internal/unknown/path_error.go

@@ -19,6 +19,8 @@ func ProcessPathErrors(err error) error {
 	if pathErrorRegex.MatchString(errText) {
 		foundPath := pathErrorRegex.ReplaceAllString(err.Error(), "$1")
 		if foundPath != "" {
+			// a path in an error text is taken as is: nesting is never inferred from "!/" in it, since a real
+			// path can hold one too. A caller with the location in hand should use New instead
 			return New(file.NewLocation(foundPath), err)
 		}
 	}

internal/unknown/path_error_test.go

@@ -17,28 +17,29 @@ func Test_ProcessPathErrors(t *testing.T) {
 		{
 			errorText: `prefix path="/var/lib/thing" suffix`,
 			expected: &CoordinateError{
-				Coordinates: file.Coordinates{
-					RealPath: "/var/lib/thing",
-				},
-				Reason: fmt.Errorf(`prefix path="/var/lib/thing" suffix`),
+				Coordinates: file.NewCoordinates("/var/lib/thing", ""),
+				Reason:      fmt.Errorf(`prefix path="/var/lib/thing" suffix`),
 			},
 		},
 		{
 			errorText: `prefix path="/var/lib/thing"`,
 			expected: &CoordinateError{
-				Coordinates: file.Coordinates{
-					RealPath: "/var/lib/thing",
-				},
-				Reason: fmt.Errorf(`prefix path="/var/lib/thing"`),
+				Coordinates: file.NewCoordinates("/var/lib/thing", ""),
+				Reason:      fmt.Errorf(`prefix path="/var/lib/thing"`),
 			},
 		},
 		{
 			errorText: `path="/var/lib/thing" suffix`,
 			expected: &CoordinateError{
-				Coordinates: file.Coordinates{
-					RealPath: "/var/lib/thing",
-				},
-				Reason: fmt.Errorf(`path="/var/lib/thing" suffix`),
+				Coordinates: file.NewCoordinates("/var/lib/thing", ""),
+				Reason:      fmt.Errorf(`path="/var/lib/thing" suffix`),
+			},
+		},
+		{
+			errorText: `path="/data/Hello!/world.txt"`,
+			expected: &CoordinateError{
+				Coordinates: file.NewCoordinates("/data/Hello!/world.txt", ""),
+				Reason:      fmt.Errorf(`path="/data/Hello!/world.txt"`),
 			},
 		},
 		{