Fix OMDB People handling

2026-08-24 21:49:53 +02:00
parent 422b2bb3d9
commit 4c524f033f
2 changed files with 79 additions and 29 deletions
@@ -420,41 +420,40 @@ namespace MediaBrowser.Providers.Plugins.Omdb
                return;
            }

-            if (!string.IsNullOrWhiteSpace(result.Director))
-            {
-                var person = new PersonInfo
-                {
-                    Name = result.Director.Trim(),
-                    Type = PersonKind.Director
-                };
+            AddPeople(itemResult, result.Director, PersonKind.Director);
+            AddPeople(itemResult, result.Writer, PersonKind.Writer);
+            AddPeople(itemResult, result.Actors, PersonKind.Actor);
+        }

-                itemResult.AddPerson(person);
+        internal static void AddPeople<T>(MetadataResult<T> itemResult, string credits, PersonKind type)
+            where T : BaseItem
+        {
+            if (string.IsNullOrWhiteSpace(credits))
+            {
+                return;
            }

-            if (!string.IsNullOrWhiteSpace(result.Writer))
+            foreach (var credit in credits.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
            {
-                var person = new PersonInfo
+                // OMDb annotates the credited role in parentheses, e.g. "Mari Okada (screenplay)". The same
+                // person can be credited more than once this way, so strip it and let AddPerson deduplicate.
+                var name = credit;
+                var annotation = name.IndexOf('(', StringComparison.Ordinal);
+                if (annotation >= 0)
                {
-                    Name = result.Writer.Trim(),
-                    Type = PersonKind.Writer
-                };
-
-                itemResult.AddPerson(person);
-            }
-
-            if (!string.IsNullOrWhiteSpace(result.Actors))
-            {
-                var actorList = result.Actors.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-                foreach (var actor in actorList)
-                {
-                    var person = new PersonInfo
-                    {
-                        Name = actor,
-                        Type = PersonKind.Actor
-                    };
-
-                    itemResult.AddPerson(person);
+                    name = name[..annotation].TrimEnd();
                }
+
+                if (string.IsNullOrEmpty(name))
+                {
+                    continue;
+                }
+
+                itemResult.AddPerson(new PersonInfo
+                {
+                    Name = name,
+                    Type = type
+                });
            }
        }

@@ -0,0 +1,51 @@
+using System.Linq;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Providers.Plugins.Omdb;
+using Xunit;
+
+namespace Jellyfin.Providers.Tests.Omdb
+{
+    public class OmdbProviderTests
+    {
+        [Fact]
+        public void AddPeople_CommaSeparatedList_SplitsIntoIndividualPeople()
+        {
+            var result = new MetadataResult<Movie>();
+
+            OmdbProvider.AddPeople(result, "Philip G. Epstein, Julius J. Epstein, Howard Koch", PersonKind.Writer);
+
+            Assert.Equal(
+                new[] { "Philip G. Epstein", "Julius J. Epstein", "Howard Koch" },
+                result.People!.Select(p => p.Name));
+            Assert.All(result.People!, p => Assert.Equal(PersonKind.Writer, p.Type));
+        }
+
+        [Fact]
+        public void AddPeople_RoleAnnotations_AreStrippedAndDeduplicated()
+        {
+            var result = new MetadataResult<Movie>();
+
+            OmdbProvider.AddPeople(result, "Mari Okada (screenplay), Mari Okada (story), Jun'ichi Satô (screenplay), Jun'ichi Satô (story)", PersonKind.Writer);
+
+            Assert.Equal(
+                new[] { "Mari Okada", "Jun'ichi Satô" },
+                result.People!.Select(p => p.Name));
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData("   ")]
+        [InlineData("(uncredited)")]
+        public void AddPeople_NoUsableName_AddsNothing(string? credits)
+        {
+            var result = new MetadataResult<Movie>();
+
+            OmdbProvider.AddPeople(result, credits!, PersonKind.Actor);
+
+            Assert.Null(result.People);
+        }
+    }
+}