X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/67db911d966913ff04ad90018af9a5361a4d8349..e995052ef530b1eae2d0476ff519f7225bbb481d:/hotline/file_wrapper.go

diff --git a/hotline/file_wrapper.go b/hotline/file_wrapper.go
index b59fc5c..ec025dc 100644
--- a/hotline/file_wrapper.go
+++ b/hotline/file_wrapper.go
@@ -1,6 +1,7 @@
 package hotline
 
 import (
+	"bytes"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -26,8 +27,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
-	saveMetaData   bool   // if true, enables saving of info and resource forks in sidecar files
-	infoFork       *FlatFileInformationFork
 	ffo            *flattenedFileObject
 }
 
@@ -105,7 +104,7 @@ func (f *fileWrapper) infoForkName() string {
 	return fmt.Sprintf(infoForkNameTemplate, f.name)
 }
 
-func (f *fileWrapper) rsrcForkWriter() (io.Writer, error) {
+func (f *fileWrapper) rsrcForkWriter() (io.WriteCloser, error) {
 	file, err := os.OpenFile(f.rsrcPath, os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
 		return nil, err
@@ -114,7 +113,7 @@ func (f *fileWrapper) rsrcForkWriter() (io.Writer, error) {
 	return file, nil
 }
 
-func (f *fileWrapper) infoForkWriter() (io.Writer, error) {
+func (f *fileWrapper) infoForkWriter() (io.WriteCloser, error) {
 	file, err := os.OpenFile(f.infoPath, os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
 		return nil, err
@@ -123,7 +122,7 @@ func (f *fileWrapper) infoForkWriter() (io.Writer, error) {
 	return file, nil
 }
 
-func (f *fileWrapper) incFileWriter() (io.Writer, error) {
+func (f *fileWrapper) incFileWriter() (io.WriteCloser, error) {
 	file, err := os.OpenFile(f.incompletePath, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
 	if err != nil {
 		return nil, err
@@ -151,26 +150,31 @@ func (f *fileWrapper) dataFile() (os.FileInfo, error) {
 	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 {
-		// TODO
+		return err
 	}
 
 	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()))
-	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()))
-	if err != nil {
-		// TODO
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
+		return err
 	}
 
 	return nil
@@ -180,22 +184,22 @@ func (f *fileWrapper) move(newPath string) error {
 func (f *fileWrapper) delete() error {
 	err := f.fs.RemoveAll(f.dataPath)
 	if err != nil {
-		// TODO
+		return err
 	}
 
 	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)
-	if err != nil {
-		// TODO
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
+		return err
 	}
 
 	err = f.fs.Remove(f.infoPath)
-	if err != nil {
-		// TODO
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
+		return err
 	}
 
 	return nil
@@ -240,9 +244,11 @@ func (f *fileWrapper) flattenedFileObject() (*flattenedFileObject, error) {
 
 		f.ffo.FlatFileHeader.ForkCount[1] = 3
 
-		if err := f.ffo.FlatFileInformationFork.UnmarshalBinary(b); err != nil {
+		_, err = io.Copy(&f.ffo.FlatFileInformationFork, bytes.NewReader(b))
+		if err != nil {
 			return nil, err
 		}
+
 	} else {
 		f.ffo.FlatFileInformationFork = FlatFileInformationFork{
 			Platform:         []byte("AMAC"), // TODO: Remove hardcode to support "AWIN" Platform (maybe?)