fix: can not download invalid utf8 name with BestName and BestPath (#915)

[btrtrc.git] / fs / torrentfs.go

diff --git a/fs/torrentfs.go b/fs/torrentfs.go
index 1b7b144e78fb961b5b374c9a1461ca9e6559cda4..f011d19ba8f5139715c89dadcaaabb4a1986f858 100644 (file)
--- a/fs/torrentfs.go
+++ b/fs/torrentfs.go
@@ -73,16 +73,16 @@ func isSubPath(parent, child string) bool {
 func (dn dirNode) ReadDirAll(ctx context.Context) (des []fuse.Dirent, err error) {
        names := map[string]bool{}
        for _, fi := range dn.metadata.UpvertedFiles() {
-               filePathname := strings.Join(fi.Path, "/")
+               filePathname := strings.Join(fi.BestPath(), "/")
                if !isSubPath(dn.path, filePathname) {
                        continue
                }
                var name string
                if dn.path == "" {
-                       name = fi.Path[0]
+                       name = fi.BestPath()[0]
                } else {
                        dirPathname := strings.Split(dn.path, "/")
-                       name = fi.Path[len(dirPathname)]
+                       name = fi.BestPath()[len(dirPathname)]
                }
                if names[name] {
                        continue
@@ -91,7 +91,7 @@ func (dn dirNode) ReadDirAll(ctx context.Context) (des []fuse.Dirent, err error)
                de := fuse.Dirent{
                        Name: name,
                }
-               if len(fi.Path) == len(dn.path)+1 {
+               if len(fi.BestPath()) == len(dn.path)+1 {
                        de.Type = fuse.DT_File
                } else {
                        de.Type = fuse.DT_Dir
@@ -168,7 +168,7 @@ func (rn rootNode) ReadDirAll(ctx context.Context) (dirents []fuse.Dirent, err e
                        continue
                }
                dirents = append(dirents, fuse.Dirent{
-                       Name: info.Name,
+                       Name: info.BestName(),
                        Type: func() fuse.DirentType {
                                if !info.IsDir() {
                                        return fuse.DT_File