From a448dd9b6ee4e3704ef9ef2e966aeb6422733ff6 Mon Sep 17 00:00:00 2001 From: blankie Date: Fri, 28 Apr 2023 16:00:21 +0700 Subject: [PATCH] Create a generic illusts pager --- routes/users/illustrations.cpp | 53 +------------------------------ servehelper.cpp | 57 ++++++++++++++++++++++++++++++++++ servehelper.h | 4 +++ 3 files changed, 62 insertions(+), 52 deletions(-) diff --git a/routes/users/illustrations.cpp b/routes/users/illustrations.cpp index 9050e97..d9bdf87 100644 --- a/routes/users/illustrations.cpp +++ b/routes/users/illustrations.cpp @@ -6,9 +6,6 @@ #include "../../pixivclient.h" #include "common.h" -static Element generate_pager(const Illusts& illusts, size_t page, bool first_selector); -static inline Element generate_content(const httplib::Request& req, const Config& config, const Illusts& illusts); - void user_illustrations_route(const httplib::Request& req, httplib::Response& res, const Config& config, PixivClient& pixiv_client) { uint64_t user_id = to_ull(req.matches[1].str()); uint64_t page = req.has_param("p") ? to_ull(req.get_param_value("p")) - 1 : 0; @@ -35,55 +32,7 @@ void user_illustrations_route(const httplib::Request& req, httplib::Response& re Element body("body", { generate_user_header(std::move(user), config), - generate_pager(illusts, page, true), - Element("br"), - generate_content(req, config, illusts), - generate_pager(illusts, page, false) + generate_illusts_pager(req, config, illusts, page, "illusts") }); serve(req, res, config, user.display_name + "'s illustrations", std::move(body)); } - -static Element generate_pager(const Illusts& illusts, size_t page, bool first_selector) { - auto link = [](size_t new_page, const char* text, bool add_link) { - using namespace std::string_literals; - - Element b("b"); - std::string href = "?p="s + std::to_string(new_page) + "#pageselector"; - - if (add_link) { - b.nodes.push_back(Element("a", {{"href", std::move(href)}}, {text})); - } else { - b.nodes.push_back(text); - } - return b; - }; - - Element div("div", {{"class", "center"}}, { - link(1, "First", page != 0), " ", - link(page, "Prev", page != 0), " ", - std::to_string(page + 1), "/", std::to_string(illusts.total_pages), " ", - link(page + 2, "Next", page + 1 < illusts.total_pages), " ", - link(illusts.total_pages, "Last", page + 1 < illusts.total_pages) - }); - if (first_selector) { - div.attributes.push_back({"id", "pageselector"}); - } - return div; -} - -static inline Element generate_content(const httplib::Request& req, const Config& config, const Illusts& illusts) { - Element div("div", {{"class", "grid"}}, {}); - - div.nodes.reserve(illusts.illusts.size()); - for (const Illust& i : illusts.illusts) { - std::string illust_url = get_origin(req, config) + "/artworks/" + std::to_string(i.illust_id); - std::string image_url = proxy_image_url(config, i.images[0].thumbnail_or_original(1)); - - div.nodes.push_back(Element("a", {{"href", {std::move(illust_url)}}}, { - Element("img", {{"loading", "lazy"}, {"src", std::move(image_url)}}, {}), - Element("p", {i.title}) - })); - } - - return div; -} diff --git a/servehelper.cpp b/servehelper.cpp index ccb5022..737f76a 100644 --- a/servehelper.cpp +++ b/servehelper.cpp @@ -1,8 +1,12 @@ #include #include "config.h" +#include "pixivmodels.h" #include "servehelper.h" +static Element generate_pager(const Illusts& illusts, size_t page, const char* id); +static inline Element generate_content(const httplib::Request& req, const Config& config, const Illusts& illusts); + void serve(const httplib::Request& req, httplib::Response& res, const Config& config, std::string title, Element element) { using namespace std::string_literals; @@ -55,6 +59,8 @@ void serve_redirect(const httplib::Request& req, httplib::Response& res, const C serve(req, res, config, "Redirecting to "s + std::move(url) + "…", std::move(body)); } + + std::string get_origin(const httplib::Request& req, const Config& config) { if (req.has_header("X-Canonical-Origin")) { return req.get_header_value("X-Canonical-Origin"); @@ -91,3 +97,54 @@ std::string proxy_image_url(const Config& config, blankie::murl::Url url) { } return proxy_url(config.image_proxy_url, std::move(url)); } + + + +Element generate_illusts_pager(const httplib::Request& req, const Config& config, const Illusts& illusts, size_t page, const char* id) { + return Element("div", {{"id", id}}, { + generate_pager(illusts, page, id), + Element("br"), + generate_content(req, config, illusts), + generate_pager(illusts, page, id) + }); +} + +static Element generate_pager(const Illusts& illusts, size_t page, const char* id) { + auto link = [&](size_t new_page, const char* text, bool add_link) { + using namespace std::string_literals; + + Element b("b"); + if (add_link) { + std::string href = "?p="s + std::to_string(new_page) + '#' + id; + b.nodes.push_back(Element("a", {{"href", std::move(href)}}, {text})); + } else { + b.nodes.push_back(text); + } + return b; + }; + + return Element("div", {{"class", "center"}}, { + link(1, "First", page != 0), " ", + link(page, "Prev", page != 0), " ", + std::to_string(page + 1), "/", std::to_string(illusts.total_pages), " ", + link(page + 2, "Next", page + 1 < illusts.total_pages), " ", + link(illusts.total_pages, "Last", page + 1 < illusts.total_pages) + }); +} + +static inline Element generate_content(const httplib::Request& req, const Config& config, const Illusts& illusts) { + Element div("div", {{"class", "grid"}}, {}); + + div.nodes.reserve(illusts.illusts.size()); + for (const Illust& i : illusts.illusts) { + std::string illust_url = get_origin(req, config) + "/artworks/" + std::to_string(i.illust_id); + std::string image_url = proxy_image_url(config, i.images[0].thumbnail_or_original(1)); + + div.nodes.push_back(Element("a", {{"href", {std::move(illust_url)}}}, { + Element("img", {{"loading", "lazy"}, {"src", std::move(image_url)}}, {}), + Element("p", {i.title}) + })); + } + + return div; +} diff --git a/servehelper.h b/servehelper.h index efc7a0d..07d2076 100644 --- a/servehelper.h +++ b/servehelper.h @@ -7,12 +7,16 @@ #include "blankie/serializer.h" struct Config; // forward declaration from config.h +struct Illusts; // forward declaration from pixivmodels.h using Element = blankie::html::Element; void serve(const httplib::Request& req, httplib::Response& res, const Config& config, std::string title, Element element); void serve_error(const httplib::Request& req, httplib::Response& res, const Config& config, std::string title, std::optional subtitle = std::nullopt, std::optional info = std::nullopt); void serve_redirect(const httplib::Request& req, httplib::Response& res, const Config& config, std::string url); + std::string get_origin(const httplib::Request& req, const Config& config); std::string proxy_url(blankie::murl::Url base, blankie::murl::Url url); std::string proxy_image_url(const Config& config, blankie::murl::Url url); + +Element generate_illusts_pager(const httplib::Request& req, const Config& config, const Illusts& illusts, size_t page, const char* id);