ston1th/cachefs
0
0
Fork 0
Code Issues Releases Activity

implemented os file interface acstraction

Browse source
This commit is contained in:
ston1th 2022-04-02 14:08:59 +02:00
commit ad41ddbe54
11 changed files with 223 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

96
pkg/fs/fs.go
View file

@ -3,14 +3,13 @@
package fs
import (
"cachefs/pkg/provider"
"cachefs/pkg/provider/parse"
"context"
"errors"
"io"
stdfs "io/fs"
"net/http"
"os"
"path"
"path/filepath"
"strings"
"github.com/go-logr/logr"
@ -21,8 +20,8 @@ type FS struct {
done chan struct{}
cancel func()
NoCache http.Handler
src string
dst string
src provider.FS
dst provider.FS
dc *DirCache
sc *StatCache
@ -32,15 +31,17 @@ type FS struct {
}
func NewFS(quota int64, max int, src, dst, metadata string, log logr.Logger) (fs *FS, err error) {
if !filepath.IsAbs(src) {
return nil, errors.New("src path is not absolute")
}
if !filepath.IsAbs(dst) {
return nil, errors.New("dst path is not absolute")
}
if src == dst {
return nil, errors.New("src and dst path can not be equal")
}
srcfs, err := parse.FS(src)
if err != nil {
return
}
dstfs, err := parse.FS(dst)
if err != nil {
return
}
ctx, cancel := context.WithCancel(context.Background())
@ -49,8 +50,8 @@ func NewFS(quota int64, max int, src, dst, metadata string, log logr.Logger) (fs
done: make(chan struct{}),
cancel: cancel,
NoCache: http.FileServer(http.Dir(src)),
src: src,
dst: dst,
src: srcfs,
dst: dstfs,
dc: NewDirCache(),
}
@ -68,23 +69,21 @@ func NewFS(quota int64, max int, src, dst, metadata string, log logr.Logger) (fs
}
func (fs *FS) Stat(name string) (fi stdfs.FileInfo, err error) {
sp, dp := fs.paths(name)
fi, err = fs.sc.Get(name)
if err == nil {
return
}
fi, err = os.Stat(sp)
fi, err = fs.src.Stat(name)
if err == nil {
fs.sc.Set(name, fi)
return
}
fi, err = os.Stat(dp)
fi, err = fs.dst.Stat(name)
return
}
func (fs *FS) RemoveDst(name string) error {
_, dp := fs.paths(name)
return os.Remove(dp)
return fs.dst.Remove(name)
}
func (fs *FS) StatDst(name string) (fi stdfs.FileInfo, err error) {
@ -92,17 +91,11 @@ func (fs *FS) StatDst(name string) (fi stdfs.FileInfo, err error) {
if err == nil {
return
}
return fs.statDst(name)
}
func (fs *FS) statDst(name string) (stdfs.FileInfo, error) {
_, dp := fs.paths(name)
return os.Stat(dp)
return fs.dst.Stat(name)
}
func (fs *FS) OpenDst(name string) (f http.File, err error) {
log := fs.log.WithValues("file", name)
_, dp := fs.paths(name)
fi, err := fs.StatDst(name)
if err != nil {
if !skipLog(name) {
@ -110,7 +103,7 @@ func (fs *FS) OpenDst(name string) (f http.File, err error) {
}
return
}
file, err := os.Open(dp)
file, err := fs.dst.Open(name)
if err != nil {
if !skipLog(name) {
log.Error(err, "error opening cache file")
@ -151,15 +144,8 @@ func skipLog(name string) bool {
return strings.HasSuffix(name, "index.html") || strings.HasSuffix(name, "favicon.ico")
}
func (fs *FS) paths(name string) (sp string, dp string) {
p := filepath.FromSlash(path.Clean("/" + name))
sp = filepath.Join(fs.src, p)
dp = filepath.Join(fs.dst, p)
return
}
func (fs *FS) open(name, sp, dp string) (f *os.File, fi os.FileInfo, offline bool, err error) {
f, err = os.Open(sp)
func (fs *FS) open(name string) (f provider.File, fi os.FileInfo, offline bool, err error) {
f, err = fs.src.Open(name)
if err == nil {
fi, err = f.Stat()
if err == nil {
@ -167,7 +153,7 @@ func (fs *FS) open(name, sp, dp string) (f *os.File, fi os.FileInfo, offline boo
}
f.Close()
}
f, err = os.Open(dp)
f, err = fs.dst.Open(name)
if err != nil {
return
}
@ -181,8 +167,7 @@ func (fs *FS) open(name, sp, dp string) (f *os.File, fi os.FileInfo, offline boo
func (fs *FS) Open(name string) (f http.File, err error) {
log := fs.log.WithValues("file", name)
sp, dp := fs.paths(name)
file, fi, offline, err := fs.open(name, sp, dp)
file, fi, offline, err := fs.open(name)
if err != nil {
if !skipLog(name) {
log.Error(err, "error opening source file")
@ -191,13 +176,13 @@ func (fs *FS) Open(name string) (f http.File, err error) {
}
if fi.IsDir() {
if offline {
log.V(2).Info("dir offline mode", "path", dp)
log.V(2).Info("dir offline mode")
}
f = &Dir{log: log.WithName("dir"), f: file, dc: fs.dc}
return
}
if offline {
log.V(2).Info("file offline mode", "path", dp)
log.V(2).Info("file offline mode")
}
md := fs.mh.Metadata(name, fi.Size())
f = &File{
@ -209,23 +194,22 @@ func (fs *FS) Open(name string) (f http.File, err error) {
return
}
func (fs *FS) openCacheFile(name string, size int64) (df *os.File, err error) {
_, dp := fs.paths(name)
func (fs *FS) openCacheFile(name string, size int64) (df provider.File, err error) {
log := fs.log
if i := strings.LastIndex(dp, "/"); i > 0 {
dir := dp[:i]
_, err = os.Stat(dir)
if i := strings.LastIndex(name, "/"); i > 0 {
dir := name[:i]
_, err = fs.dst.Stat(dir)
if errors.Is(err, os.ErrNotExist) {
err = os.MkdirAll(dir, 0o755)
err = fs.dst.MkdirAll(dir, 0o755)
if err != nil {
log.Error(err, "error creating cache dir", "dir", dp)
log.Error(err, "error creating cache dir")
return
}
}
}
_, err = os.Stat(dp)
_, err = fs.dst.Stat(name)
truncate := errors.Is(err, os.ErrNotExist)
df, err = os.OpenFile(dp, os.O_RDWR|os.O_CREATE, 0o644)
df, err = fs.dst.OpenFile(name, os.O_RDWR|os.O_CREATE, 0o644)
if err != nil {
log.Error(err, "error opening cache file")
return
@ -253,17 +237,3 @@ func (fs *FS) Close() {
fs.cancel()
<-fs.done
}
func dirEmpty(name string) (bool, error) {
f, err := os.Open(name)
if err != nil {
return false, err
}
_, err = f.ReadDir(1)
if err == io.EOF {
f.Close()
return true, nil
}
f.Close()
return false, err
}