From d66aa8ba440bac2ffb20b36a70f89338040985e5 Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Fri, 20 Jan 2023 20:22:34 -0600 Subject: [PATCH] refactor: Solution-wide code cleanup --- .../Migration/Steps/MigrateTrashYml.cs | 5 +++- .../Extensions/CollectionExtensions.cs | 19 ++++++++++++--- src/Recyclarr.TestLibrary/FileUtils.cs | 4 +++- src/Recyclarr.TestLibrary/StringUtils.cs | 5 +++- .../CfTestUtils.cs | 8 +++++-- .../Processors/GuideProcessorTest.cs | 11 +++++++-- .../Guide/LocalRepoSonarrGuideServiceTest.cs | 23 +++++++++++-------- .../Common/ServiceCapabilityChecker.cs | 5 +++- .../PersistenceSteps/JsonTransactionStep.cs | 4 +++- .../Services/QualitySize/Guide/QualityItem.cs | 5 +++- .../Radarr/LocalRepoRadarrGuideService.cs | 4 +++- .../Services/Radarr/RadarrGuideDataLister.cs | 11 +++++++-- .../Sonarr/LocalRepoSonarrGuideService.cs | 4 +++- .../Services/Sonarr/SonarrGuideDataLister.cs | 17 ++++++++++---- 14 files changed, 95 insertions(+), 30 deletions(-) diff --git a/src/Recyclarr.Cli/Migration/Steps/MigrateTrashYml.cs b/src/Recyclarr.Cli/Migration/Steps/MigrateTrashYml.cs index f94981f6..845153b1 100644 --- a/src/Recyclarr.Cli/Migration/Steps/MigrateTrashYml.cs +++ b/src/Recyclarr.Cli/Migration/Steps/MigrateTrashYml.cs @@ -34,7 +34,10 @@ public class MigrateTrashYml : IMigrationStep Description = $"Rename default YAML config from `{_oldConfigPath}` to `{_newConfigPath}`"; } - public bool CheckIfNeeded() => _fileSystem.File.Exists(_oldConfigPath); + public bool CheckIfNeeded() + { + return _fileSystem.File.Exists(_oldConfigPath); + } public void Execute(IAnsiConsole? console) { diff --git a/src/Recyclarr.Common/Extensions/CollectionExtensions.cs b/src/Recyclarr.Common/Extensions/CollectionExtensions.cs index 56e023c8..ec2146a7 100644 --- a/src/Recyclarr.Common/Extensions/CollectionExtensions.cs +++ b/src/Recyclarr.Common/Extensions/CollectionExtensions.cs @@ -19,10 +19,23 @@ public static class CollectionExtensions private sealed class ReadOnlyCollectionAdapter : IReadOnlyCollection { private readonly ICollection _source; - public ReadOnlyCollectionAdapter(ICollection source) => _source = source; + + public ReadOnlyCollectionAdapter(ICollection source) + { + _source = source; + } + public int Count => _source.Count; - public IEnumerator GetEnumerator() => _source.GetEnumerator(); - IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); + + public IEnumerator GetEnumerator() + { + return _source.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } } public static void AddRange(this ICollection destination, IEnumerable source) diff --git a/src/Recyclarr.TestLibrary/FileUtils.cs b/src/Recyclarr.TestLibrary/FileUtils.cs index d5fb9a00..951691b1 100644 --- a/src/Recyclarr.TestLibrary/FileUtils.cs +++ b/src/Recyclarr.TestLibrary/FileUtils.cs @@ -6,7 +6,9 @@ namespace Recyclarr.TestLibrary; public static partial class FileUtils { public static ICollection NormalizePaths(IEnumerable paths) - => paths.Select(NormalizePath).ToList(); + { + return paths.Select(NormalizePath).ToList(); + } public static string NormalizePath(string path) { diff --git a/src/Recyclarr.TestLibrary/StringUtils.cs b/src/Recyclarr.TestLibrary/StringUtils.cs index 697b982b..ae6479af 100644 --- a/src/Recyclarr.TestLibrary/StringUtils.cs +++ b/src/Recyclarr.TestLibrary/StringUtils.cs @@ -4,5 +4,8 @@ namespace Recyclarr.TestLibrary; public static class StringUtils { - public static string TrimmedString(string value) => value.TrimNewlines(); + public static string TrimmedString(string value) + { + return value.TrimNewlines(); + } } diff --git a/src/Recyclarr.TrashLib.TestLibrary/CfTestUtils.cs b/src/Recyclarr.TrashLib.TestLibrary/CfTestUtils.cs index 567e049f..a8fc6924 100644 --- a/src/Recyclarr.TrashLib.TestLibrary/CfTestUtils.cs +++ b/src/Recyclarr.TrashLib.TestLibrary/CfTestUtils.cs @@ -5,8 +5,12 @@ namespace Recyclarr.TrashLib.TestLibrary; public static class CfTestUtils { public static QualityProfileCustomFormatScoreMapping NewMapping(params FormatMappingEntry[] entries) - => new(false) {Mapping = entries.ToList()}; + { + return new(false) {Mapping = entries.ToList()}; + } public static QualityProfileCustomFormatScoreMapping NewMappingWithReset(params FormatMappingEntry[] entries) - => new(true) {Mapping = entries.ToList()}; + { + return new(true) {Mapping = entries.ToList()}; + } } diff --git a/src/Recyclarr.TrashLib.Tests/CustomFormat/Processors/GuideProcessorTest.cs b/src/Recyclarr.TrashLib.Tests/CustomFormat/Processors/GuideProcessorTest.cs index 926adfc8..a0b99f63 100644 --- a/src/Recyclarr.TrashLib.Tests/CustomFormat/Processors/GuideProcessorTest.cs +++ b/src/Recyclarr.TrashLib.Tests/CustomFormat/Processors/GuideProcessorTest.cs @@ -41,8 +41,15 @@ public class GuideProcessorTest return parser.ParseCustomFormatData(ReadText(textFile), ""); } - public string ReadText(string textFile) => Data.ReadData(textFile); - public JObject ReadJson(string jsonFile) => JObject.Parse(ReadText(jsonFile)); + public string ReadText(string textFile) + { + return Data.ReadData(textFile); + } + + public JObject ReadJson(string jsonFile) + { + return JObject.Parse(ReadText(jsonFile)); + } } [Test] diff --git a/src/Recyclarr.TrashLib.Tests/Sonarr/ReleaseProfile/Guide/LocalRepoSonarrGuideServiceTest.cs b/src/Recyclarr.TrashLib.Tests/Sonarr/ReleaseProfile/Guide/LocalRepoSonarrGuideServiceTest.cs index ece8181c..97a3d6e8 100644 --- a/src/Recyclarr.TrashLib.Tests/Sonarr/ReleaseProfile/Guide/LocalRepoSonarrGuideServiceTest.cs +++ b/src/Recyclarr.TrashLib.Tests/Sonarr/ReleaseProfile/Guide/LocalRepoSonarrGuideServiceTest.cs @@ -24,18 +24,23 @@ public class LocalRepoSonarrGuideServiceTest [Frozen] IRepoPaths repoPaths, LocalRepoSonarrGuideService sut) { - static ReleaseProfileData MakeMockObject(string term) => new() + static ReleaseProfileData MakeMockObject(string term) { - Name = "name", - TrashId = "123", - Required = new TermData[] + return new() { - new() {Term = term} - } - }; + Name = "name", + TrashId = "123", + Required = new TermData[] + { + new() {Term = term} + } + }; + } - static MockFileData MockFileData(dynamic obj) => - new MockFileData(JsonConvert.SerializeObject(obj)); + static MockFileData MockFileData(dynamic obj) + { + return new MockFileData(JsonConvert.SerializeObject(obj)); + } var mockData1 = MakeMockObject("first"); var mockData2 = MakeMockObject("second"); diff --git a/src/Recyclarr.TrashLib/Services/Common/ServiceCapabilityChecker.cs b/src/Recyclarr.TrashLib/Services/Common/ServiceCapabilityChecker.cs index 2d8cd242..f4993728 100644 --- a/src/Recyclarr.TrashLib/Services/Common/ServiceCapabilityChecker.cs +++ b/src/Recyclarr.TrashLib/Services/Common/ServiceCapabilityChecker.cs @@ -7,7 +7,10 @@ public abstract class ServiceCapabilityChecker where T : class { private readonly IObservable _capabilities; - public T? GetCapabilities() => _capabilities.Wait(); + public T? GetCapabilities() + { + return _capabilities.Wait(); + } protected ServiceCapabilityChecker(IServiceInformation info) { diff --git a/src/Recyclarr.TrashLib/Services/CustomFormat/Processors/PersistenceSteps/JsonTransactionStep.cs b/src/Recyclarr.TrashLib/Services/CustomFormat/Processors/PersistenceSteps/JsonTransactionStep.cs index 60048551..0ce5845e 100644 --- a/src/Recyclarr.TrashLib/Services/CustomFormat/Processors/PersistenceSteps/JsonTransactionStep.cs +++ b/src/Recyclarr.TrashLib/Services/CustomFormat/Processors/PersistenceSteps/JsonTransactionStep.cs @@ -148,7 +148,9 @@ public class JsonTransactionStep : IJsonTransactionStep } private static bool KeyMatch(JObject left, JObject right, string keyName) - => left.Value(keyName) == right.Value(keyName); + { + return left.Value(keyName) == right.Value(keyName); + } private static void MergeProperties(JObject serviceCf, JObject guideCfJson, JTokenType exceptType = JTokenType.None) diff --git a/src/Recyclarr.TrashLib/Services/QualitySize/Guide/QualityItem.cs b/src/Recyclarr.TrashLib/Services/QualitySize/Guide/QualityItem.cs index 30b2c695..22de150f 100644 --- a/src/Recyclarr.TrashLib/Services/QualitySize/Guide/QualityItem.cs +++ b/src/Recyclarr.TrashLib/Services/QualitySize/Guide/QualityItem.cs @@ -35,7 +35,10 @@ public class QualityItem return builder.ToString(); } - public bool IsMinDifferent(decimal serviceValue) => serviceValue != Min; + public bool IsMinDifferent(decimal serviceValue) + { + return serviceValue != Min; + } public bool IsMaxDifferent(decimal? serviceValue) { diff --git a/src/Recyclarr.TrashLib/Services/Radarr/LocalRepoRadarrGuideService.cs b/src/Recyclarr.TrashLib/Services/Radarr/LocalRepoRadarrGuideService.cs index eb01af4a..e902a5ed 100644 --- a/src/Recyclarr.TrashLib/Services/Radarr/LocalRepoRadarrGuideService.cs +++ b/src/Recyclarr.TrashLib/Services/Radarr/LocalRepoRadarrGuideService.cs @@ -21,7 +21,9 @@ public class LocalRepoRadarrGuideService : RadarrGuideService } public override ICollection GetQualities() - => _parser.GetQualities(_pathsFactory.Create().RadarrQualityPaths); + { + return _parser.GetQualities(_pathsFactory.Create().RadarrQualityPaths); + } public override ICollection GetCustomFormatData() { diff --git a/src/Recyclarr.TrashLib/Services/Radarr/RadarrGuideDataLister.cs b/src/Recyclarr.TrashLib/Services/Radarr/RadarrGuideDataLister.cs index 05d06ee7..5a635996 100644 --- a/src/Recyclarr.TrashLib/Services/Radarr/RadarrGuideDataLister.cs +++ b/src/Recyclarr.TrashLib/Services/Radarr/RadarrGuideDataLister.cs @@ -17,6 +17,13 @@ public class RadarrGuideDataLister : IRadarrGuideDataLister _guideLister = guideLister; } - public void ListCustomFormats() => _guideLister.ListCustomFormats(_guide.GetCustomFormatData()); - public void ListQualities() => _guideLister.ListQualities(_guide.GetQualities()); + public void ListCustomFormats() + { + _guideLister.ListCustomFormats(_guide.GetCustomFormatData()); + } + + public void ListQualities() + { + _guideLister.ListQualities(_guide.GetQualities()); + } } diff --git a/src/Recyclarr.TrashLib/Services/Sonarr/LocalRepoSonarrGuideService.cs b/src/Recyclarr.TrashLib/Services/Sonarr/LocalRepoSonarrGuideService.cs index 81beea08..af24ebfe 100644 --- a/src/Recyclarr.TrashLib/Services/Sonarr/LocalRepoSonarrGuideService.cs +++ b/src/Recyclarr.TrashLib/Services/Sonarr/LocalRepoSonarrGuideService.cs @@ -35,7 +35,9 @@ public class LocalRepoSonarrGuideService : SonarrGuideService } public override ICollection GetQualities() - => _parser.GetQualities(_pathsFactory.Create().SonarrQualityPaths); + { + return _parser.GetQualities(_pathsFactory.Create().SonarrQualityPaths); + } public override ICollection GetCustomFormatData() { diff --git a/src/Recyclarr.TrashLib/Services/Sonarr/SonarrGuideDataLister.cs b/src/Recyclarr.TrashLib/Services/Sonarr/SonarrGuideDataLister.cs index 275f5c6c..6499175a 100644 --- a/src/Recyclarr.TrashLib/Services/Sonarr/SonarrGuideDataLister.cs +++ b/src/Recyclarr.TrashLib/Services/Sonarr/SonarrGuideDataLister.cs @@ -23,8 +23,15 @@ public class SonarrGuideDataLister : ISonarrGuideDataLister _guideLister = guideLister; } - public void ListCustomFormats() => _guideLister.ListCustomFormats(_guide.GetCustomFormatData()); - public void ListQualities() => _guideLister.ListQualities(_guide.GetQualities()); + public void ListCustomFormats() + { + _guideLister.ListCustomFormats(_guide.GetCustomFormatData()); + } + + public void ListQualities() + { + _guideLister.ListQualities(_guide.GetQualities()); + } public void ListReleaseProfiles() { @@ -42,8 +49,10 @@ public class SonarrGuideDataLister : ISonarrGuideDataLister private static bool HasIdentifiableTerms(ReleaseProfileData profile) { - static bool HasTrashIds(IEnumerable terms) => - terms.Any(x => !string.IsNullOrEmpty(x.TrashId)); + static bool HasTrashIds(IEnumerable terms) + { + return terms.Any(x => !string.IsNullOrEmpty(x.TrashId)); + } return HasTrashIds(profile.Ignored) ||