Skip to content

Commit

Permalink
refactor: Apply refactoring rules to code.
Browse files Browse the repository at this point in the history
  • Loading branch information
Starciad committed Jan 31, 2024
1 parent 47cd0bd commit c1ac5ae
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 20 deletions.
16 changes: 8 additions & 8 deletions src/R34Sharp.Tests/Posts/R34PostsTests.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down Expand Up @@ -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<Exception>(async () =>
_ = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
await _client.Posts.GetPostsAsync(new()
_ = await _client.Posts.GetPostsAsync(new()
{
Limit = 0,
Tags = tagsPrefab
});
});

await Assert.ThrowsAnyAsync<Exception>(async () =>
_ = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
await _client.Posts.GetPostsAsync(new()
_ = await _client.Posts.GetPostsAsync(new()
{
Limit = 1001,
Tags = tagsPrefab
Expand All @@ -80,9 +80,9 @@ await _client.Posts.GetPostsAsync(new()
[Fact]
public async Task Block_Requests_Without_Tags_Async()
{
await Assert.ThrowsAnyAsync<Exception>(async () =>
_ = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
await _client.Posts.GetPostsAsync(new()
_ = await _client.Posts.GetPostsAsync(new()
{
Limit = 0,
Tags = Array.Empty<R34FormattedTag>()
Expand Down
2 changes: 1 addition & 1 deletion src/R34Sharp/Components/R34CommentsComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public async Task<R34Comments> GetCommentsAsync(R34CommentsSearchBuilder searchB
urlBuilder.AddParameter("post_id", searchBuilder.PostId.ToString());

// Get Result
return await GetAsync<R34Comments>(urlBuilder.Build(), _commentsXmlSerializer);
return await GetAsync<R34Comments>(urlBuilder.Build(), this._commentsXmlSerializer);
}
}
}
2 changes: 1 addition & 1 deletion src/R34Sharp/Components/R34PostsComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task<R34Posts> GetPostsAsync(R34PostsSearchBuilder searchBuilder)
urlBuilder.AddParameter("id", searchBuilder.Id.Value.ToString());
}

R34Posts postsResult = await GetAsync<R34Posts>(urlBuilder.Build(), _postsXmlSerializer).ConfigureAwait(false);
R34Posts postsResult = await GetAsync<R34Posts>(urlBuilder.Build(), this._postsXmlSerializer).ConfigureAwait(false);

if (searchBuilder.BlockedTags.Length > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion src/R34Sharp/Components/R34TagsComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task<R34Tags> GetTagsAsync(R34TagsSearchBuilder searchBuilder)
break;
}

return await GetAsync<R34Tags>(urlBuilder.Build(), _tagsXmlSerializer);
return await GetAsync<R34Tags>(urlBuilder.Build(), this._tagsXmlSerializer);
}
}
}
2 changes: 1 addition & 1 deletion src/R34Sharp/Entities/Posts/R34Post.cs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public sealed class R34Post : R34Entity
/// </summary>
[XmlAttribute(AttributeName = "status")] public string Status { get; set; }

/// <inheritdoc/>
/// <inheritdoc/>
protected override async Task OnBuildAsync()
{
await SetFilesInfosAsync();
Expand Down
4 changes: 2 additions & 2 deletions src/R34Sharp/R34ApiClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
14 changes: 8 additions & 6 deletions src/R34Sharp/Url/UrlBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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();
Expand Down

0 comments on commit c1ac5ae

Please sign in to comment.