Only stat version folder if current path is not itself one

cs3org · Sep 16, 2020 · 2d13d19 · 2d13d19
1 parent a8efce7
commit 2d13d19
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/eosclient/eosclient.go b/pkg/eosclient/eosclient.go
@@ -410,7 +410,7 @@ func (c *Client) GetFileInfoByInode(ctx context.Context, uid, gid string, inode
 		return nil, err
 	}
 
-	if c.opt.VersionInvariant {
+	if c.opt.VersionInvariant && isVersionFolder(info.File) {
 		info, err = c.getFileInfoFromVersion(ctx, uid, gid, info.File)
 		if err != nil {
 			return nil, err
@@ -475,7 +475,7 @@ func (c *Client) GetFileInfoByPath(ctx context.Context, uid, gid, path string) (
 		return nil, err
 	}
 
-	if c.opt.VersionInvariant {
+	if c.opt.VersionInvariant && !isVersionFolder(path) {
 		inode, err := c.getVersionFolderInode(ctx, uid, gid, path)
 		if err != nil {
 			return nil, err
@@ -662,6 +662,10 @@ func (c *Client) getFileInfoFromVersion(ctx context.Context, uid, gid, p string)
 	return md, nil
 }
 
+func isVersionFolder(p string) bool {
+	return strings.HasPrefix(path.Base(p), versionPrefix)
+}
+
 func getVersionFolder(p string) string {
 	return path.Join(path.Dir(p), versionPrefix+path.Base(p))
 }