From e65d0b4effdbbcc9393c58075c010f59231fd45e Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 13 Feb 2022 19:19:31 +0100
Subject: Make manga images pages less error prone

---
 src/plugins/MangaGeneric.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/plugins/MangaGeneric.cpp')

diff --git a/src/plugins/MangaGeneric.cpp b/src/plugins/MangaGeneric.cpp
index 609dab9..47fbf08 100644
--- a/src/plugins/MangaGeneric.cpp
+++ b/src/plugins/MangaGeneric.cpp
@@ -423,7 +423,7 @@ namespace QuickMedia {
         return true;
     }
 
-    ImageResult MangaGenericImagesPage::get_number_of_images(int &num_images) {
+    ImageResult MangaGenericImagesPage::update_image_urls(int &num_images) {
         num_images = 0;
         switch(list_page_query->type) {
             case ListPageQueryType::IMAGES: {
@@ -442,11 +442,6 @@ namespace QuickMedia {
                     return ImageResult::ERR;
                 }
 
-                if(chapter_num_pages != -1) {
-                    num_images = chapter_num_pages;
-                    return ImageResult::OK;
-                }
-
                 current_image_url.clear();
                 next_page_url.clear();
 
@@ -535,8 +530,6 @@ namespace QuickMedia {
     ImageResult MangaGenericImagesPage::for_each_page_in_chapter(PageCallback callback) {
         switch(list_page_query->type) {
             case ListPageQueryType::IMAGES: {
-                ImageResult result = get_page_image_urls();
-                if(result != ImageResult::OK) return result;
                 for(const std::string &url : chapter_image_urls) {
                     if(!callback(url))
                         break;
@@ -552,14 +545,10 @@ namespace QuickMedia {
                     return ImageResult::ERR;
                 }
 
-                int num_images = 0;
-                ImageResult result = get_number_of_images(num_images);
-                if(result != ImageResult::OK) return result;
-
                 if(!callback(current_image_url))
                     return ImageResult::OK;
 
-                for(int i = 0; i < num_images; ++i) {
+                for(int i = 0; i < chapter_num_pages; ++i) {
                     std::string full_url = url + next_page_url;
                     current_image_url.clear();
                     next_page_url.clear();
@@ -609,8 +598,6 @@ namespace QuickMedia {
                 return ImageResult::OK;
             }
             case ListPageQueryType::CUSTOM: {
-                ImageResult result = get_page_image_urls();
-                if(result != ImageResult::OK) return result;
                 for(const std::string &url : chapter_image_urls) {
                     if(!callback(url))
                         break;
@@ -622,9 +609,6 @@ namespace QuickMedia {
     }
 
     ImageResult MangaGenericImagesPage::get_page_image_urls() {
-        if(!chapter_image_urls.empty())
-            return ImageResult::OK;
-
         std::vector<CommandArg> args;
         if(!website_url.empty())
             args.push_back({ "-H", "referer: " + website_url });
-- 
cgit v1.2.3