refactor: Solution-wide code cleanup

pull/201/head
Robert Dailey 1 year ago
parent 86eca33eb3
commit d66aa8ba44

@ -34,7 +34,10 @@ public class MigrateTrashYml : IMigrationStep
Description = $"Rename default YAML config from `{_oldConfigPath}` to `{_newConfigPath}`"; 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) public void Execute(IAnsiConsole? console)
{ {

@ -19,10 +19,23 @@ public static class CollectionExtensions
private sealed class ReadOnlyCollectionAdapter<T> : IReadOnlyCollection<T> private sealed class ReadOnlyCollectionAdapter<T> : IReadOnlyCollection<T>
{ {
private readonly ICollection<T> _source; private readonly ICollection<T> _source;
public ReadOnlyCollectionAdapter(ICollection<T> source) => _source = source;
public ReadOnlyCollectionAdapter(ICollection<T> source)
{
_source = source;
}
public int Count => _source.Count; public int Count => _source.Count;
public IEnumerator<T> GetEnumerator() => _source.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); public IEnumerator<T> GetEnumerator()
{
return _source.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
} }
public static void AddRange<T>(this ICollection<T> destination, IEnumerable<T> source) public static void AddRange<T>(this ICollection<T> destination, IEnumerable<T> source)

@ -6,7 +6,9 @@ namespace Recyclarr.TestLibrary;
public static partial class FileUtils public static partial class FileUtils
{ {
public static ICollection<string> NormalizePaths(IEnumerable<string> paths) public static ICollection<string> NormalizePaths(IEnumerable<string> paths)
=> paths.Select(NormalizePath).ToList(); {
return paths.Select(NormalizePath).ToList();
}
public static string NormalizePath(string path) public static string NormalizePath(string path)
{ {

@ -4,5 +4,8 @@ namespace Recyclarr.TestLibrary;
public static class StringUtils public static class StringUtils
{ {
public static string TrimmedString(string value) => value.TrimNewlines(); public static string TrimmedString(string value)
{
return value.TrimNewlines();
}
} }

@ -5,8 +5,12 @@ namespace Recyclarr.TrashLib.TestLibrary;
public static class CfTestUtils public static class CfTestUtils
{ {
public static QualityProfileCustomFormatScoreMapping NewMapping(params FormatMappingEntry[] entries) 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) public static QualityProfileCustomFormatScoreMapping NewMappingWithReset(params FormatMappingEntry[] entries)
=> new(true) {Mapping = entries.ToList()}; {
return new(true) {Mapping = entries.ToList()};
}
} }

@ -41,8 +41,15 @@ public class GuideProcessorTest
return parser.ParseCustomFormatData(ReadText(textFile), ""); return parser.ParseCustomFormatData(ReadText(textFile), "");
} }
public string ReadText(string textFile) => Data.ReadData(textFile); public string ReadText(string textFile)
public JObject ReadJson(string jsonFile) => JObject.Parse(ReadText(jsonFile)); {
return Data.ReadData(textFile);
}
public JObject ReadJson(string jsonFile)
{
return JObject.Parse(ReadText(jsonFile));
}
} }
[Test] [Test]

@ -24,18 +24,23 @@ public class LocalRepoSonarrGuideServiceTest
[Frozen] IRepoPaths repoPaths, [Frozen] IRepoPaths repoPaths,
LocalRepoSonarrGuideService sut) LocalRepoSonarrGuideService sut)
{ {
static ReleaseProfileData MakeMockObject(string term) => new() static ReleaseProfileData MakeMockObject(string term)
{ {
Name = "name", return new()
TrashId = "123",
Required = new TermData[]
{ {
new() {Term = term} Name = "name",
} TrashId = "123",
}; Required = new TermData[]
{
new() {Term = term}
}
};
}
static MockFileData MockFileData(dynamic obj) => static MockFileData MockFileData(dynamic obj)
new MockFileData(JsonConvert.SerializeObject(obj)); {
return new MockFileData(JsonConvert.SerializeObject(obj));
}
var mockData1 = MakeMockObject("first"); var mockData1 = MakeMockObject("first");
var mockData2 = MakeMockObject("second"); var mockData2 = MakeMockObject("second");

@ -7,7 +7,10 @@ public abstract class ServiceCapabilityChecker<T> where T : class
{ {
private readonly IObservable<T?> _capabilities; private readonly IObservable<T?> _capabilities;
public T? GetCapabilities() => _capabilities.Wait(); public T? GetCapabilities()
{
return _capabilities.Wait();
}
protected ServiceCapabilityChecker(IServiceInformation info) protected ServiceCapabilityChecker(IServiceInformation info)
{ {

@ -148,7 +148,9 @@ public class JsonTransactionStep : IJsonTransactionStep
} }
private static bool KeyMatch(JObject left, JObject right, string keyName) private static bool KeyMatch(JObject left, JObject right, string keyName)
=> left.Value<string>(keyName) == right.Value<string>(keyName); {
return left.Value<string>(keyName) == right.Value<string>(keyName);
}
private static void MergeProperties(JObject serviceCf, JObject guideCfJson, private static void MergeProperties(JObject serviceCf, JObject guideCfJson,
JTokenType exceptType = JTokenType.None) JTokenType exceptType = JTokenType.None)

@ -35,7 +35,10 @@ public class QualityItem
return builder.ToString(); return builder.ToString();
} }
public bool IsMinDifferent(decimal serviceValue) => serviceValue != Min; public bool IsMinDifferent(decimal serviceValue)
{
return serviceValue != Min;
}
public bool IsMaxDifferent(decimal? serviceValue) public bool IsMaxDifferent(decimal? serviceValue)
{ {

@ -21,7 +21,9 @@ public class LocalRepoRadarrGuideService : RadarrGuideService
} }
public override ICollection<QualitySizeData> GetQualities() public override ICollection<QualitySizeData> GetQualities()
=> _parser.GetQualities(_pathsFactory.Create().RadarrQualityPaths); {
return _parser.GetQualities(_pathsFactory.Create().RadarrQualityPaths);
}
public override ICollection<CustomFormatData> GetCustomFormatData() public override ICollection<CustomFormatData> GetCustomFormatData()
{ {

@ -17,6 +17,13 @@ public class RadarrGuideDataLister : IRadarrGuideDataLister
_guideLister = guideLister; _guideLister = guideLister;
} }
public void ListCustomFormats() => _guideLister.ListCustomFormats(_guide.GetCustomFormatData()); public void ListCustomFormats()
public void ListQualities() => _guideLister.ListQualities(_guide.GetQualities()); {
_guideLister.ListCustomFormats(_guide.GetCustomFormatData());
}
public void ListQualities()
{
_guideLister.ListQualities(_guide.GetQualities());
}
} }

@ -35,7 +35,9 @@ public class LocalRepoSonarrGuideService : SonarrGuideService
} }
public override ICollection<QualitySizeData> GetQualities() public override ICollection<QualitySizeData> GetQualities()
=> _parser.GetQualities(_pathsFactory.Create().SonarrQualityPaths); {
return _parser.GetQualities(_pathsFactory.Create().SonarrQualityPaths);
}
public override ICollection<CustomFormatData> GetCustomFormatData() public override ICollection<CustomFormatData> GetCustomFormatData()
{ {

@ -23,8 +23,15 @@ public class SonarrGuideDataLister : ISonarrGuideDataLister
_guideLister = guideLister; _guideLister = guideLister;
} }
public void ListCustomFormats() => _guideLister.ListCustomFormats(_guide.GetCustomFormatData()); public void ListCustomFormats()
public void ListQualities() => _guideLister.ListQualities(_guide.GetQualities()); {
_guideLister.ListCustomFormats(_guide.GetCustomFormatData());
}
public void ListQualities()
{
_guideLister.ListQualities(_guide.GetQualities());
}
public void ListReleaseProfiles() public void ListReleaseProfiles()
{ {
@ -42,8 +49,10 @@ public class SonarrGuideDataLister : ISonarrGuideDataLister
private static bool HasIdentifiableTerms(ReleaseProfileData profile) private static bool HasIdentifiableTerms(ReleaseProfileData profile)
{ {
static bool HasTrashIds(IEnumerable<TermData> terms) => static bool HasTrashIds(IEnumerable<TermData> terms)
terms.Any(x => !string.IsNullOrEmpty(x.TrashId)); {
return terms.Any(x => !string.IsNullOrEmpty(x.TrashId));
}
return return
HasTrashIds(profile.Ignored) || HasTrashIds(profile.Ignored) ||

Loading…
Cancel
Save