tcjlj/MeBox
1
0
Fork 0
mirror of https://github.com/truewhile/MeBox.git synced 2026-10-02 20:26:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct organize media type classification

Browse Source
This commit is contained in:
ShukeBta
2026-06-25 11:50:02 +08:00
parent 16c3ed239a
commit e16fecb3ec
15 changed files with 308 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/service/organizer_directory_source.go
+62 -1
View File
@@ -80,7 +80,27 @@ func (o *OrganizerService) buildOrganizeSourceFilePlan(ctx context.Context, req
forcedType := normalizeOrganizeMediaType(req.MediaTypeOverride)
inferredType := o.inferMediaTypeForSourceFile(req.Source, identity.Title, identity.Season, identity.Episode)
layout = applyOrganizeSourceMediaType(layout, forcedType, inferredType)
metadataMatch := o.lookupOrganizeSourceMetadata(ctx, req, layout.MediaType, &identity)
lookupType := organizeSourceMetadataLookupType(req.Source, pathLayout, layout, forcedType, inferredType, identity)
metadataMatch := o.lookupOrganizeSourceMetadata(ctx, req, lookupType, &identity)
if metadataMatch == nil && lookupType != layout.MediaType {
metadataMatch = o.lookupOrganizeSourceMetadata(ctx, req, layout.MediaType, &identity)
}
if forcedType == "" && metadataMatch != nil {
if matchType := normalizeOrganizeMediaType(metadataMatch.MediaType); matchType != "" && matchType != layout.MediaType {
if categoryType, _ := o.mediaTypeForDirectoryCategory(layout.Category); categoryType != "" && !sourceCategoryCompatible(matchType, categoryType) {
layout.Category = ""
}
if o.log != nil {
o.log.Info("organize media type corrected by metadata",
zap.String("source", req.Source),
zap.String("from", layout.MediaType),
zap.String("to", matchType),
zap.String("title", metadataMatch.Title),
zap.Int("tmdb_id", metadataMatch.TMDbID))
}
layout.MediaType = matchType
}
}
layout = o.applyOrganizeSourceCategory(ctx, req, pathLayout, layout, forcedType, identity, metadataMatch)
layoutRoot, targetLibraryID := o.resolveOrganizeSourceLayoutRoot(ctx, req, layout)
target, err := o.buildOrganizeSourceTarget(ctx, req, layout, layoutRoot, identity)
@@ -164,6 +184,47 @@ func applyOrganizeSourceMediaType(layout organizeDirectoryLayout, forcedType, in
return layout
}
func organizeSourceMetadataLookupType(src string, pathLayout, layout organizeDirectoryLayout, forcedType, inferredType string, identity organizeSourceIdentity) string {
if forcedType != "" {
return layout.MediaType
}
if pathLayout.MediaType != "" && pathLayout.MediaType != "movie" && organizeStandaloneMovieSourceHint(src, identity) {
return "movie"
}
return layout.MediaType
}
func organizeStandaloneMovieSourceHint(src string, identity organizeSourceIdentity) bool {
if identity.Season > 0 || identity.Episode > 0 {
return organizeEpisodeLooksSourcedFromMovieYear(src, identity)
}
_, year := CleanQuery(filepath.Base(src))
if year <= 0 {
year = identity.Year
}
if year <= 0 {
return false
}
text := strings.ToLower(strings.Join([]string{filepath.Base(src), identity.Title, identity.ParsedTitle}, " "))
return !classifierEpisodeRE.MatchString(text) && !classifierSeasonRE.MatchString(text)
}
func organizeEpisodeLooksSourcedFromMovieYear(src string, identity organizeSourceIdentity) bool {
year := identity.Year
if identity.SourceMedia != nil && identity.SourceMedia.Year > 0 {
year = identity.SourceMedia.Year
}
if year < 1900 || year > 2099 || identity.Season != 1 || identity.Episode != year/10 {
return false
}
showDir := showDirFromEpisodePath(src)
if showDir == "" {
return false
}
_, folderYear := CleanQuery(filepath.Base(showDir))
return folderYear == year
}
func (o *OrganizerService) lookupOrganizeSourceMetadata(ctx context.Context, req organizeSourceFileRequest, mediaType string, identity *organizeSourceIdentity) *Match {
match := o.lookupOrganizeMetadata(ctx, req.Source, req.SourceRoot, mediaType, identity.Title, identity.Year, identity.Season, identity.Episode, req.MetadataCache)
if match == nil && identity.SourceMedia != nil {