Merge pull request #14309 from shanepowell/MediaInfoFixs

Fix PeopleHelper.AddPerson Exceptions due to bad meta-data extracts.

MediaBrowser.Providers/MediaInfo/AudioFileProber.cs

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

MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs

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

MediaBrowser.Providers/Music/AlbumMetadataService.cs

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