From 83632f91e636735894f513015efb955f7c893809 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Wed, 9 Aug 2023 17:42:09 -0700
Subject: [PATCH] New: Add additional logging when renaming extra files

(cherry picked from commit 1ae0dc81f73ef74078f07fd5536a7d9058df649d)

Closes #8966
---
 src/NzbDrone.Core/Extras/Files/ExtraFile.cs           | 5 +++++
 src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs    | 6 ++++++
 src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs    | 5 +++++
 src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs | 1 +
 4 files changed, 17 insertions(+)

diff --git a/src/NzbDrone.Core/Extras/Files/ExtraFile.cs b/src/NzbDrone.Core/Extras/Files/ExtraFile.cs
index c13b0a881b..ceab971bb6 100644
--- a/src/NzbDrone.Core/Extras/Files/ExtraFile.cs
+++ b/src/NzbDrone.Core/Extras/Files/ExtraFile.cs
@@ -11,6 +11,11 @@ public abstract class ExtraFile : ModelBase
         public DateTime Added { get; set; }
         public DateTime LastUpdated { get; set; }
         public string Extension { get; set; }
+
+        public override string ToString()
+        {
+            return $"[{Id}] {RelativePath}";
+        }
     }
 
     public enum ExtraFileType
diff --git a/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs b/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs
index 77c4623b76..1dede58007 100644
--- a/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs
+++ b/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs
@@ -93,6 +93,8 @@ protected TExtraFile ImportFile(Movie movie, MovieFile movieFile, string path, b
 
         protected TExtraFile MoveFile(Movie movie, MovieFile movieFile, TExtraFile extraFile, string fileNameSuffix = null)
         {
+            _logger.Trace("Renaming extra file: {0}", extraFile);
+
             var newFolder = Path.GetDirectoryName(Path.Combine(movie.Path, movieFile.RelativePath));
             var filenameBuilder = new StringBuilder(Path.GetFileNameWithoutExtension(movieFile.RelativePath));
 
@@ -110,9 +112,13 @@ protected TExtraFile MoveFile(Movie movie, MovieFile movieFile, TExtraFile extra
             {
                 try
                 {
+                    _logger.Trace("Renaming extra file: {0} to {1}", extraFile, newFileName);
+
                     _diskProvider.MoveFile(existingFileName, newFileName);
                     extraFile.RelativePath = movie.Path.GetRelativePath(newFileName);
 
+                    _logger.Trace("Renamed extra file from: {0}", extraFile);
+
                     return extraFile;
                 }
                 catch (Exception ex)
diff --git a/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs b/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs
index 2b4ffe2d61..41a28ef4ab 100644
--- a/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs
+++ b/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs
@@ -18,5 +18,10 @@ public SubtitleFile()
         public List<string> LanguageTags { get; set; }
 
         private string LanguageTagsAsString => string.Join(".", LanguageTags);
+
+        public override string ToString()
+        {
+            return $"[{Id}] {RelativePath} ({Language}{(LanguageTags.Count > 0 ? "." : "")}{LanguageTagsAsString}{Extension})";
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs b/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
index 9518cf7ae0..dac8e780e9 100644
--- a/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
+++ b/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs
@@ -82,6 +82,7 @@ public override IEnumerable<ExtraFile> MoveFilesAfterRename(Movie movie, List<Mo
                     foreach (var subtitleFile in group)
                     {
                         var suffix = GetSuffix(subtitleFile.Language, copy, subtitleFile.LanguageTags, groupCount > 1);
+
                         movedFiles.AddIfNotNull(MoveFile(movie, movieFile, subtitleFile, suffix));
 
                         copy++;