feat: tested
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
"encoding/binary"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"math"
|
||||
@@ -114,6 +113,20 @@ func NewEncFile(name string, file *os.File, encFs *EncFs, isCreate bool) (*EncFi
|
||||
}
|
||||
isDir := fileInfo.IsDir()
|
||||
var encFileMeta *EncFileMeta = nil
|
||||
|
||||
fileState, err := os.Stat(name)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
isCreate = true
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
if !fileState.IsDir() && fileState.Size() == 0 {
|
||||
isCreate = true
|
||||
}
|
||||
}
|
||||
|
||||
if !isDir {
|
||||
if isCreate {
|
||||
encFileMeta, err = openOrNewEncFileMeta(name)
|
||||
@@ -193,14 +206,9 @@ func (f *EncFile) Seek(offset int64, whence int) (int64, error) {
|
||||
return 0, checkIsFileErr
|
||||
}
|
||||
|
||||
// I do not understand whence
|
||||
if whence != 0 {
|
||||
return 0, fmt.Errorf("not supported whence: %d", whence)
|
||||
}
|
||||
|
||||
ret, err := f.file.Seek(offset, whence)
|
||||
if err == nil {
|
||||
f.filePos = offset
|
||||
f.filePos = ret
|
||||
}
|
||||
return ret, err
|
||||
}
|
||||
|
||||
12
encfs/fs.go
12
encfs/fs.go
@@ -56,28 +56,30 @@ func (encFs *EncFs) Open(name string) (afero.File, error) {
|
||||
return convertOsFileToEncFile(name, f, e, encFs, false)
|
||||
}
|
||||
|
||||
func (*EncFs) OpenFile(name string, flag int, perm os.FileMode) (afero.File, error) {
|
||||
func (encFs *EncFs) OpenFile(name string, flag int, perm os.FileMode) (afero.File, error) {
|
||||
f, e := os.OpenFile(name, flag, perm)
|
||||
if f == nil {
|
||||
// while this looks strange, we need to return a bare nil (of type nil) not
|
||||
// a nil value of type *os.File or nil won't be nil
|
||||
return nil, e
|
||||
}
|
||||
return f, e
|
||||
return convertOsFileToEncFile(name, f, e, encFs, false)
|
||||
}
|
||||
|
||||
func (*EncFs) Remove(name string) error {
|
||||
// TODO remove enc file meta
|
||||
encFileMetaName := name + EncFileExt
|
||||
_ = os.Remove(encFileMetaName)
|
||||
return os.Remove(name)
|
||||
}
|
||||
|
||||
func (*EncFs) RemoveAll(path string) error {
|
||||
// TODO remove enc file meta
|
||||
return os.RemoveAll(path)
|
||||
}
|
||||
|
||||
func (*EncFs) Rename(oldname, newname string) error {
|
||||
// TODO rename enc file meta
|
||||
oldEncFileMetaName := oldname + EncFileExt
|
||||
newEncFileMetaName := newname + EncFileExt
|
||||
_ = os.Rename(oldEncFileMetaName, newEncFileMetaName)
|
||||
return os.Rename(oldname, newname)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user