Use sha in thumbnails extractors

This commit is contained in:
Zoe Roux 2024-02-25 20:38:22 +01:00
parent 25fc5d5835
commit b035ad07ec
2 changed files with 13 additions and 12 deletions

View File

@ -190,7 +190,7 @@ func (h *Handler) GetInfo(c echo.Context) error {
go src.ExtractThumbnail(
ret.Path,
route,
&sha,
sha,
)
return c.JSON(http.StatusOK, ret)
}
@ -265,11 +265,15 @@ func (h *Handler) GetThumbnails(c echo.Context) error {
if err != nil {
return err
}
sha, err := src.GetHash(path)
if err != nil {
return err
}
out, err := src.ExtractThumbnail(
path,
GetRoute(c),
nil,
sha,
)
if err != nil {
return err
@ -289,11 +293,15 @@ func (h *Handler) GetThumbnailsVtt(c echo.Context) error {
if err != nil {
return err
}
sha, err := src.GetHash(path)
if err != nil {
return err
}
out, err := src.ExtractThumbnail(
path,
GetRoute(c),
nil,
sha,
)
if err != nil {
return err

View File

@ -27,15 +27,8 @@ type Thumbnail struct {
var thumbnails = NewCMap[string, *Thumbnail]()
func ExtractThumbnail(path string, route string, sha *string) (string, error) {
ret, _ := thumbnails.GetOrCreate(path, func() *Thumbnail {
if sha == nil {
nsha, err := GetHash(path)
if err != nil {
return nil
}
sha = &nsha
}
func ExtractThumbnail(path string, route string, sha string) (string, error) {
ret, _ := thumbnails.GetOrCreate(sha, func() *Thumbnail {
ret := &Thumbnail{
path: fmt.Sprintf("%s/%s", Settings.Metadata, sha),
}