bug处理优化

bug处理优化

internal/service/organizer_sidecar.go

@@ -3,6 +3,7 @@ package service
 import (
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 // transferSidecarNFO moves/copies/links the .nfo sidecar alongside its media
@@ -27,3 +28,65 @@ func transferSidecarNFO(srcMedia, dstMedia string, mode TransferMode) error {
 	}
 	return transferFile(src, dst, mode)
 }
+
+// artworkSidecarSuffixes lists the poster/backdrop sidecar name suffixes that
+// scrapers write next to a media file. It is deliberately conservative: we only
+// follow the canonical "<base>-poster" / "<base>-backdrop" names and their
+// Emby/Jellyfin variants, all scoped to the same base name as the media.
+var artworkSidecarSuffixes = []string{
+	"-poster", ".poster",
+	"-backdrop", ".backdrop",
+	"-fanart", ".fanart", "-landscape",
+	"-cover", ".cover", "-thumb", ".thumb",
+}
+
+// artworkSidecarExtensions are the image extensions a sidecar may use. Both
+// "base-poster.jpg" (bare separator) and "base.poster.jpg" (dotted separator)
+// rely on suffix matching, so we probe the common image extensions.
+var artworkSidecarExtensions = []string{".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tbn"}
+
+// transferSidecarArtwork moves/copies/links the scraped poster/backdrop
+// sidecar files alongside its media using the same transfer mode, mirroring
+// transferSidecarNFO. Previously organize moved only the .nfo and left posters
+// behind in the old folder; this keeps artwork with the organized file.
+func transferSidecarArtwork(srcMedia, dstMedia string, mode TransferMode) error {
+	srcDir := filepath.Dir(srcMedia)
+	base := strings.TrimSuffix(filepath.Base(srcMedia), filepath.Ext(srcMedia))
+	if base == "" || base == "." {
+		return nil
+	}
+	// Find every existing sidecar by probing suffix + extension combinations.
+	sources := make([]string, 0, len(artworkSidecarSuffixes)*len(artworkSidecarExtensions))
+	seen := map[string]struct{}{}
+	for _, suffix := range artworkSidecarSuffixes {
+		for _, ext := range artworkSidecarExtensions {
+			path := filepath.Join(srcDir, base+suffix+ext)
+			key := strings.ToLower(filepath.Clean(path))
+			if _, ok := seen[key]; ok {
+				continue
+			}
+			seen[key] = struct{}{}
+			if _, err := os.Stat(path); err == nil {
+				sources = append(sources, path)
+			}
+		}
+	}
+	if len(sources) == 0 {
+		return nil
+	}
+	dstDir := filepath.Dir(dstMedia)
+	if err := os.MkdirAll(dstDir, 0o755); err != nil { // #nosec G301 -- sidecar media directories must remain readable by NAS/player users.
+		return err
+	}
+	var firstErr error
+	for _, src := range sources {
+		dst := filepath.Join(dstDir, filepath.Base(src))
+		if _, err := os.Stat(dst); err == nil {
+			continue // never clobber an existing artwork at the destination
+		}
+		if err := transferFile(src, dst, mode); err != nil && firstErr == nil {
+			firstErr = err
+		}
+	}
+	return firstErr
+}