Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14309 from shanepowell/MediaInfoFixs

Browse Source 
Fix PeopleHelper.AddPerson Exceptions due to bad meta-data extracts.
This commit is contained in:
Shane Powell 2025-07-05 05:22:27 +12:00 committed by GitHub
parent 844d69ab64
commit 8dcb0bfecb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
View File

@ -218,7 +218,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = albumArtist.Trim(), Name = albumArtist,
Type = PersonKind.AlbumArtist Type = PersonKind.AlbumArtist
}); });
} }
@ -250,7 +250,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = performer.Trim(), Name = performer,
Type = PersonKind.Artist Type = PersonKind.Artist
}); });
} }
@ -264,7 +264,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
PeopleHelper.AddPerson(people, new PersonInfo PeopleHelper.AddPerson(people, new PersonInfo
{ {
Name = composer.Trim(), Name = composer,
Type = PersonKind.Composer Type = PersonKind.Composer
}); });
} }

14
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -6,6 +6,7 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Chapters; using MediaBrowser.Controller.Chapters;
@ -516,12 +517,15 @@ namespace MediaBrowser.Providers.MediaInfo
foreach (var person in data.People) foreach (var person in data.People)
{ {
PeopleHelper.AddPerson(people, new PersonInfo if (!string.IsNullOrWhiteSpace(person.Name))
{ {
Name = person.Name.Trim(), PeopleHelper.AddPerson(people, new PersonInfo
Type = person.Type, {
Role = person.Role.Trim() Name = person.Name,
}); Type = person.Type,
Role = person.Role.Trim()
});
}
} }
_libraryManager.UpdatePeople(video, people); _libraryManager.UpdatePeople(video, people);

22
MediaBrowser.Providers/Music/AlbumMetadataService.cs
View File

@ -200,20 +200,26 @@ public class AlbumMetadataService : MetadataService<MusicAlbum, AlbumInfo>
foreach (var albumArtist in item.AlbumArtists) foreach (var albumArtist in item.AlbumArtists)
{ {
PeopleHelper.AddPerson(people, new PersonInfo if (!string.IsNullOrWhiteSpace(albumArtist))
{ {
Name = albumArtist.Trim(), PeopleHelper.AddPerson(people, new PersonInfo
Type = PersonKind.AlbumArtist {
}); Name = albumArtist,
Type = PersonKind.AlbumArtist
});
}
} }
foreach (var artist in item.Artists) foreach (var artist in item.Artists)
{ {
PeopleHelper.AddPerson(people, new PersonInfo if (!string.IsNullOrWhiteSpace(artist))
{ {
Name = artist.Trim(), PeopleHelper.AddPerson(people, new PersonInfo
Type = PersonKind.Artist {
}); Name = artist,
Type = PersonKind.Artist
});
}
} }
LibraryManager.UpdatePeople(item, people); LibraryManager.UpdatePeople(item, people);