patch: v0.10.20

[rbdr/mobius] / hotline / file_wrapper.go

diff --git a/hotline/file_wrapper.go b/hotline/file_wrapper.go
index 2ad76f48539726d3e8bf9fed18971833c957b76f..b55e9f42acf98e5937e3376a5378dd03e881bdcf 100644 (file)
--- a/hotline/file_wrapper.go
+++ b/hotline/file_wrapper.go
@@ -7,7 +7,6 @@ import (
        "io"
        "io/fs"
        "os"
-       "path"
        "path/filepath"
 )
 
@@ -27,7 +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
-       saveMetaData   bool   // if true, enables saving of info and resource forks in sidecar files
        infoFork       *FlatFileInformationFork
        ffo            *flattenedFileObject
 }
@@ -106,21 +104,7 @@ func (f *fileWrapper) infoForkName() string {
        return fmt.Sprintf(infoForkNameTemplate, f.name)
 }
 
-func (f *fileWrapper) creatorCode() []byte {
-       if f.ffo.FlatFileInformationFork.CreatorSignature != nil {
-               return f.infoFork.CreatorSignature
-       }
-       return []byte(fileTypeFromFilename(f.name).CreatorCode)
-}
-
-func (f *fileWrapper) typeCode() []byte {
-       if f.infoFork != nil {
-               return f.infoFork.TypeSignature
-       }
-       return []byte(fileTypeFromFilename(f.name).TypeCode)
-}
-
-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
@@ -129,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
@@ -138,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
@@ -168,22 +152,22 @@ func (f *fileWrapper) dataFile() (os.FileInfo, error) {
 
 // move a fileWrapper and its associated metadata files to newPath
 func (f *fileWrapper) move(newPath string) error {
-       err := f.fs.Rename(f.dataPath, path.Join(newPath, f.name))
+       err := f.fs.Rename(f.dataPath, filepath.Join(newPath, f.name))
        if err != nil {
                // TODO
        }
 
-       err = f.fs.Rename(f.incompletePath, path.Join(newPath, f.incompleteDataName()))
+       err = f.fs.Rename(f.incompletePath, filepath.Join(newPath, f.incompleteDataName()))
        if err != nil {
                // TODO
        }
 
-       err = f.fs.Rename(f.rsrcPath, path.Join(newPath, f.rsrcForkName()))
+       err = f.fs.Rename(f.rsrcPath, filepath.Join(newPath, f.rsrcForkName()))
        if err != nil {
                // TODO
        }
 
-       err = f.fs.Rename(f.infoPath, path.Join(newPath, f.infoForkName()))
+       err = f.fs.Rename(f.infoPath, filepath.Join(newPath, f.infoForkName()))
        if err != nil {
                // TODO
        }