diff --git a/schemas/config/media-naming-radarr.json b/schemas/config/media-naming-radarr.json index 8c4a204d..6a5bd3c8 100644 --- a/schemas/config/media-naming-radarr.json +++ b/schemas/config/media-naming-radarr.json @@ -10,7 +10,7 @@ "additionalProperties": false, "properties": { "rename": { "type": "boolean" }, - "format": { "type": "string" } + "standard": { "type": "string" } } } } diff --git a/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs b/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs index 77bd25db..95f54835 100644 --- a/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs +++ b/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs @@ -46,7 +46,7 @@ public class MediaNamingConfigPhase return new RadarrMediaNamingDto { - StandardMovieFormat = ObtainFormat(guideData.File, configData.Movie?.Format, "Movie File Format"), + StandardMovieFormat = ObtainFormat(guideData.File, configData.Movie?.Standard, "Standard Movie Format"), MovieFolderFormat = ObtainFormat(guideData.Folder, configData.Folder, "Movie Folder Format"), RenameMovies = configData.Movie?.Rename }; diff --git a/src/Recyclarr.Config/Models/RadarrConfiguration.cs b/src/Recyclarr.Config/Models/RadarrConfiguration.cs index 2b3d2803..b3f4737e 100644 --- a/src/Recyclarr.Config/Models/RadarrConfiguration.cs +++ b/src/Recyclarr.Config/Models/RadarrConfiguration.cs @@ -5,7 +5,7 @@ namespace Recyclarr.Config.Models; public record RadarrMovieNamingConfig { public bool? Rename { get; init; } - public string? Format { get; init; } + public string? Standard { get; init; } } public record RadarrMediaNamingConfig diff --git a/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Radarr.cs b/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Radarr.cs index 42321ec6..058f78d1 100644 --- a/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Radarr.cs +++ b/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Radarr.cs @@ -6,7 +6,7 @@ namespace Recyclarr.Config.Parsing; public record RadarrMovieNamingConfigYaml { public bool? Rename { get; init; } - public string? Format { get; init; } + public string? Standard { get; init; } } [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)] diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs index 41f326c3..6f3f05d1 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs @@ -23,7 +23,7 @@ public class RadarrConfigMerger : ServiceConfigMerger Movie = Combine(a.Movie, b.Movie, (a1, b1) => a1 with { Rename = b1.Rename ?? a1.Rename, - Format = b1.Format ?? a1.Format + Standard = b1.Standard ?? a1.Standard }) }; } diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/MediaNaming/MediaNamingConfigPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/MediaNaming/MediaNamingConfigPhaseTest.cs index 32d49cae..64d19242 100644 --- a/src/tests/Recyclarr.Cli.Tests/Pipelines/MediaNaming/MediaNamingConfigPhaseTest.cs +++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/MediaNaming/MediaNamingConfigPhaseTest.cs @@ -224,7 +224,7 @@ public class MediaNamingConfigPhaseTest Movie = new RadarrMovieNamingConfig { Rename = true, - Format = "emby" + Standard = "emby" } } }; diff --git a/src/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/MergeMediaNamingRadarrTest.cs b/src/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/MergeMediaNamingRadarrTest.cs index 8534fdff..dbc31334 100644 --- a/src/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/MergeMediaNamingRadarrTest.cs +++ b/src/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/MergeMediaNamingRadarrTest.cs @@ -19,7 +19,7 @@ public class MergeMediaNamingRadarrTest Movie = new RadarrMovieNamingConfigYaml { Rename = false, - Format = "format1" + Standard = "format1" } } }; @@ -46,7 +46,7 @@ public class MergeMediaNamingRadarrTest Movie = new RadarrMovieNamingConfigYaml { Rename = false, - Format = "format1" + Standard = "format1" } } }; @@ -70,7 +70,7 @@ public class MergeMediaNamingRadarrTest Movie = new RadarrMovieNamingConfigYaml { Rename = false, - Format = "format1" + Standard = "format1" } } }; @@ -83,7 +83,7 @@ public class MergeMediaNamingRadarrTest Movie = new RadarrMovieNamingConfigYaml { Rename = false, - Format = "format2" + Standard = "format2" } } };