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

Fix overwrite of PremierDate with a year-only value (#13598)

Browse Source 
* Preserve the more-specific PremierDate's month and day

Fixes #13596
This commit is contained in:
Marc Brooks 2025-03-01 07:53:12 -06:00 committed by GitHub
parent 767a5e6193
commit 2da4a2d753
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@ -1010,7 +1010,7 @@ namespace MediaBrowser.Providers.Manager
} }
} }
if (replaceData || !target.PremiereDate.HasValue) if (replaceData || !target.PremiereDate.HasValue || (IsYearOnlyDate(target.PremiereDate.Value) && source.PremiereDate.HasValue))
{ {
target.PremiereDate = source.PremiereDate; target.PremiereDate = source.PremiereDate;
} }
@ -1142,6 +1142,8 @@ namespace MediaBrowser.Providers.Manager
} }
} }
private static bool IsYearOnlyDate(DateTime date) => date.Month == 1 && date.Day == 1;
private static void MergePeople(List<PersonInfo> source, List<PersonInfo> target) private static void MergePeople(List<PersonInfo> source, List<PersonInfo> target)
{ {
if (target is null) if (target is null)

14
tests/Jellyfin.Providers.Tests/Manager/MetadataServiceTests.cs
View File

@ -141,8 +141,10 @@ namespace Jellyfin.Providers.Tests.Manager
{ "ProductionYear", 1, 2 }, { "ProductionYear", 1, 2 },
{ "CommunityRating", 1.0f, 2.0f }, { "CommunityRating", 1.0f, 2.0f },
{ "CriticRating", 1.0f, 2.0f }, { "CriticRating", 1.0f, 2.0f },
{ "EndDate", DateTime.UnixEpoch, DateTime.Now }, { "EndDate", DateTime.UnixEpoch, DateTime.UtcNow },
{ "PremiereDate", DateTime.UnixEpoch, DateTime.Now }, { "PremiereDate", DateTime.UnixEpoch, DateTime.UtcNow },
{ "PremiereDate", new DateTime(1999, 1, 1, 0, 0, 0, DateTimeKind.Utc), DateTime.UtcNow },
{ "PremiereDate", new DateTime(2025, 2, 21, 0, 0, 0, DateTimeKind.Utc), DateTime.UtcNow },
{ "Video3DFormat", Video3DFormat.HalfSideBySide, Video3DFormat.FullSideBySide } { "Video3DFormat", Video3DFormat.HalfSideBySide, Video3DFormat.FullSideBySide }
}; };
@ -151,7 +153,15 @@ namespace Jellyfin.Providers.Tests.Manager
public void MergeBaseItemData_SimpleField_ReplacesAppropriately(string propName, object oldValue, object newValue) public void MergeBaseItemData_SimpleField_ReplacesAppropriately(string propName, object oldValue, object newValue)
{ {
// Use type Movie to allow testing of Video3DFormat // Use type Movie to allow testing of Video3DFormat
if (propName.Equals("PremiereDate", StringComparison.Ordinal) && oldValue is DateTime oldDateTime)
{
bool expectReplaced = oldDateTime.Month == 1 && oldDateTime.Day == 1;
Assert.Equal(TestMergeBaseItemData<Movie, MovieInfo>(propName, oldValue, newValue, null, false, out _), expectReplaced);
}
else
{
Assert.False(TestMergeBaseItemData<Movie, MovieInfo>(propName, oldValue, newValue, null, false, out _)); Assert.False(TestMergeBaseItemData<Movie, MovieInfo>(propName, oldValue, newValue, null, false, out _));
}
Assert.True(TestMergeBaseItemData<Movie, MovieInfo>(propName, oldValue, newValue, null, true, out _)); Assert.True(TestMergeBaseItemData<Movie, MovieInfo>(propName, oldValue, newValue, null, true, out _));
Assert.True(TestMergeBaseItemData<Movie, MovieInfo>(propName, null, newValue, null, false, out _)); Assert.True(TestMergeBaseItemData<Movie, MovieInfo>(propName, null, newValue, null, false, out _));