added offline mode
This commit is contained in:
parent
b13ff70a2d
commit
d2b91f2db4
4 changed files with 105 additions and 38 deletions
99
pkg/fs/fs.go
99
pkg/fs/fs.go
|
|
@ -73,16 +73,27 @@ func NewFS(src, dst, metadata string, log logr.Logger) (fs *FS, err error) {
|
|||
return fs, err
|
||||
}
|
||||
|
||||
func (fs *FS) Stat(name string) (stdfs.FileInfo, error) {
|
||||
return stat(fs.src, name)
|
||||
func (fs *FS) Stat(name string) (fi stdfs.FileInfo, err error) {
|
||||
fi, _, err = fs.StatWithOffline(name)
|
||||
return
|
||||
}
|
||||
|
||||
func (fs *FS) StatWithOffline(name string) (fi stdfs.FileInfo, offline bool, err error) {
|
||||
f, err := fs.open(name, true)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
fi, err = f.Stat()
|
||||
offline = f.offline
|
||||
return
|
||||
}
|
||||
|
||||
func (fs *FS) Open(name string) (http.File, error) {
|
||||
return fs.open(name)
|
||||
return fs.open(name, false)
|
||||
}
|
||||
|
||||
func (fs *FS) Preload(name string) {
|
||||
f, err := fs.open(name)
|
||||
f, err := fs.open(name, false)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -95,66 +106,82 @@ func (fs *FS) Preload(name string) {
|
|||
}
|
||||
|
||||
func skipLog(name string) bool {
|
||||
return strings.HasSuffix(name, "index.html")
|
||||
return strings.HasSuffix(name, "index.html") || strings.HasSuffix(name, "favicon.ico")
|
||||
}
|
||||
|
||||
func (fs *FS) open(name string) (f *File, err error) {
|
||||
func (fs *FS) open(name string, stat bool) (f *File, err error) {
|
||||
log := fs.log.WithValues("file", name)
|
||||
rp := filepath.Join(fs.src, filepath.FromSlash(path.Clean("/"+name)))
|
||||
rf, err := os.Open(rp)
|
||||
p := filepath.FromSlash(path.Clean("/" + name))
|
||||
sp := filepath.Join(fs.src, p)
|
||||
dp := filepath.Join(fs.dst, p)
|
||||
offline := false
|
||||
sf, err := os.Open(sp)
|
||||
if err != nil {
|
||||
if !skipLog(name) {
|
||||
log.Error(err, "error opening source file")
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
sf, err = os.Open(dp)
|
||||
if err != nil {
|
||||
if !skipLog(name) {
|
||||
log.Error(err, "error opening source file")
|
||||
}
|
||||
return
|
||||
}
|
||||
offline = true
|
||||
log.V(2).Info("file offline mode", "path", dp)
|
||||
}
|
||||
return
|
||||
}
|
||||
rfi, err := rf.Stat()
|
||||
sfi, err := sf.Stat()
|
||||
if err != nil {
|
||||
log.Error(err, "error stat source file")
|
||||
return
|
||||
}
|
||||
if rfi.IsDir() {
|
||||
return &File{f: rf}, nil
|
||||
if sfi.IsDir() || stat {
|
||||
if empty, err := dirEmpty(sf.Name()); empty && err == nil {
|
||||
sf, err = os.Open(dp)
|
||||
offline = true
|
||||
log.V(2).Info("dir offline mode", "path", dp)
|
||||
}
|
||||
return &File{f: sf, offline: offline}, err
|
||||
}
|
||||
mp := filepath.Join(fs.dst, filepath.FromSlash(path.Clean("/"+name)))
|
||||
var mf *os.File
|
||||
i := strings.LastIndex(mp, "/")
|
||||
var df *os.File
|
||||
i := strings.LastIndex(dp, "/")
|
||||
if i > 0 {
|
||||
dir := mp[:i]
|
||||
dir := dp[:i]
|
||||
_, err = os.Stat(dir)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
err = os.MkdirAll(dir, 0o755)
|
||||
if err != nil {
|
||||
log.Error(err, "error creating cache dir", "dir", mp)
|
||||
log.Error(err, "error creating cache dir", "dir", dp)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
_, err = os.Stat(mp)
|
||||
_, err = os.Stat(dp)
|
||||
truncate := errors.Is(err, os.ErrNotExist)
|
||||
if !fs.isOpen(name) {
|
||||
mf, err = os.OpenFile(mp, os.O_RDWR|os.O_CREATE, 0o644)
|
||||
df, err = os.OpenFile(dp, os.O_RDWR|os.O_CREATE, 0o644)
|
||||
if err != nil {
|
||||
log.Error(err, "error opening cache file")
|
||||
return nil, err
|
||||
}
|
||||
if truncate {
|
||||
err = mf.Truncate(rfi.Size())
|
||||
err = df.Truncate(sfi.Size())
|
||||
if err != nil {
|
||||
log.Error(err, "error truncating cache file")
|
||||
return nil, err
|
||||
}
|
||||
err = mf.Sync()
|
||||
err = df.Sync()
|
||||
if err != nil {
|
||||
log.Error(err, "error syncing cache file")
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
md := fs.metadata(name, sfi.Size(), df)
|
||||
return &File{
|
||||
log: log,
|
||||
f: rf,
|
||||
md: fs.metadata(name, rfi.Size(), mf),
|
||||
log: log,
|
||||
f: sf,
|
||||
md: md,
|
||||
offline: offline,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
@ -219,7 +246,21 @@ func (fs *FS) Close() {
|
|||
fs.flushMetadata()
|
||||
}
|
||||
|
||||
func stat(prefix, name string) (stdfs.FileInfo, error) {
|
||||
p := filepath.Join(prefix, filepath.FromSlash(path.Clean("/"+name)))
|
||||
return os.Stat(p)
|
||||
func dirEmpty(name string) (bool, error) {
|
||||
f, err := os.Open(name)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
defer f.Close()
|
||||
_, err = f.Readdir(1)
|
||||
if err == io.EOF {
|
||||
return true, nil
|
||||
}
|
||||
return false, err
|
||||
}
|
||||
|
||||
func stat(dst, name string) (fi stdfs.FileInfo, err error) {
|
||||
p := filepath.FromSlash(path.Clean("/" + name))
|
||||
dp := filepath.Join(dst, p)
|
||||
return os.Stat(dp)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue