Merge pull request #6 from squashili/master

Added basic paging (next/previous page)
ImoutoChan · Jan 29, 2025 · 7a2c7f6 · 7a2c7f6
2 parents a74b657 + a677c9d
commit 7a2c7f6
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 16 deletions.
diff --git a/Imouto.BooruParser/Api.cs b/Imouto.BooruParser/Api.cs
@@ -36,6 +36,8 @@ public interface IBooruApiLoader
     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);
 
@@ -58,7 +60,7 @@ public interface IBooruApiAccessor
 /// <param name="Page">For danbooru: b{lowest-history-id-on-current-page}</param>
 public record SearchToken(string Page);
 
-public record SearchResult(IReadOnlyCollection<PostPreview> Results);
+public record SearchResult(IReadOnlyCollection<PostPreview> Results, string SearchTags, int PageNumber);
 
 public record HistorySearchResult<T>(
     IReadOnlyCollection<T> Results,

diff --git a/Imouto.BooruParser/Implementations/Danbooru/DanbooruApiLoader.cs b/Imouto.BooruParser/Implementations/Danbooru/DanbooruApiLoader.cs
@@ -83,13 +83,44 @@ public async Task<SearchResult> SearchAsync(string tags)
     {
         var posts = await _flurlClient.Request("posts.json")
             .SetQueryParam("tags", tags)
+            .SetQueryParam("page", 1)
             .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());
+            .ToList(),tags, 1);
+    }
+    public async Task<SearchResult> GetNextPageAsync(SearchResult results)
+    {
+        var posts = await _flurlClient.Request("posts.json")
+            .SetQueryParam("tags", results.SearchTags)
+            .SetQueryParam("page", results.PageNumber + 1)
+            .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);
+    }
+
+    public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
+    {
+        if (results.PageNumber <= 1)
+            throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
+
+        var posts = await _flurlClient.Request("posts.json")
+            .SetQueryParam("tags", results.SearchTags)
+            .SetQueryParam("page", results.PageNumber - 1)
+            .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);
     }
 
     public async Task<SearchResult> GetPopularPostsAsync(PopularType type)
@@ -111,7 +142,7 @@ public async Task<SearchResult> GetPopularPostsAsync(PopularType type)
 
         return new SearchResult(posts
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.TagString, x.IsBanned, x.IsDeleted))
-            .ToList());
+            .ToList(),"popular",1);
     }
 
     public async Task<HistorySearchResult<TagHistoryEntry>> GetTagHistoryPageAsync(

diff --git a/Imouto.BooruParser/Implementations/Gelbooru/GelbooruApiLoader.cs b/Imouto.BooruParser/Implementations/Gelbooru/GelbooruApiLoader.cs
@@ -5,6 +5,7 @@
 using Flurl.Http.Configuration;
 using HtmlAgilityPack;
 using Imouto.BooruParser.Extensions;
+using Imouto.BooruParser.Implementations.Danbooru;
 using Microsoft.Extensions.Options;
 
 namespace Imouto.BooruParser.Implementations.Gelbooru;
@@ -81,15 +82,65 @@ public async Task<SearchResult> SearchAsync(string tags)
     {
         // https://gelbooru.com/index.php?page=dapi&s=post&q=index&json=1&limit=20&tags=1girl
         var postJson = await _flurlClient.Request("index.php")
-            .SetQueryParams(new
-            {
-                page = "dapi", s = "post", q = "index", json = 1, limit = 20, tags = tags
-            })
+            .SetQueryParam("page", "dapi")
+            .SetQueryParam("s", "post")
+            .SetQueryParam("q", "index")
+            .SetQueryParam("json", 1)
+            .SetQueryParam("limit", 20)
+            .SetQueryParam("tags", tags)
+            .SetQueryParam("pid", 0)
             .GetJsonAsync<GelbooruPostPage>();
 
         return new SearchResult(postJson.Posts?
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.Tags, false, false))
-            .ToArray() ?? Array.Empty<PostPreview>());
+            .ToArray() ?? Array.Empty<PostPreview>(), tags, 0);
+    }
+
+    public async Task<SearchResult> GetNextPageAsync(SearchResult results)
+    {
+        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)
+            .GetJsonAsync<GelbooruPostPage>();
+
+        return new SearchResult(postJson.Posts?
+            .Select(x => new PostPreview(
+                x.Id.ToString(),
+                x.Md5,
+                x.Tags,
+                false,
+                false))
+            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber + 1);
+    }
+
+    public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
+    {
+        if (results.PageNumber <= 0)
+            throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
+
+        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)
+            .GetJsonAsync<GelbooruPostPage>();
+
+        return new SearchResult(postJson.Posts?
+            .Select(x => new PostPreview(
+                x.Id.ToString(),
+                x.Md5,
+                x.Tags,
+                false,
+                false))
+            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber - 1);
     }
 
     public Task<SearchResult> GetPopularPostsAsync(PopularType type)

diff --git a/Imouto.BooruParser/Implementations/Rule34/Rule34ApiLoader.cs b/Imouto.BooruParser/Implementations/Rule34/Rule34ApiLoader.cs
@@ -3,6 +3,7 @@
 using Flurl.Http.Configuration;
 using HtmlAgilityPack;
 using Imouto.BooruParser.Extensions;
+using Imouto.BooruParser.Implementations.Gelbooru;
 using Microsoft.Extensions.Options;
 
 namespace Imouto.BooruParser.Implementations.Rule34;
@@ -107,17 +108,66 @@ public async Task<SearchResult> SearchAsync(string tags)
     {
         // https://api.rule34.xxx/index.php?page=dapi&s=post&q=index&json=1&tags=1girl
         var postJson = await _flurlJsonClient.Request("index.php")
-            .SetQueryParams(new
-            {
-                page = "dapi", s = "post", q = "index", json = 1, limit = 20, tags = tags
-            })
+            .SetQueryParam("page", "dapi")
+            .SetQueryParam("s", "post")
+            .SetQueryParam("q", "index")
+            .SetQueryParam("json", 1)
+            .SetQueryParam("limit", 20)
+            .SetQueryParam("tags", tags)
+            .SetQueryParam("pid", 0)
             .GetJsonAsync<Rule34Post[]>();
 
         return new SearchResult(postJson?
             .Select(x => new PostPreview(x.Id.ToString(), x.Hash, x.Tags, false, false))
-            .ToArray() ?? Array.Empty<PostPreview>());
+            .ToArray() ?? Array.Empty<PostPreview>(), tags, 0);
     }
 
+    public async Task<SearchResult> GetNextPageAsync(SearchResult results)
+    {
+        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)
+            .GetJsonAsync<Rule34Post[]>();
+
+        return new SearchResult(postJson?
+            .Select(x => new PostPreview(
+                x.Id.ToString(),
+                x.Hash,
+                x.Tags,
+                false,
+                false))
+            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber + 1);
+    }
+
+    public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
+    {
+        if (results.PageNumber <= 0)
+            throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
+
+        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)
+            .GetJsonAsync<Rule34Post[]>();
+
+        return new SearchResult(postJson?
+            .Select(x => new PostPreview(
+                x.Id.ToString(),
+                x.Hash,
+                x.Tags,
+                false,
+                false))
+            .ToArray() ?? Array.Empty<PostPreview>(), results.SearchTags, results.PageNumber - 1);
+    }
     public Task<SearchResult> GetPopularPostsAsync(PopularType type)
         => throw new NotSupportedException("Rule34 does not support popularity charts");
 

diff --git a/Imouto.BooruParser/Implementations/Sankaku/SankakuApiLoader.cs b/Imouto.BooruParser/Implementations/Sankaku/SankakuApiLoader.cs
@@ -121,6 +121,7 @@ public async Task<SearchResult> SearchAsync(string tags)
     {
         var posts = await _flurlClient.Request("posts")
             .SetQueryParam("tags", tags)
+            .SetQueryParam("page", 1)
             .GetJsonAsync<IReadOnlyCollection<SankakuPost>>();
 
         return new SearchResult(posts
@@ -130,7 +131,44 @@ public async Task<SearchResult> SearchAsync(string tags)
                 string.Join(" ", x.Tags.Select(y => y.TagName)), 
                 false,
                 false))
-            .ToList());
+            .ToList(), tags, 1);
+    }
+
+    public async Task<SearchResult> GetNextPageAsync(SearchResult results)
+    {
+        var posts = await _flurlClient.Request("posts")
+            .SetQueryParam("tags", results.SearchTags)
+            .SetQueryParam("page", results.PageNumber+1)
+            .GetJsonAsync<IReadOnlyCollection<SankakuPost>>();
+
+        return new SearchResult(posts
+            .Select(x => new PostPreview(
+                x.Id,
+                x.Md5,
+                string.Join(" ", x.Tags.Select(y => y.TagName)),
+                false,
+                false))
+            .ToList(), results.SearchTags, results.PageNumber+1);
+    }
+
+    public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
+    {
+        if (results.PageNumber <= 1)
+            throw new ArgumentOutOfRangeException("PageNumber",results.PageNumber,null);
+
+        var posts = await _flurlClient.Request("posts")
+            .SetQueryParam("tags", results.SearchTags)
+            .SetQueryParam("page", results.PageNumber - 1)
+            .GetJsonAsync<IReadOnlyCollection<SankakuPost>>();
+
+        return new SearchResult(posts
+            .Select(x => new PostPreview(
+                x.Id,
+                x.Md5,
+                string.Join(" ", x.Tags.Select(y => y.TagName)),
+                false,
+                false))
+            .ToList(), results.SearchTags, results.PageNumber - 1);
     }
 
     public Task<SearchResult> GetPopularPostsAsync(PopularType type)

diff --git a/Imouto.BooruParser/Implementations/Yandere/YandereApiLoader.cs b/Imouto.BooruParser/Implementations/Yandere/YandereApiLoader.cs
@@ -5,6 +5,7 @@
 using Flurl.Http.Configuration;
 using HtmlAgilityPack;
 using Imouto.BooruParser.Extensions;
+using Imouto.BooruParser.Implementations.Rule34;
 using Microsoft.Extensions.Options;
 
 namespace Imouto.BooruParser.Implementations.Yandere;
@@ -75,8 +76,48 @@ public async Task<SearchResult> SearchAsync(string tags)
 
         return new SearchResult(posts
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.Tags, false, false))
-            .ToList());
+            .ToList(), tags, 1);
     }
+    public async Task<SearchResult> GetNextPageAsync(SearchResult results)
+    {
+
+        var posts = await _flurlClient.Request("post.json")
+            .SetQueryParam("tags", results.SearchTags)
+            .SetQueryParam("page", results.PageNumber + 1)
+            .GetJsonAsync<IReadOnlyCollection<YanderePost>>();
+
+        return new SearchResult(posts
+            .Select(x => new PostPreview(
+                x.Id.ToString(), 
+                x.Md5, 
+                x.Tags,
+                false,
+                false))
+            .ToList(), results.SearchTags, results.PageNumber + 1);
+
+    }
+    public async Task<SearchResult> GetPreviousPageAsync(SearchResult results)
+    {
+        if (results.PageNumber <= 1)
+            throw new ArgumentOutOfRangeException("PageNumber", results.PageNumber, null);
+
+
+        var posts = await _flurlClient.Request("post.json")
+            .SetQueryParam("tags", results.SearchTags)
+            .SetQueryParam("page", results.PageNumber - 1)
+            .GetJsonAsync<IReadOnlyCollection<YanderePost>>();
+
+        return new SearchResult(posts
+            .Select(x => new PostPreview(
+                x.Id.ToString(),
+                x.Md5,
+                x.Tags,
+                false,
+                false))
+            .ToList(), results.SearchTags, results.PageNumber - 1);
+
+    }
+
 
     public async Task<SearchResult> GetPopularPostsAsync(PopularType type)
     {
@@ -95,9 +136,10 @@ public async Task<SearchResult> GetPopularPostsAsync(PopularType type)
 
         return new SearchResult(posts
             .Select(x => new PostPreview(x.Id.ToString(), x.Md5, x.Tags, false, false))
-            .ToList());
+            .ToList(), "popular", 1);
     }
 
+
     public async Task<HistorySearchResult<TagHistoryEntry>> GetTagHistoryPageAsync(
         SearchToken? token,
         int limit = 100,