alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-10 04:12:10 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #6262 from MrTimscampi/scanner-prefer-original-date

Browse Source
This commit is contained in:
Claus Vium
2021-08-11 12:39:05 +02:00
committed by GitHub
parent c2de5f2c23 8d5b87025b
commit 408d5c78a9
4 changed files with 170 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
View File

@@ -63,7 +63,8 @@ namespace MediaBrowser.MediaEncoding.Probing
public static DateTime? GetDictionaryDateTime(IReadOnlyDictionary<string, string> tags, string key)
{
if (tags.TryGetValue(key, out var val)
&& DateTime.TryParse(val, DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out var dateTime))
&& (DateTime.TryParse(val, DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out var dateTime)
|| DateTime.TryParseExact(val, "yyyy", DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out dateTime)))
{
return dateTime.ToUniversalTime();
}

1
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@@ -121,6 +121,7 @@ namespace MediaBrowser.MediaEncoding.Probing
// Several different forms of retail/premiere date
info.PremiereDate =
FFProbeHelpers.GetDictionaryDateTime(tags, "originaldate") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "retaildate") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "retail date") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "retail_date") ??