Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions drivers/local/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,9 @@ func (d *Local) Remove(ctx context.Context, obj model.Obj) error {
if err != nil {
return err
}
if !obj.IsDir() {
d.removeThumbCache(obj.GetPath())
}
if obj.IsDir() {
if d.directoryMap.Has(obj.GetPath()) {
d.directoryMap.DeleteDirNode(obj.GetPath())
Expand Down
44 changes: 44 additions & 0 deletions drivers/local/remove_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package local

import (
"context"
"os"
"path/filepath"
"testing"

"github.com/OpenListTeam/OpenList/v4/internal/model"
)

func TestRemoveDeletesThumbCache(t *testing.T) {
root := t.TempDir()
cacheDir := filepath.Join(root, "thumbs")
if err := os.Mkdir(cacheDir, 0o755); err != nil {
t.Fatal(err)
}
filePath := filepath.Join(root, "photo.jpg")
if err := os.WriteFile(filePath, []byte("image"), 0o666); err != nil {
t.Fatal(err)
}

driver := &Local{
Addition: Addition{
ThumbCacheFolder: cacheDir,
},
}
thumbPath := driver.thumbCachePath(filePath)
if err := os.WriteFile(thumbPath, []byte("thumb"), 0o666); err != nil {
t.Fatal(err)
}

err := driver.Remove(context.Background(), &model.Object{
Path: filePath,
Name: filepath.Base(filePath),
})
if err != nil {
t.Fatal(err)
}

if _, err = os.Stat(thumbPath); !os.IsNotExist(err) {
t.Fatalf("expected thumb cache to be removed, got %v", err)
}
}
23 changes: 19 additions & 4 deletions drivers/local/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import (
ffmpeg "github.com/u2takey/ffmpeg-go"
)

const thumbPrefix = "openlist_thumb_"

func isSymlinkDir(f fs.FileInfo, path string) bool {
if f.Mode()&os.ModeSymlink == os.ModeSymlink ||
(runtime.GOOS == "windows" && f.Mode()&os.ModeIrregular == os.ModeIrregular) { // os.ModeIrregular is Junction bit in Windows
Expand Down Expand Up @@ -110,16 +112,29 @@ func readDir(dirname string) ([]fs.FileInfo, error) {
return list, nil
}

func (d *Local) thumbCachePath(fullPath string) string {
if d.ThumbCacheFolder == "" {
return ""
}
return filepath.Join(d.ThumbCacheFolder, thumbPrefix+utils.GetMD5EncodeStr(fullPath)+".png")
}

func (d *Local) removeThumbCache(fullPath string) {
thumbPath := d.thumbCachePath(fullPath)
if thumbPath == "" {
return
}
_ = os.Remove(thumbPath)
}

func (d *Local) getThumb(file model.Obj) (*bytes.Buffer, *string, error) {
fullPath := file.GetPath()
thumbPrefix := "openlist_thumb_"
thumbName := thumbPrefix + utils.GetMD5EncodeStr(fullPath) + ".png"
if d.ThumbCacheFolder != "" {
// skip if the file is a thumbnail
if strings.HasPrefix(file.GetName(), thumbPrefix) {
return nil, &fullPath, nil
}
thumbPath := filepath.Join(d.ThumbCacheFolder, thumbName)
thumbPath := d.thumbCachePath(fullPath)
if utils.Exists(thumbPath) {
return nil, &thumbPath, nil
}
Expand Down Expand Up @@ -151,7 +166,7 @@ func (d *Local) getThumb(file model.Obj) (*bytes.Buffer, *string, error) {
return nil, nil, err
}
if d.ThumbCacheFolder != "" {
err = os.WriteFile(filepath.Join(d.ThumbCacheFolder, thumbName), buf.Bytes(), 0o666)
err = os.WriteFile(d.thumbCachePath(fullPath), buf.Bytes(), 0o666)
if err != nil {
return nil, nil, err
}
Expand Down
Loading