Fixed #185 - location.Exists was checking if a list entry was a direc…

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
+## [6.14.1] - 2024-05-28
+### Fixed
+- Fixed #185 - location.Exists was checking if a list entry was a directory but it was was only checking the first entry.
+
 ## [6.14.0] - 2024-05-15
 ### Security
 - updated dependencies

backend/ftp/file.go

@@ -195,7 +195,7 @@ func (f *File) MoveToFile(t vfs.File) error {
 			// it doesn't matter which client we use since they are effectively the same
 			err = dc.MakeDir(t.Location().Path())
 			if err != nil {
-				return err
+				return fmt.Errorf("failed to create directory: %w", err)
 			}
 		}
 		return dc.Rename(f.Path(), t.Path())

backend/ftp/location.go

@@ -144,8 +144,9 @@ func (l *Location) Exists() (bool, error) {
 		return false, err
 	}
 
+	locBasename := path.Base(l.Path())
 	// get parent directory by removing the last part of the path
-	parentDir := strings.TrimSuffix(l.Path(), path.Base(l.Path())+"/")
+	parentDir := strings.TrimSuffix(l.Path(), locBasename+"/")
 
 	entries, err := dc.List(parentDir)
 	if err != nil {
@@ -156,8 +157,8 @@ func (l *Location) Exists() (bool, error) {
 		return false, err
 	}
 
-	for _, entry := range entries {
-		if entry.Name == path.Base(l.Path()) && entries[0].Type == _ftp.EntryTypeFolder {
+	for i := range entries {
+		if entries[i].Name == locBasename && entries[i].Type == _ftp.EntryTypeFolder {
 			return true, nil
 		}
 	}

backend/ftp/location_test.go

@@ -388,15 +388,21 @@ func (lt *locationTestSuite) TestExists() {
 
 	// location exists
 	locPath := "/"
-	dirs := []*_ftp.Entry{
+	entries := []*_ftp.Entry{
+		{
+			Name:   "file.txt",
+			Target: "",
+			Type:   _ftp.EntryTypeFile,
+			Time:   time.Now().UTC(),
+		},
 		{
 			Name:   locPath,
 			Target: "",
 			Type:   _ftp.EntryTypeFolder,
 			Time:   time.Now().UTC(),
 		},
 	}
-	lt.client.On("List", locPath).Return(dirs, nil).Once()
+	lt.client.On("List", locPath).Return(entries, nil).Once()
 	loc, err := lt.ftpfs.NewLocation(authority, locPath)
 	lt.NoError(err)
 	exists, err := loc.Exists()
@@ -405,32 +411,45 @@ func (lt *locationTestSuite) TestExists() {
 
 	// locations does not exist
 	locPath = "/my/dir/"
-	dirs = []*_ftp.Entry{}
-	lt.client.On("List", "/my/").Return(dirs, nil).Once()
+	entries = []*_ftp.Entry{
+		{
+			Name:   "file.txt",
+			Target: "",
+			Type:   _ftp.EntryTypeFile,
+			Time:   time.Now().UTC(),
+		},
+	}
+	lt.client.On("List", "/my/").Return(entries, nil).Once()
 	loc, err = lt.ftpfs.NewLocation(authority, locPath)
 	lt.NoError(err)
 	exists, err = loc.Exists()
 	lt.Nil(err, "No error expected from Exists")
 	lt.True(!exists, "Call to Exists expected to return false.")
 
 	// some error calling list
-	lt.client.On("List", "/my/").Return(dirs, errors.New("some error")).Once()
+	lt.client.On("List", "/my/").Return(entries, errors.New("some error")).Once()
 	loc, err = lt.ftpfs.NewLocation(authority, locPath)
 	lt.NoError(err)
 	exists, err = loc.Exists()
 	lt.Error(err, "from Exists")
 	lt.True(!exists, "Call to Exists expected to return false.")
 
-	// check for not dir -- this shoudln't be possible since NewLocation won't accept non-absolute directories
-	dirs = []*_ftp.Entry{
+	// check for not dir -- this shouldn't be possible since NewLocation won't accept non-absolute directories
+	entries = []*_ftp.Entry{
+		{
+			Name:   "file.txt",
+			Target: "",
+			Type:   _ftp.EntryTypeFile,
+			Time:   time.Now().UTC(),
+		},
 		{
 			Name:   locPath,
 			Target: "",
 			Type:   _ftp.EntryTypeFile,
 			Time:   time.Now().UTC(),
 		},
 	}
-	lt.client.On("List", "/my/").Return(dirs, nil).Once()
+	lt.client.On("List", "/my/").Return(entries, nil).Once()
 	loc, err = lt.ftpfs.NewLocation(authority, locPath)
 	lt.NoError(err)
 	exists, err = loc.Exists()