github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5693 from Maxr1998/probe-result-tweaks

Browse source 
(cherry picked from commit 7978f30ff7)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2021-04-04 17:16:17 +02:00 • committed by Joshua M. Boniface
parent 95a4fc0f18
commit 9e459090ed
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
namespace MediaBrowser.MediaEncoding.Probing namespace MediaBrowser.MediaEncoding.Probing
{ {
@ -85,12 +86,14 @@ namespace MediaBrowser.MediaEncoding.Probing
{ {
var val = GetDictionaryValue(tags, key); var val = GetDictionaryValue(tags, key);
if (!string.IsNullOrEmpty(val)) if (string.IsNullOrEmpty(val))
{ {
if (DateTime.TryParse(val, out var i)) return null;
{ }
return i.ToUniversalTime();
} if (DateTime.TryParse(val, DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out var i))
{
return i.ToUniversalTime();
} }
return null; return null;

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

@ -131,6 +131,7 @@ namespace MediaBrowser.MediaEncoding.Probing
info.PremiereDate = FFProbeHelpers.GetDictionaryDateTime(tags, "retaildate") ?? info.PremiereDate = FFProbeHelpers.GetDictionaryDateTime(tags, "retaildate") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "retail date") ?? FFProbeHelpers.GetDictionaryDateTime(tags, "retail date") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "retail_date") ?? FFProbeHelpers.GetDictionaryDateTime(tags, "retail_date") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "date_released") ??
FFProbeHelpers.GetDictionaryDateTime(tags, "date"); FFProbeHelpers.GetDictionaryDateTime(tags, "date");
if (isAudio) if (isAudio)