From 5d72faf688152f9ccfea037d4ab6354e8010f85e Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 16 May 2025 13:52:54 +0800 Subject: [PATCH] fix(thumb): thumb queue retry setting not working (#2367) --- assets | 2 +- pkg/filemanager/manager/thumbnail.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/assets b/assets index f1c048e..c4d4d3a 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit f1c048ec0bad39fc774ca017564eadc96da773cb +Subproject commit c4d4d3aa6f28e04a5828f3b4b4453d239746bed0 diff --git a/pkg/filemanager/manager/thumbnail.go b/pkg/filemanager/manager/thumbnail.go index 83ca98c..09a1efc 100644 --- a/pkg/filemanager/manager/thumbnail.go +++ b/pkg/filemanager/manager/thumbnail.go @@ -260,21 +260,20 @@ func newGenerateThumbTask(ctx context.Context, m *manager, uri *fs.URI, ext stri } func (m *GenerateThumbTask) Do(ctx context.Context) (task.Status, error) { - var ( - res fs.Entity - err error - ) - defer func() { m.sig <- &generateRes{res, err} }() - // Make sure user does not cancel request before we start generating thumb. select { case <-ctx.Done(): - err = ctx.Err() + err := ctx.Err() return task.StatusError, err default: } - res, err = m.m.generateThumb(ctx, m.uri, m.ext, m.es) + res, err := m.m.generateThumb(ctx, m.uri, m.ext, m.es) + if err != nil { + return task.StatusError, err + } + + m.sig <- &generateRes{res, nil} return task.StatusCompleted, nil }