update recording save path

2 files changed, 36 insertions, 15 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 355597fcf..ebb5037d0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -495,10 +495,23 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 
             var info = GetProgramInfoFromCache(timer.ChannelId, timer.ProgramId);
             var recordPath = RecordingPath;
+
             if (info.IsMovie)
             {
                 recordPath = Path.Combine(recordPath, "Movies", _fileSystem.GetValidFilename(info.Name));
             }
+            else if (info.IsSeries)
+            {
+                recordPath = Path.Combine(recordPath, "Series", _fileSystem.GetValidFilename(info.Name));
+            }
+            else if (info.IsKids)
+            {
+                recordPath = Path.Combine(recordPath, "Kids", _fileSystem.GetValidFilename(info.Name));
+            }
+            else if (info.IsSports)
+            {
+                recordPath = Path.Combine(recordPath, "Sports", _fileSystem.GetValidFilename(info.Name));
+            }
             else
             {
                 recordPath = Path.Combine(recordPath, "TV", _fileSystem.GetValidFilename(info.Name));
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
index 09a5a3912..1b8cd2e61 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.LiveTv;
 using System;
+using System.Globalization;
 
 namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
 {
@@ -36,26 +37,33 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
         {
             if (info == null)
             {
-                return (timer.ProgramId + ".ts");
+                return timer.ProgramId + ".ts";
             }
-            var fancyName = info.Name;
-            if (info.ProductionYear != null)
-            {
-                fancyName += "_(" + info.ProductionYear + ")";
-            }
-            if (info.IsSeries && !string.IsNullOrWhiteSpace(info.EpisodeTitle))
-            {
-                fancyName += "_" + info.EpisodeTitle.Replace("Season: ", "S").Replace(" Episode: ", "E");
-            }
-            if (info.IsHD ?? false)
+
+            var name = info.Name;
+
+            if (info.IsSeries)
             {
-                fancyName += "_HD";
+                if (info.SeasonNumber.HasValue && info.EpisodeNumber.HasValue)
+                {
+                    name += string.Format(" S{0}E{1}", info.SeasonNumber.Value.ToString("00", CultureInfo.InvariantCulture), info.EpisodeNumber.Value.ToString("00", CultureInfo.InvariantCulture));
+                }
+                else if (info.OriginalAirDate.HasValue)
+                {
+                    name += " " + info.OriginalAirDate.Value.ToString("yyyy-MM-dd");
+                }
+                else if (!string.IsNullOrWhiteSpace(info.EpisodeTitle))
+                {
+                    name += " " + info.EpisodeTitle;
+                }
             }
-            if (info.OriginalAirDate != null)
+
+            else if (info.ProductionYear != null)
             {
-                fancyName += "_" + info.OriginalAirDate.Value.ToString("yyyy-MM-dd");
+                name += " (" + info.ProductionYear + ")";
             }
-            return fancyName + ".ts";
+
+            return name + ".ts";
         }
     }
 }