diff options
Diffstat (limited to 'pkg/worker/file_scanner.go')
| -rw-r--r-- | pkg/worker/file_scanner.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkg/worker/file_scanner.go b/pkg/worker/file_scanner.go index 0dc2eb2..fda869c 100644 --- a/pkg/worker/file_scanner.go +++ b/pkg/worker/file_scanner.go @@ -5,9 +5,9 @@ import ( "crypto/md5" "encoding/hex" "io/fs" + "mime" "path/filepath" - - "github.com/gabriel-vasile/mimetype" + "strings" "git.sr.ht/~gabrielgio/img/pkg/components/media" ) @@ -39,6 +39,10 @@ func (f *FileScanner) Query(ctx context.Context) (<-chan string, error) { default: } + if info == nil { + return nil + } + if info.IsDir() && filepath.Base(info.Name())[0] == '.' { return filepath.SkipDir } @@ -47,11 +51,6 @@ func (f *FileScanner) Query(ctx context.Context) (<-chan string, error) { return nil } - if filepath.Ext(info.Name()) != ".jpg" && - filepath.Ext(info.Name()) != ".jpeg" && - filepath.Ext(info.Name()) != ".png" { - return nil - } c <- path return nil }) @@ -60,6 +59,11 @@ func (f *FileScanner) Query(ctx context.Context) (<-chan string, error) { } func (f *FileScanner) Process(ctx context.Context, path string) error { + m := mime.TypeByExtension(filepath.Ext(path)) + if !strings.HasPrefix(m, "video") && !strings.HasPrefix(m, "image") { + return nil + } + hash := md5.Sum([]byte(path)) str := hex.EncodeToString(hash[:]) name := filepath.Base(path) @@ -73,7 +77,6 @@ func (f *FileScanner) Process(ctx context.Context, path string) error { return nil } - mime, errResp := mimetype.DetectFile(path) if errResp != nil { return errResp } @@ -82,6 +85,6 @@ func (f *FileScanner) Process(ctx context.Context, path string) error { Name: name, Path: path, PathHash: str, - MIMEType: mime.String(), + MIMEType: m, }) } |