From 38cd130da5519eacd933073dfd1b83277d8429c6 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sat, 10 Feb 2024 21:32:55 -0600
Subject: [PATCH] Fixed: Remove old naming config from API responses

Closes #9741
---
 src/NzbDrone.Core/Organizer/BasicNamingConfig.cs  | 12 ------------
 src/NzbDrone.Core/Organizer/FileNameBuilder.cs    |  6 ------
 .../Config/NamingConfigController.cs              |  6 ------
 src/Radarr.Api.V3/Config/NamingConfigResource.cs  |  4 ----
 src/Radarr.Api.V3/Config/NamingExampleResource.cs | 15 +--------------
 5 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 src/NzbDrone.Core/Organizer/BasicNamingConfig.cs

diff --git a/src/NzbDrone.Core/Organizer/BasicNamingConfig.cs b/src/NzbDrone.Core/Organizer/BasicNamingConfig.cs
deleted file mode 100644
index b0dc16f6a..000000000
--- a/src/NzbDrone.Core/Organizer/BasicNamingConfig.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace NzbDrone.Core.Organizer
-{
-    public class BasicNamingConfig
-    {
-        public bool IncludeSeriesTitle { get; set; }
-        public bool IncludeEpisodeTitle { get; set; }
-        public bool IncludeQuality { get; set; }
-        public bool ReplaceSpaces { get; set; }
-        public string Separator { get; set; }
-        public string NumberStyle { get; set; }
-    }
-}
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index d570072a2..c2af95011 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -24,7 +24,6 @@ namespace NzbDrone.Core.Organizer
     {
         string BuildFileName(Movie movie, MovieFile movieFile, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null);
         string BuildFilePath(Movie movie, string fileName, string extension);
-        BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec);
         string GetMovieFolder(Movie movie, NamingConfig namingConfig = null);
     }
 
@@ -155,11 +154,6 @@ namespace NzbDrone.Core.Organizer
             return Path.Combine(path, fileName + extension);
         }
 
-        public BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec)
-        {
-            return new BasicNamingConfig(); // For now let's be lazy
-        }
-
         public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
         {
             if (namingConfig == null)
diff --git a/src/Radarr.Api.V3/Config/NamingConfigController.cs b/src/Radarr.Api.V3/Config/NamingConfigController.cs
index 92f234a30..fd9f406c2 100644
--- a/src/Radarr.Api.V3/Config/NamingConfigController.cs
+++ b/src/Radarr.Api.V3/Config/NamingConfigController.cs
@@ -44,12 +44,6 @@ namespace Radarr.Api.V3.Config
             var nameSpec = _namingConfigService.GetConfig();
             var resource = nameSpec.ToResource();
 
-            if (resource.StandardMovieFormat.IsNotNullOrWhiteSpace())
-            {
-                var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
-                basicConfig.AddToResource(resource);
-            }
-
             return resource;
         }
 
diff --git a/src/Radarr.Api.V3/Config/NamingConfigResource.cs b/src/Radarr.Api.V3/Config/NamingConfigResource.cs
index be0453710..7cc9bc683 100644
--- a/src/Radarr.Api.V3/Config/NamingConfigResource.cs
+++ b/src/Radarr.Api.V3/Config/NamingConfigResource.cs
@@ -10,9 +10,5 @@ namespace Radarr.Api.V3.Config
         public ColonReplacementFormat ColonReplacementFormat { get; set; }
         public string StandardMovieFormat { get; set; }
         public string MovieFolderFormat { get; set; }
-        public bool IncludeQuality { get; set; }
-        public bool ReplaceSpaces { get; set; }
-        public string Separator { get; set; }
-        public string NumberStyle { get; set; }
     }
 }
diff --git a/src/Radarr.Api.V3/Config/NamingExampleResource.cs b/src/Radarr.Api.V3/Config/NamingExampleResource.cs
index 37d636f46..05f9af4ad 100644
--- a/src/Radarr.Api.V3/Config/NamingExampleResource.cs
+++ b/src/Radarr.Api.V3/Config/NamingExampleResource.cs
@@ -20,23 +20,10 @@ namespace Radarr.Api.V3.Config
                 ReplaceIllegalCharacters = model.ReplaceIllegalCharacters,
                 ColonReplacementFormat = model.ColonReplacementFormat,
                 StandardMovieFormat = model.StandardMovieFormat,
-                MovieFolderFormat = model.MovieFolderFormat,
-
-                // IncludeQuality
-                // ReplaceSpaces
-                // Separator
-                // NumberStyle
+                MovieFolderFormat = model.MovieFolderFormat
             };
         }
 
-        public static void AddToResource(this BasicNamingConfig basicNamingConfig, NamingConfigResource resource)
-        {
-            resource.IncludeQuality = basicNamingConfig.IncludeQuality;
-            resource.ReplaceSpaces = basicNamingConfig.ReplaceSpaces;
-            resource.Separator = basicNamingConfig.Separator;
-            resource.NumberStyle = basicNamingConfig.NumberStyle;
-        }
-
         public static NamingConfig ToModel(this NamingConfigResource resource)
         {
             return new NamingConfig