From e65d0b4effdbbcc9393c58075c010f59231fd45e Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 13 Feb 2022 19:19:31 +0100 Subject: Make manga images pages less error prone --- src/plugins/Mangadex.cpp | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'src/plugins/Mangadex.cpp') diff --git a/src/plugins/Mangadex.cpp b/src/plugins/Mangadex.cpp index 3b6b2e0..6aa73b0 100644 --- a/src/plugins/Mangadex.cpp +++ b/src/plugins/Mangadex.cpp @@ -415,27 +415,8 @@ namespace QuickMedia { return true; } - ImageResult MangadexImagesPage::get_number_of_images(int &num_images) { + ImageResult MangadexImagesPage::update_image_urls(int &num_images) { num_images = 0; - ImageResult image_result = get_image_urls_for_chapter(url); - if(image_result != ImageResult::OK) return image_result; - num_images = chapter_image_urls.size(); - return ImageResult::OK; - } - - ImageResult MangadexImagesPage::for_each_page_in_chapter(PageCallback callback) { - ImageResult image_result = get_image_urls_for_chapter(url); - if(image_result != ImageResult::OK) return image_result; - for(const std::string &url : chapter_image_urls) { - if(!callback(url)) - break; - } - return ImageResult::OK; - } - - ImageResult MangadexImagesPage::get_image_urls_for_chapter(const std::string &url) { - if(!chapter_image_urls.empty()) - return ImageResult::OK; Json::Value json_root; // TODO: If this fails, call this again to retrieve another server. Also do the same for automedia @@ -476,6 +457,15 @@ namespace QuickMedia { chapter_image_urls.push_back(base_url + "data/" + hash_str + "/" + data_item_json.asString()); } + num_images = chapter_image_urls.size(); + return ImageResult::OK; + } + + ImageResult MangadexImagesPage::for_each_page_in_chapter(PageCallback callback) { + for(const std::string &url : chapter_image_urls) { + if(!callback(url)) + break; + } return ImageResult::OK; } } -- cgit v1.2.3