From c1ac5aee2daabf412d2db9eaa0cef28132fd2d09 Mon Sep 17 00:00:00 2001 From: Starciad Date: Wed, 31 Jan 2024 18:53:40 -0300 Subject: [PATCH] refactor: Apply refactoring rules to code. --- src/R34Sharp.Tests/Posts/R34PostsTests.cs | 16 ++++++++-------- src/R34Sharp/Components/R34CommentsComponent.cs | 2 +- src/R34Sharp/Components/R34PostsComponent.cs | 2 +- src/R34Sharp/Components/R34TagsComponent.cs | 2 +- src/R34Sharp/Entities/Posts/R34Post.cs | 2 +- src/R34Sharp/R34ApiClient.cs | 4 ++-- src/R34Sharp/Url/UrlBuilder.cs | 14 ++++++++------ 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/R34Sharp.Tests/Posts/R34PostsTests.cs b/src/R34Sharp.Tests/Posts/R34PostsTests.cs index b29f7f9..8bc0c6c 100644 --- a/src/R34Sharp.Tests/Posts/R34PostsTests.cs +++ b/src/R34Sharp.Tests/Posts/R34PostsTests.cs @@ -1,9 +1,9 @@ using R34Sharp.Entities.Posts; +using R34Sharp.Enums; using R34Sharp.Models; using R34Sharp.Search; -using R34Sharp.Enums; -namespace R34Sharp.Tests +namespace R34Sharp.Tests.Posts { public class R34PostsTests { @@ -58,18 +58,18 @@ public async Task Blocking_Posts_That_Contain_Certain_Tags_Async() [Fact] public async Task Block_Requests_Outside_The_Limit_Range_Async() { - await Assert.ThrowsAnyAsync(async () => + _ = await Assert.ThrowsAnyAsync(async () => { - await _client.Posts.GetPostsAsync(new() + _ = await _client.Posts.GetPostsAsync(new() { Limit = 0, Tags = tagsPrefab }); }); - await Assert.ThrowsAnyAsync(async () => + _ = await Assert.ThrowsAnyAsync(async () => { - await _client.Posts.GetPostsAsync(new() + _ = await _client.Posts.GetPostsAsync(new() { Limit = 1001, Tags = tagsPrefab @@ -80,9 +80,9 @@ await _client.Posts.GetPostsAsync(new() [Fact] public async Task Block_Requests_Without_Tags_Async() { - await Assert.ThrowsAnyAsync(async () => + _ = await Assert.ThrowsAnyAsync(async () => { - await _client.Posts.GetPostsAsync(new() + _ = await _client.Posts.GetPostsAsync(new() { Limit = 0, Tags = Array.Empty() diff --git a/src/R34Sharp/Components/R34CommentsComponent.cs b/src/R34Sharp/Components/R34CommentsComponent.cs index 1e4b196..ba5693a 100644 --- a/src/R34Sharp/Components/R34CommentsComponent.cs +++ b/src/R34Sharp/Components/R34CommentsComponent.cs @@ -30,7 +30,7 @@ public async Task GetCommentsAsync(R34CommentsSearchBuilder searchB urlBuilder.AddParameter("post_id", searchBuilder.PostId.ToString()); // Get Result - return await GetAsync(urlBuilder.Build(), _commentsXmlSerializer); + return await GetAsync(urlBuilder.Build(), this._commentsXmlSerializer); } } } diff --git a/src/R34Sharp/Components/R34PostsComponent.cs b/src/R34Sharp/Components/R34PostsComponent.cs index 4864962..8d706d7 100644 --- a/src/R34Sharp/Components/R34PostsComponent.cs +++ b/src/R34Sharp/Components/R34PostsComponent.cs @@ -47,7 +47,7 @@ public async Task GetPostsAsync(R34PostsSearchBuilder searchBuilder) urlBuilder.AddParameter("id", searchBuilder.Id.Value.ToString()); } - R34Posts postsResult = await GetAsync(urlBuilder.Build(), _postsXmlSerializer).ConfigureAwait(false); + R34Posts postsResult = await GetAsync(urlBuilder.Build(), this._postsXmlSerializer).ConfigureAwait(false); if (searchBuilder.BlockedTags.Length > 0) { diff --git a/src/R34Sharp/Components/R34TagsComponent.cs b/src/R34Sharp/Components/R34TagsComponent.cs index 6956f50..ec0e001 100644 --- a/src/R34Sharp/Components/R34TagsComponent.cs +++ b/src/R34Sharp/Components/R34TagsComponent.cs @@ -47,7 +47,7 @@ public async Task GetTagsAsync(R34TagsSearchBuilder searchBuilder) break; } - return await GetAsync(urlBuilder.Build(), _tagsXmlSerializer); + return await GetAsync(urlBuilder.Build(), this._tagsXmlSerializer); } } } diff --git a/src/R34Sharp/Entities/Posts/R34Post.cs b/src/R34Sharp/Entities/Posts/R34Post.cs index 070e9dc..7b6fff9 100644 --- a/src/R34Sharp/Entities/Posts/R34Post.cs +++ b/src/R34Sharp/Entities/Posts/R34Post.cs @@ -155,7 +155,7 @@ public sealed class R34Post : R34Entity /// [XmlAttribute(AttributeName = "status")] public string Status { get; set; } -/// + /// protected override async Task OnBuildAsync() { await SetFilesInfosAsync(); diff --git a/src/R34Sharp/R34ApiClient.cs b/src/R34Sharp/R34ApiClient.cs index bab2252..189340d 100644 --- a/src/R34Sharp/R34ApiClient.cs +++ b/src/R34Sharp/R34ApiClient.cs @@ -75,14 +75,14 @@ private void BuildClient() private void Dispose(bool disposing) { - if (!disposedValue) + if (!this.disposedValue) { if (disposing) { ((IDisposable)this.Client).Dispose(); } - disposedValue = true; + this.disposedValue = true; } } diff --git a/src/R34Sharp/Url/UrlBuilder.cs b/src/R34Sharp/Url/UrlBuilder.cs index 6e75c63..4f3b56d 100644 --- a/src/R34Sharp/Url/UrlBuilder.cs +++ b/src/R34Sharp/Url/UrlBuilder.cs @@ -10,12 +10,12 @@ internal sealed class UrlBuilder internal UrlBuilder(string address) { - BaseAddress = address; + this.BaseAddress = address; } internal void AddParameter(string name, string value) { - parameters.Add((name, value)); + this.parameters.Add((name, value)); } internal void Clear() @@ -26,15 +26,17 @@ internal void Clear() internal string Build() { StringBuilder addressBuilder = new(); - addressBuilder.Append($"{BaseAddress}?"); + _ = addressBuilder.Append($"{this.BaseAddress}?"); - for (int i = 0; i < parameters.Count; i++) + for (int i = 0; i < this.parameters.Count; i++) { - (string, string) parameter = parameters[i]; + (string, string) parameter = this.parameters[i]; _ = addressBuilder.Append($"{parameter.Item1.ToLower()}={parameter.Item2.ToLower()}"); - if (i < parameters.Count - 1) + if (i < this.parameters.Count - 1) + { _ = addressBuilder.Append('&'); + } } return addressBuilder.ToString();