Add search navigation tests

ImoutoChan · Jan 29, 2025 · 82103b7 · 82103b7
1 parent 7a2c7f6
commit 82103b7
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 41 deletions.
diff --git a/Imouto.BooruParser.Tests/Loaders/DanbooruLoaderTests.cs b/Imouto.BooruParser.Tests/Loaders/DanbooruLoaderTests.cs
@@ -111,7 +111,25 @@ public async Task ShouldFind()
             var searchResult = await loader.SearchAsync("1girl");
             searchResult.Results.Should().NotBeEmpty();
         }
-
+
+        [Fact]
+        public async Task ShouldNavigateSearch()
+        {
+            var loader = _loaderFixture.GetLoaderWithoutAuth();
+
+            var searchResult = await loader.SearchAsync("1girl");
+            searchResult.Results.Should().NotBeEmpty();
+            searchResult.PageNumber.Should().Be(1);
+
+            var searchResultNext = await loader.GetNextPageAsync(searchResult);
+            searchResultNext.Results.Should().NotBeEmpty();
+            searchResultNext.PageNumber.Should().Be(2);
+
+            var searchResultPrev = await loader.GetPreviousPageAsync(searchResultNext);
+            searchResultPrev.Results.Should().NotBeEmpty();
+            searchResultPrev.PageNumber.Should().Be(1);
+        }
+
         [Fact]
         public async Task ShouldFindMd5OfBannedPost()
         {

diff --git a/Imouto.BooruParser.Tests/Loaders/GelbooruLoaderTests.cs b/Imouto.BooruParser.Tests/Loaders/GelbooruLoaderTests.cs
@@ -133,6 +133,24 @@ public async Task SearchAsyncShouldFind()
                 post.Tags.Select(x => x.Name).Should().Contain("no bra");
             }
         }
+
+        [Fact]
+        public async Task ShouldNavigateSearch()
+        {
+            var loader = _loaderFixture.GetLoader();
+
+            var searchResult = await loader.SearchAsync("no_bra");
+            searchResult.Results.Should().NotBeEmpty();
+            searchResult.PageNumber.Should().Be(0);
+
+            var searchResultNext = await loader.GetNextPageAsync(searchResult);
+            searchResultNext.Results.Should().NotBeEmpty();
+            searchResultNext.PageNumber.Should().Be(1);
+
+            var searchResultPrev = await loader.GetPreviousPageAsync(searchResultNext);
+            searchResultPrev.Results.Should().NotBeEmpty();
+            searchResultPrev.PageNumber.Should().Be(0);
+        }
     }
 
     public class GetPostMetadataMethod : GelbooruLoaderTests

diff --git a/Imouto.BooruParser.Tests/Loaders/Rule34LoaderTests.cs b/Imouto.BooruParser.Tests/Loaders/Rule34LoaderTests.cs
@@ -113,6 +113,24 @@ public async Task SearchAsyncShouldFind()
                 post.Tags.Select(x => x.Name).Should().Contain("no bra");
             }
         }
+
+        [Fact]
+        public async Task ShouldNavigateSearch()
+        {
+            var loader = _loaderFixture.GetLoader();
+
+            var searchResult = await loader.SearchAsync("no_bra");
+            searchResult.Results.Should().NotBeEmpty();
+            searchResult.PageNumber.Should().Be(0);
+
+            var searchResultNext = await loader.GetNextPageAsync(searchResult);
+            searchResultNext.Results.Should().NotBeEmpty();
+            searchResultNext.PageNumber.Should().Be(1);
+
+            var searchResultPrev = await loader.GetPreviousPageAsync(searchResultNext);
+            searchResultPrev.Results.Should().NotBeEmpty();
+            searchResultPrev.PageNumber.Should().Be(0);
+        }
     }
 
     public class GetPostMetadataMethod : Rule34LoaderTests

diff --git a/Imouto.BooruParser.Tests/Loaders/SankakuLoaderTests.cs b/Imouto.BooruParser.Tests/Loaders/SankakuLoaderTests.cs
@@ -198,6 +198,24 @@ public async Task ShouldFindWithMultipleTags()
             result.Results.Should().NotBeEmpty();
             result.Results.Should().HaveCountGreaterThan(1);
         }
+
+        [Fact]
+        public async Task ShouldNavigateSearch()
+        {
+            var loader = _loaderFixture.GetLoaderWithoutAuth();
+
+            var searchResult = await loader.SearchAsync("1girl");
+            searchResult.Results.Should().NotBeEmpty();
+            searchResult.PageNumber.Should().Be(1);
+
+            var searchResultNext = await loader.GetNextPageAsync(searchResult);
+            searchResultNext.Results.Should().NotBeEmpty();
+            searchResultNext.PageNumber.Should().Be(2);
+
+            var searchResultPrev = await loader.GetPreviousPageAsync(searchResultNext);
+            searchResultPrev.Results.Should().NotBeEmpty();
+            searchResultPrev.PageNumber.Should().Be(1);
+        }
     }
 
     public class LoadNotesHistoryAsyncMethod : SankakuLoaderTests

diff --git a/Imouto.BooruParser.Tests/Loaders/YandereLoaderTests.cs b/Imouto.BooruParser.Tests/Loaders/YandereLoaderTests.cs
@@ -117,6 +117,24 @@ public async Task ShouldFind()
                 post.Tags.Select(x => x.Name).Should().Contain("no bra");
             }
         }
+
+        [Fact]
+        public async Task ShouldNavigateSearch()
+        {
+            var loader = _loaderFixture.GetLoader();
+
+            var searchResult = await loader.SearchAsync("no_bra");
+            searchResult.Results.Should().NotBeEmpty();
+            searchResult.PageNumber.Should().Be(1);
+
+            var searchResultNext = await loader.GetNextPageAsync(searchResult);
+            searchResultNext.Results.Should().NotBeEmpty();
+            searchResultNext.PageNumber.Should().Be(2);
+
+            var searchResultPrev = await loader.GetPreviousPageAsync(searchResultNext);
+            searchResultPrev.Results.Should().NotBeEmpty();
+            searchResultPrev.PageNumber.Should().Be(1);
+        }
     }
 
     public class LoadNotesHistoryAsyncMethod : YandereLoaderTests

diff --git a/Imouto.BooruParser/Api.cs b/Imouto.BooruParser/Api.cs
@@ -32,11 +32,13 @@ public static int GetIntId(this PostIdentity postIdentity)
 public interface IBooruApiLoader
 {
     Task<Post> GetPostAsync(string postId);
-    
+
     Task<Post?> GetPostByMd5Async(string md5);
 
     Task<SearchResult> SearchAsync(string tags);
+
     Task<SearchResult> GetNextPageAsync(SearchResult results);
+
     Task<SearchResult> GetPreviousPageAsync(SearchResult results);
 
     Task<SearchResult> GetPopularPostsAsync(PopularType type);

diff --git a/Imouto.BooruParser/Implementations/Danbooru/DanbooruApiLoader.cs b/Imouto.BooruParser/Implementations/Danbooru/DanbooruApiLoader.cs
@@ -92,35 +92,40 @@ public async Task<SearchResult> SearchAsync(string tags)
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.TagString, x.IsBanned, x.IsDeleted))
             .ToList(),tags, 1);
     }
+
     public async Task<SearchResult> GetNextPageAsync(SearchResult results)
     {
+        var nextPage = results.PageNumber + 1;
+
         var posts = await _flurlClient.Request("posts.json")
             .SetQueryParam("tags", results.SearchTags)
-            .SetQueryParam("page", results.PageNumber + 1)
+            .SetQueryParam("page", nextPage)
             .SetQueryParam("only", "id,md5,tag_string,is_banned,is_deleted")
             .WithUserAgent(_botUserAgent)
             .GetJsonAsync<IReadOnlyCollection<DanbooruPostPreview>>();
 
         return new SearchResult(posts
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.TagString, x.IsBanned, x.IsDeleted))
-            .ToList(), results.SearchTags, results.PageNumber + 1);
+            .ToList(), results.SearchTags, nextPage);
     }
 
     public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
     {
         if (results.PageNumber <= 1)
             throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
 
+        var nextPage = results.PageNumber - 1;
+
         var posts = await _flurlClient.Request("posts.json")
             .SetQueryParam("tags", results.SearchTags)
-            .SetQueryParam("page", results.PageNumber - 1)
+            .SetQueryParam("page", nextPage)
             .SetQueryParam("only", "id,md5,tag_string,is_banned,is_deleted")
             .WithUserAgent(_botUserAgent)
             .GetJsonAsync<IReadOnlyCollection<DanbooruPostPreview>>();
 
         return new SearchResult(posts
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.TagString, x.IsBanned, x.IsDeleted))
-            .ToList(), results.SearchTags, results.PageNumber + 1);
+            .ToList(), results.SearchTags, nextPage);
     }
 
     public async Task<SearchResult> GetPopularPostsAsync(PopularType type)

diff --git a/Imouto.BooruParser/Implementations/Gelbooru/GelbooruApiLoader.cs b/Imouto.BooruParser/Implementations/Gelbooru/GelbooruApiLoader.cs
@@ -93,19 +93,21 @@ public async Task<SearchResult> SearchAsync(string tags)
 
         return new SearchResult(postJson.Posts?
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.Tags, false, false))
-            .ToArray() ?? Array.Empty<PostPreview>(), tags, 0);
+            .ToArray() ?? [], tags, 0);
     }
 
     public async Task<SearchResult> GetNextPageAsync(SearchResult results)
     {
+        var nextPage = results.PageNumber + 1;
+
         var postJson = await _flurlClient.Request("index.php")
             .SetQueryParam("page", "dapi")
             .SetQueryParam("s", "post")
             .SetQueryParam("q", "index")
             .SetQueryParam("json", 1)
             .SetQueryParam("limit", 20)
             .SetQueryParam("tags", results.SearchTags)
-            .SetQueryParam("pid", results.PageNumber + 1)
+            .SetQueryParam("pid", nextPage)
             .GetJsonAsync<GelbooruPostPage>();
 
         return new SearchResult(postJson.Posts?
@@ -115,22 +117,24 @@ public async Task<SearchResult> GetNextPageAsync(SearchResult results)
                 x.Tags,
                 false,
                 false))
-            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber + 1);
+            .ToArray() ?? [], results.SearchTags, nextPage);
     }
 
     public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
     {
         if (results.PageNumber <= 0)
             throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
 
+        var nextPage = results.PageNumber - 1;
+
         var postJson = await _flurlClient.Request("index.php")
             .SetQueryParam("page", "dapi")
             .SetQueryParam("s", "post")
             .SetQueryParam("q", "index")
             .SetQueryParam("json", 1)
             .SetQueryParam("limit", 20)
             .SetQueryParam("tags", results.SearchTags)
-            .SetQueryParam("pid", results.PageNumber - 1)
+            .SetQueryParam("pid", nextPage)
             .GetJsonAsync<GelbooruPostPage>();
 
         return new SearchResult(postJson.Posts?
@@ -140,7 +144,7 @@ public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
                 x.Tags,
                 false,
                 false))
-            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber - 1);
+            .ToArray() ?? [], results.SearchTags, nextPage);
     }
 
     public Task<SearchResult> GetPopularPostsAsync(PopularType type)
@@ -167,12 +171,12 @@ public Task<HistorySearchResult<NoteHistoryEntry>> GetNoteHistoryPageAsync(
     /// <remarks>
     /// Haven't found any post with them
     /// </remarks>
-    private static IReadOnlyCollection<PostIdentity> GetChildren() => Array.Empty<PostIdentity>();
+    private static IReadOnlyCollection<PostIdentity> GetChildren() => [];
 
     private static IReadOnlyCollection<Note> GetNotes(GelbooruPost? post, HtmlDocument postHtml)
     {
         if (post?.HasNotes == "false")
-            return Array.Empty<Note>();
+            return [];
 
         var notes = postHtml.DocumentNode
             .SelectNodes(@"//*[@id='notes']/article")
@@ -190,7 +194,7 @@ private static IReadOnlyCollection<Note> GetNotes(GelbooruPost? post, HtmlDocume
                 var text = note.InnerText;
 
                 return new Note(id.ToString(), text, point, size);
-            }) ?? Enumerable.Empty<Note>();
+            }) ?? [];
 
         return notes.ToList();
 
@@ -269,10 +273,10 @@ private static Post CreatePost(GelbooruPost post, HtmlDocument postHtml)
             -1,
             GetRating(post.Rating),
             GetRatingSafeLevel(post.Rating),
-            Array.Empty<int>(),
+            [],
             GetParent(post),
             GetChildren(),
-            Array.Empty<Pool>(),
+            [],
             GetTags(postHtml),
             GetNotes(post, postHtml));
 
@@ -314,10 +318,10 @@ private static Post CreatePost(GelbooruPost post, HtmlDocument postHtml)
             -1,
             GetRating(rating),
             GetRatingSafeLevel(rating),
-            Array.Empty<int>(),
+            [],
             null,
             GetChildren(),
-            Array.Empty<Pool>(),
+            [],
             GetTags(postHtml),
             GetNotes(null, postHtml));
     }

diff --git a/Imouto.BooruParser/Implementations/Rule34/Rule34ApiLoader.cs b/Imouto.BooruParser/Implementations/Rule34/Rule34ApiLoader.cs
@@ -119,19 +119,21 @@ public async Task<SearchResult> SearchAsync(string tags)
 
         return new SearchResult(postJson?
             .Select(x => new PostPreview(x.Id.ToString(), x.Hash, x.Tags, false, false))
-            .ToArray() ?? Array.Empty<PostPreview>(), tags, 0);
+            .ToArray() ?? [], tags, 0);
     }
 
     public async Task<SearchResult> GetNextPageAsync(SearchResult results)
     {
+        var nextPage = results.PageNumber + 1;
+
         var postJson = await _flurlJsonClient.Request("index.php")
             .SetQueryParam("page", "dapi")
             .SetQueryParam("s", "post")
             .SetQueryParam("q", "index")
             .SetQueryParam("json", 1)
             .SetQueryParam("limit", 20)
             .SetQueryParam("tags", results.SearchTags)
-            .SetQueryParam("pid", results.PageNumber + 1)
+            .SetQueryParam("pid", nextPage)
             .GetJsonAsync<Rule34Post[]>();
 
         return new SearchResult(postJson?
@@ -141,22 +143,24 @@ public async Task<SearchResult> GetNextPageAsync(SearchResult results)
                 x.Tags,
                 false,
                 false))
-            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber + 1);
+            .ToArray() ?? [], results.SearchTags, nextPage);
     }
 
     public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
     {
         if (results.PageNumber <= 0)
             throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
 
+        var nextPage = results.PageNumber - 1;
+
         var postJson = await _flurlJsonClient.Request("index.php")
             .SetQueryParam("page", "dapi")
             .SetQueryParam("s", "post")
             .SetQueryParam("q", "index")
             .SetQueryParam("json", 1)
             .SetQueryParam("limit", 20)
             .SetQueryParam("tags", results.SearchTags)
-            .SetQueryParam("pid", results.PageNumber - 1)
+            .SetQueryParam("pid", nextPage)
             .GetJsonAsync<Rule34Post[]>();
 
         return new SearchResult(postJson?
@@ -166,8 +170,9 @@ public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
                 x.Tags,
                 false,
                 false))
-            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber - 1);
+            .ToArray() ?? [], results.SearchTags, nextPage);
     }
+
     public Task<SearchResult> GetPopularPostsAsync(PopularType type)
         => throw new NotSupportedException("Rule34 does not support popularity charts");