Merge pull request jellyfin#8775 from SenorSmartyPants/DVRMetadata

Fixes jellyfin#5178
sjww233 · Jan 3, 2023 · 43c3a46 · 43c3a46
2 parents 223aaec + 8f4ac1c
commit 43c3a46
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -1814,21 +1814,29 @@ private async Task SaveRecordingMetadata(TimerInfo timer, string recordingPath,
                     program.AddGenre("News");
                 }
 
-                if (timer.IsProgramSeries)
-                {
-                    await SaveSeriesNfoAsync(timer, seriesPath).ConfigureAwait(false);
-                    await SaveVideoNfoAsync(timer, recordingPath, program, false).ConfigureAwait(false);
-                }
-                else if (!timer.IsMovie || timer.IsSports || timer.IsNews)
+                var config = GetConfiguration();
+
+                if (config.SaveRecordingNFO)
                 {
-                    await SaveVideoNfoAsync(timer, recordingPath, program, true).ConfigureAwait(false);
+                    if (timer.IsProgramSeries)
+                    {
+                        await SaveSeriesNfoAsync(timer, seriesPath).ConfigureAwait(false);
+                        await SaveVideoNfoAsync(timer, recordingPath, program, false).ConfigureAwait(false);
+                    }
+                    else if (!timer.IsMovie || timer.IsSports || timer.IsNews)
+                    {
+                        await SaveVideoNfoAsync(timer, recordingPath, program, true).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        await SaveVideoNfoAsync(timer, recordingPath, program, false).ConfigureAwait(false);
+                    }
                 }
-                else
+
+                if (config.SaveRecordingImages)
                 {
-                    await SaveVideoNfoAsync(timer, recordingPath, program, false).ConfigureAwait(false);
+                    await SaveRecordingImages(recordingPath, program).ConfigureAwait(false);
                 }
-
-                await SaveRecordingImages(recordingPath, program).ConfigureAwait(false);
             }
             catch (Exception ex)
             {

diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -320,7 +320,7 @@ public override bool BeforeMetadataRefresh(bool replaceAllMetadata)
 
             if (!IsLocked)
             {
-                if (SourceType == SourceType.Library)
+                if (SourceType == SourceType.Library || SourceType == SourceType.LiveTV)
                 {
                     try
                     {

diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -40,5 +40,9 @@ public LiveTvOptions()
         public string RecordingPostProcessor { get; set; }
 
         public string RecordingPostProcessorArguments { get; set; }
+
+        public bool SaveRecordingNFO { get; set; } = true;
+
+        public bool SaveRecordingImages { get; set; } = true;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (!IsLocked)
                 {
-                    if (SourceType == SourceType.Library)
+                    if (SourceType == SourceType.Library || SourceType == SourceType.LiveTV)
                     {
                         try
                         {
@@ Expand Down @@