Fix test

[rbdr/mobius] / hotline / file_wrapper.go

diff --git a/hotline/file_wrapper.go b/hotline/file_wrapper.go
index f3fd55947d97b8c75403f16c5037b65da2df3060..2c796ca05b2254c64728b74f2dca7f2ddcd1f6da 100644 (file)
--- a/hotline/file_wrapper.go
+++ b/hotline/file_wrapper.go
@@ -26,8 +26,6 @@ type fileWrapper struct {
        rsrcPath       string // path to the file resource fork
        infoPath       string // path to the file information fork
        incompletePath string // path to partially transferred temp file
        rsrcPath       string // path to the file resource fork
        infoPath       string // path to the file information fork
        incompletePath string // path to partially transferred temp file

-       saveMetaData   bool   // if true, enables saving of info and resource forks in sidecar files
-       infoFork       *FlatFileInformationFork

        ffo            *flattenedFileObject
 }
 
        ffo            *flattenedFileObject
 }
 


@@ -151,26 +149,31 @@ func (f *fileWrapper) dataFile() (os.FileInfo, error) {
        return nil, errors.New("file or directory not found")
 }
 
        return nil, errors.New("file or directory not found")
 }
 

-// move a fileWrapper and its associated metadata files to newPath
+// move a fileWrapper and its associated meta files to newPath.
+// Meta files include:
+// * Partially uploaded file ending with .incomplete
+// * Resource fork starting with .rsrc_
+// * Info fork starting with .info
+// During move of the meta files, os.ErrNotExist is ignored as these files may legitimately not exist.

 func (f *fileWrapper) move(newPath string) error {
        err := f.fs.Rename(f.dataPath, filepath.Join(newPath, f.name))
        if err != nil {
 func (f *fileWrapper) move(newPath string) error {
        err := f.fs.Rename(f.dataPath, filepath.Join(newPath, f.name))
        if err != nil {

-               // TODO
+               return err

        }
 
        err = f.fs.Rename(f.incompletePath, filepath.Join(newPath, f.incompleteDataName()))
        }
 
        err = f.fs.Rename(f.incompletePath, filepath.Join(newPath, f.incompleteDataName()))

-       if err != nil {
-               // TODO
+       if err != nil && !errors.Is(err, os.ErrNotExist) {
+               return err

        }
 
        err = f.fs.Rename(f.rsrcPath, filepath.Join(newPath, f.rsrcForkName()))
        }
 
        err = f.fs.Rename(f.rsrcPath, filepath.Join(newPath, f.rsrcForkName()))

-       if err != nil {
-               // TODO
+       if err != nil && !errors.Is(err, os.ErrNotExist) {
+               return err

        }
 
        err = f.fs.Rename(f.infoPath, filepath.Join(newPath, f.infoForkName()))
        }
 
        err = f.fs.Rename(f.infoPath, filepath.Join(newPath, f.infoForkName()))

-       if err != nil {
-               // TODO
+       if err != nil && !errors.Is(err, os.ErrNotExist) {
+               return err

        }
 
        return nil
        }
 
        return nil


@@ -180,22 +183,22 @@ func (f *fileWrapper) move(newPath string) error {
 func (f *fileWrapper) delete() error {
        err := f.fs.RemoveAll(f.dataPath)
        if err != nil {
 func (f *fileWrapper) delete() error {
        err := f.fs.RemoveAll(f.dataPath)
        if err != nil {

-               // TODO
+               return err

        }
 
        err = f.fs.Remove(f.incompletePath)
        }
 
        err = f.fs.Remove(f.incompletePath)

-       if err != nil {
-               // TODO
+       if err != nil && !errors.Is(err, os.ErrNotExist) {
+               return err

        }
 
        err = f.fs.Remove(f.rsrcPath)
        }
 
        err = f.fs.Remove(f.rsrcPath)

-       if err != nil {
-               // TODO
+       if err != nil && !errors.Is(err, os.ErrNotExist) {
+               return err

        }
 
        err = f.fs.Remove(f.infoPath)
        }
 
        err = f.fs.Remove(f.infoPath)

-       if err != nil {
-               // TODO
+       if err != nil && !errors.Is(err, os.ErrNotExist) {
+               return err

        }
 
        return nil
        }
 
        return nil