Update to 3.5.2 and .net core 2.1

1 files changed, 24 insertions, 3 deletions

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
index a5712b4808..e694a82811 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
@@ -26,11 +26,18 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 else if (info.OriginalAirDate.HasValue)
                 {
-                    name += " " + info.OriginalAirDate.Value.ToString("yyyy-MM-dd");
+                    if (info.OriginalAirDate.Value.Date.Equals(info.StartDate.Date))
+                    {
+                        name += " " + GetDateString(info.StartDate);
+                    }
+                    else
+                    {
+                        name += " " + info.OriginalAirDate.Value.ToLocalTime().ToString("yyyy-MM-dd");
+                    }
                 }
                 else
                 {
-                    name += " " + DateTime.Now.ToString("yyyy-MM-dd");
+                    name += " " + GetDateString(info.StartDate);
                 }
 
                 if (!string.IsNullOrWhiteSpace(info.EpisodeTitle))
@@ -50,10 +57,24 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             else
             {
-                name += " " + info.StartDate.ToString("yyyy-MM-dd");
+                name += " " + GetDateString(info.StartDate);
             }
 
             return name;
         }
+
+        private static string GetDateString(DateTime date)
+        {
+            date = date.ToLocalTime();
+
+            return string.Format("{0}_{1}_{2}_{3}_{4}_{5}",
+                date.Year.ToString("0000", CultureInfo.InvariantCulture),
+                date.Month.ToString("00", CultureInfo.InvariantCulture),
+                date.Day.ToString("00", CultureInfo.InvariantCulture),
+                date.Hour.ToString("00", CultureInfo.InvariantCulture),
+                date.Minute.ToString("00", CultureInfo.InvariantCulture),
+                date.Second.ToString("00", CultureInfo.InvariantCulture)
+                );
+        }
     }
 }