lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid guest star/actor dupes

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-14 11:03:12 -04:00
parent d792fa4359
commit 07d8649f97
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -957,7 +957,7 @@ namespace MediaBrowser.Controller.Entities
{ {
if (person == null) if (person == null)
{ {
throw new ArgumentNullException(); throw new ArgumentNullException("person");
} }
if (string.IsNullOrWhiteSpace(person.Name)) if (string.IsNullOrWhiteSpace(person.Name))
@ -967,14 +967,37 @@ namespace MediaBrowser.Controller.Entities
if (People == null) if (People == null)
{ {
People = new List<PersonInfo>(); People = new List<PersonInfo> { person };
return;
} }
// Check for dupes based on the combination of Name and Type // If the type is GuestStar and there's already an Actor entry, then update it to avoid dupes
if (string.Equals(person.Type, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(person.Type, StringComparison.OrdinalIgnoreCase)))
{ {
People.Add(person); var existing = People.FirstOrDefault(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(PersonType.Actor, StringComparison.OrdinalIgnoreCase));
if (existing != null)
{
existing.Type = PersonType.GuestStar;
return;
}
}
if (string.Equals(person.Type, PersonType.Actor, StringComparison.OrdinalIgnoreCase))
{
// Only add actors if there isn't an existing one of type Actor or GuestStar
if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && (p.Type.Equals(PersonType.Actor, StringComparison.OrdinalIgnoreCase) || p.Type.Equals(PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))))
{
People.Add(person);
}
}
else
{
// Check for dupes based on the combination of Name and Type
if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(person.Type, StringComparison.OrdinalIgnoreCase)))
{
People.Add(person);
}
} }
} }