mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-05 04:56:37 +08:00
优化
This commit is contained in:
@@ -2,6 +2,7 @@ package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -20,10 +21,34 @@ func (s *ScraperService) prepareScrapedArtworkURL(ctx context.Context, mediaID,
|
||||
if s == nil || s.images == nil || !isHTTPish(candidate) {
|
||||
return candidate, ""
|
||||
}
|
||||
fetchCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 15*time.Second)
|
||||
originalSource := metaTubeOriginalArtworkURL(candidate)
|
||||
timeout := 15 * time.Second
|
||||
if originalSource != "" {
|
||||
// MetaTube face processing can become very slow under a batch scrape.
|
||||
// Fail over quickly so the same source can be processed locally.
|
||||
timeout = 8 * time.Second
|
||||
}
|
||||
fetchCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), timeout)
|
||||
err := s.images.PrefetchRemote(fetchCtx, candidate)
|
||||
cancel()
|
||||
if err != nil {
|
||||
if originalSource != "" {
|
||||
fallbackCtx, fallbackCancel := context.WithTimeout(context.WithoutCancel(ctx), 15*time.Second)
|
||||
fallbackErr := s.images.PrefetchRemote(fallbackCtx, originalSource)
|
||||
fallbackCancel()
|
||||
if fallbackErr == nil {
|
||||
s.log.Warn("MetaTube artwork processing failed; using local face-aware crop",
|
||||
zap.String("media_id", mediaID),
|
||||
zap.String("field", field),
|
||||
zap.String("candidate", candidate),
|
||||
zap.String("source", originalSource),
|
||||
zap.Error(err))
|
||||
if current != "" && isHTTPish(current) {
|
||||
return originalSource, current
|
||||
}
|
||||
return originalSource, ""
|
||||
}
|
||||
}
|
||||
if current != "" {
|
||||
s.log.Warn("scrape artwork prefetch failed; keeping existing artwork",
|
||||
zap.String("media_id", mediaID),
|
||||
@@ -46,6 +71,18 @@ func (s *ScraperService) prepareScrapedArtworkURL(ctx context.Context, mediaID,
|
||||
return candidate, ""
|
||||
}
|
||||
|
||||
func metaTubeOriginalArtworkURL(raw string) string {
|
||||
parsed, err := url.Parse(strings.TrimSpace(raw))
|
||||
if err != nil || !strings.Contains(parsed.Path, "/v1/images/primary/") {
|
||||
return ""
|
||||
}
|
||||
source := strings.TrimSpace(parsed.Query().Get("url"))
|
||||
if !isHTTPish(source) {
|
||||
return ""
|
||||
}
|
||||
return source
|
||||
}
|
||||
|
||||
func (s *ScraperService) removeCachedScrapedArtwork(urls ...string) {
|
||||
if s == nil || s.images == nil {
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user