eaf-base-api 2.2.3__tar.gz → 2.2.5__tar.gz

{eaf_base_api-2.2.3 → eaf_base_api-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: eaf_base_api
-Version: 2.2.3
+Version: 2.2.5
 Summary: A base API for EchterAlsFake's Porn APIs
 Home-page: https://github.com/EchterAlsFake/eaf_base_api
 Author: Johannes Habel

{eaf_base_api-2.2.3 → eaf_base_api-2.2.5}/base_api/base.py

@@ -84,8 +84,8 @@ class BaseCore:
         self.session = httpx.Client(proxy=consts.PROXY,
                               headers=consts.HEADERS,
                               verify=verify,
-                              timeout=consts.TIMEOUT
-                              )
+                              timeout=consts.TIMEOUT,
+                              follow_redirects=True)
 
     def enforce_delay(self):
         """Enforces the specified delay in consts.REQUEST_DELAY"""
@@ -119,6 +119,9 @@ class BaseCore:
             return content
 
         for attempt in range(1, consts.MAX_RETRIES + 1):
+            if attempt != 1:
+                time.sleep(1.5) # Sleeping for 1.5 seconds to minimize site overload when doing a lot of requests
+
             try:
                 # Update user agent periodically
                 if self.total_requests % 3 == 0:
@@ -149,11 +152,20 @@ class BaseCore:
                         return response
 
                     # Process and return content
+                    # Collecting all chunks before processing because some sites cause issues with real-time decoding
+                    raw_content = b"".join(response.iter_bytes())
+
                     if get_bytes:
-                        content = b"".join([chunk for chunk in response.iter_bytes()])
+                        content = raw_content
+
                     else:
-                        content = "".join([chunk.decode("utf-8") for chunk in response.iter_bytes()])
-                        if save_cache:
+                        try:
+                            content = raw_content.decode("utf-8")
+
+                        except UnicodeDecodeError:
+                            content = raw_content.decode("latin1") # Fallback, hope that works somehow idk
+
+                        if save_cache and not get_bytes:
                             logger.debug(f"Saving content of {url} to local cache.")
                             cache.save_cache(url, content)
 
@@ -368,7 +380,6 @@ class BaseCore:
         try:
             with self.session.stream("GET", url, timeout=30) as response:  # Use a reasonable timeout
                 response.raise_for_status()
-
                 file_size = int(response.headers.get('content-length', 0))
 
                 if callback is None:

{eaf_base_api-2.2.3 → eaf_base_api-2.2.5}/eaf_base_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: eaf_base_api
-Version: 2.2.3
+Version: 2.2.5
 Summary: A base API for EchterAlsFake's Porn APIs
 Home-page: https://github.com/EchterAlsFake/eaf_base_api
 Author: Johannes Habel

{eaf_base_api-2.2.3 → eaf_base_api-2.2.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="eaf_base_api",
-    version="2.2.3",
+    version="2.2.5",
     packages=find_packages(),
     install_requires=["ffmpeg-progress-yield", "m3u8", "httpx"],
     entry_points={