diff --git a/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs index bbd00d27..9ac60eef 100644 --- a/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs +++ b/src/Recyclarr.TrashLib.Guide/CustomFormat/CustomFormatLoader.cs @@ -29,8 +29,7 @@ public class CustomFormatLoader : ICustomFormatLoader return cf.Obj with { - Category = matchingCategory?.CategoryName, - FileName = cf.File.Name + Category = matchingCategory?.CategoryName }; })); } diff --git a/src/Recyclarr.TrashLib/Models/CustomFormatData.cs b/src/Recyclarr.TrashLib/Models/CustomFormatData.cs index f03d4121..a873bb1f 100644 --- a/src/Recyclarr.TrashLib/Models/CustomFormatData.cs +++ b/src/Recyclarr.TrashLib/Models/CustomFormatData.cs @@ -28,9 +28,6 @@ public record CustomFormatData [JsonIgnore] public string? Category { get; init; } - [JsonIgnore] - public string FileName { get; init; } = ""; - [JsonProperty("trash_id")] [JsonNoSerialize] public string TrashId { get; init; } = ""; diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Models/CustomFormatDataComparerTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Models/CustomFormatDataComparerTest.cs index c9f8c6d0..a234fce3 100644 --- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Models/CustomFormatDataComparerTest.cs +++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/Models/CustomFormatDataComparerTest.cs @@ -229,7 +229,6 @@ public class CustomFormatDataComparerTest { var a = new CustomFormatData { - FileName = "file1.json", TrashId = "a", TrashScores = {["default"] = 1}, Category = "one" @@ -237,7 +236,6 @@ public class CustomFormatDataComparerTest var b = new CustomFormatData { - FileName = "file2.json", TrashId = "b", TrashScores = {["default"] = 2}, Category = "two" diff --git a/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs b/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs index 723afdc4..104a719b 100644 --- a/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs +++ b/src/tests/Recyclarr.TrashLib.Guide.Tests/CustomFormat/CustomFormatLoaderIntegrationTest.cs @@ -23,8 +23,8 @@ public class CustomFormatLoaderIntegrationTest : GuideIntegrationFixture results.Should().BeEquivalentTo(new[] { - NewCf.Data("first", "1") with {FileName = "first.json"}, - NewCf.Data("second", "2") with {FileName = "second.json"} + NewCf.Data("first", "1"), + NewCf.Data("second", "2") }, o => o.Excluding(x => x.Type == typeof(JObject))); } }