From fc9d28bf8f8c9a73d7a25aa49c49e88b9bdb270e Mon Sep 17 00:00:00 2001
From: Arthur Williams <taaparthur@disroot.org>
Date: Sun, 3 Sep 2023 15:33:00 -0700
Subject: [PATCH] Revert "server: remove need_cloud_scraper"

This reverts commit 4a046cbb851b064f26123e296574170df97b576c.
---
 README.md                   |  2 +-
 amt/media_reader.py         |  4 ++--
 amt/server.py               | 10 ++++------
 amt/servers/crunchyroll.py  |  2 +-
 amt/servers/humblebundle.py |  2 +-
 amt/servers/mangasee.py     |  2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4bad7d5..0a837c9 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ Optional dependency breakdown
 * beautifulsoup4:      required to download images for JNovelClub (only for light novel parts)
 * beautifulsoup4:      required to enable DB multiverse, FreeWebNovel, Funimation, Nyaa, RemoteServer, Tubi and Webtoons
 * beautifulsoup4 :     required to search for Crunchyroll (manga)
-* cloudscraper:        required to enable searching/updating on MangaSee and HumbleBundle
+* cloudscraper:        required to enable MangaSee and HumbleBundle
 * cloudscraper:        potentially required to access all features of Crunchyroll (manga and anime)
 * m3u8 & pycryptodome: required just download media for Crunchyroll and HiDive (enables more formats for Funimation)
 
diff --git a/amt/media_reader.py b/amt/media_reader.py
index f9f85fa..c74cfd6 100644
--- a/amt/media_reader.py
+++ b/amt/media_reader.py
@@ -55,8 +55,8 @@ def __init__(self, state=None, server_list=SERVERS, tracker_list=TRACKERS):
                         if self.settings.is_server_enabled(instance.id, instance.alias, instance.official):
                             assert instance.id not in instance_map, f"Duplicate server id: {instance.id}"
                             instance_map[instance.id] = instance
-                except ImportError as e:
-                    logging.debug("Could not instantiate %s %s", cls, e)
+                except ImportError:
+                    logging.debug("Could not instantiate %s", cls)
 
         self.session.headers.update({
             "Connection": "keep-alive",
diff --git a/amt/server.py b/amt/server.py
index 6bc96d2..f87df68 100644
--- a/amt/server.py
+++ b/amt/server.py
@@ -34,6 +34,7 @@ class RequestServer:
     settings = None
 
     # If true a cloudscraper object should be given instead of a normal session
+    need_cloud_scraper = False
     maybe_need_cloud_scraper = False
     _normal_session = None  # the normal session in case a wrapper is used
     domain = None
@@ -42,7 +43,7 @@ class RequestServer:
     def __init__(self, session, settings=None):
         self.settings = settings
         self._normal_session = session
-        if self.settings.get_always_use_cloudscraper(self.id):
+        if self.settings.get_always_use_cloudscraper(self.id) or self.need_cloud_scraper:
             self.session = self.get_cloudscraper_session(session)
         else:
             self.session = session
@@ -114,7 +115,7 @@ def _request(self, post_request, url, force_cloud_scraper=False, start=0, need_a
             except SSLError:
                 if self.settings.get_fallback_to_insecure_connection(self.id) and kwargs.get("verify", True):
                     self.logger.warning("Retry request insecurely %s", url)
-                    if self.settings.get_always_use_cloudscraper(self.id) or force_cloud_scraper:   # pragma: no cover
+                    if self.settings.get_always_use_cloudscraper(self.id) or self.need_cloud_scraper:   # pragma: no cover
                         self.logger.warning("Using insecure connections and cloudscraper are not supported and may result in an error like 'ValueError: Cannot set verify_mode to CERT_NONE when check_hostname is enabled.'")
                     kwargs["verify"] = False
                     return self._request(post_request, url, **kwargs)
@@ -126,10 +127,7 @@ def _request(self, post_request, url, force_cloud_scraper=False, start=0, need_a
                 continue
         if self.maybe_need_cloud_scraper and not force_cloud_scraper and r.status_code in (403, 503):
             if session == self._normal_session:
-                try:
-                    return self._request(post_request, url, force_cloud_scraper=True, **kwargs)
-                except ImportError:
-                    pass
+                return self._request(post_request, url, force_cloud_scraper=True, **kwargs)
         r.raise_for_status()
         end = time.time()
 
diff --git a/amt/servers/crunchyroll.py b/amt/servers/crunchyroll.py
index 5284435..1f7e875 100644
--- a/amt/servers/crunchyroll.py
+++ b/amt/servers/crunchyroll.py
@@ -102,7 +102,7 @@ class CrunchyrollAnime(GenericCrunchyrollServer):
     id = "crunchyroll_anime"
     alias = "crunchyroll"
     media_type = MediaType.ANIME
-    maybe_need_cloud_scraper = True
+    need_cloud_scraper = True
 
     stream_url_regex = re.compile(r"crunchyroll.\w+/watch/(\w*)/.+")
     add_series_url_regex = re.compile(r"crunchyroll.\w+/series/(\w*)")
diff --git a/amt/servers/humblebundle.py b/amt/servers/humblebundle.py
index f09048c..8f65251 100644
--- a/amt/servers/humblebundle.py
+++ b/amt/servers/humblebundle.py
@@ -17,7 +17,7 @@ class HumbleBundle(Server):
     official = True
     has_free_chapters = False
     is_premium = True
-    maybe_need_cloud_scraper = True
+    need_cloud_scraper = True
 
     domain = "humblebundle.com"
     base_url = "https://www.humblebundle.com/home/library"
diff --git a/amt/servers/mangasee.py b/amt/servers/mangasee.py
index 5f3b905..73218a2 100644
--- a/amt/servers/mangasee.py
+++ b/amt/servers/mangasee.py
@@ -8,7 +8,7 @@
 class Mangasee(Server):
     id = "mangasee"
     official = False
-    maybe_need_cloud_scraper = True
+    need_cloud_scraper = True
 
     domain = "mangasee123.com"
     base_url = f"https://{domain}"