eaf-base-api 1.5__tar.gz → 1.6.1__tar.gz

{eaf_base_api-1.5 → eaf_base_api-1.6.1}/PKG-INFO

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

{eaf_base_api-1.5 → eaf_base_api-1.6.1}/base_api/base.py

@@ -2,11 +2,12 @@ import requests
 import logging
 import time
 import string
+import os
 
 from base_api.modules.quality import Quality
 from base_api.modules.progress_bars import Callback
 from base_api.modules.download import default, threaded, FFMPEG
-from base_api.modules.consts import MAX_RETRIES
+from base_api.modules.consts import MAX_RETRIES, REQUEST_DELAY
 from pathlib import Path
 
 
@@ -19,14 +20,24 @@ def setup_api(do_logging=False):
         logging.disable(logging.CRITICAL)
 
 
-base_qualities = ["250p", "360p", "480p", "720p", "1080p", "1440p", "2160p"]
-
-
 class Core:
-    @classmethod
-    def get_content(cls, url, headers=None, cookies=None, stream=False):
+    def __init__(self, delay=REQUEST_DELAY):
+        self.delay = delay
+        self.start_delay = False
+        self.last_request_time = None
+
+    def get_content(self, url, headers=None, cookies=None, stream=False):
         for i in range(MAX_RETRIES):
             try:
+
+                # Delay mechanism
+                if self.last_request_time:
+                    elapsed_time = time.time() - self.last_request_time
+                    if elapsed_time < self.delay:
+                        time.sleep(self.delay - elapsed_time)
+
+                self.last_request_time = time.time()  # Update the time of the last request
+
                 logging.debug(f"Trying to fetch {url} / Attempt: [{i+1}]")
                 response = requests.get(url, headers=headers, cookies=cookies, stream=stream)
                 if response.status_code == 200:
@@ -57,7 +68,7 @@ class Core:
         elif str(quality) == "worst":
             return Quality.WORST
 
-    def get_available_qualities(self, m3u8_base_url):
+    def get_available_qualities(self, m3u8_base_url, base_qualities, seperator):
         """Returns the available qualities from the M3U8 base url"""
         content = self.get_content(m3u8_base_url).decode("utf-8")
         lines = content.splitlines()
@@ -66,18 +77,18 @@ class Core:
 
         for line in lines:
             for quality in base_qualities:
-                if f"hls-{quality}" in line:
+                if f"{seperator}{quality}" in line and not str(line).startswith("#"):
                     quality_url_map[quality] = line
 
         self.quality_url_map = quality_url_map
         self.available_qualities = list(quality_url_map.keys())
         return self.available_qualities
 
-    def get_m3u8_by_quality(self, quality, m3u8_base_url):
+    def get_m3u8_by_quality(self, quality, m3u8_base_url, base_qualities, seperator):
         """Returns the m3u8 url for the given quality"""
         quality = self.fix_quality(quality)
 
-        self.get_available_qualities(m3u8_base_url)
+        self.get_available_qualities(m3u8_base_url, base_qualities, seperator=seperator)
         if quality == Quality.BEST:
             selected_quality = max(self.available_qualities, key=lambda q: base_qualities.index(q))
         elif quality == Quality.WORST:
@@ -117,10 +128,11 @@ class Core:
         return Path(path)
 
     @classmethod
-    def get_segments(cls, quality, m3u8_base_url):
+    def get_segments(cls, quality, m3u8_base_url, base_qualities, seperator, source=1):
         quality = Core().fix_quality(quality)
         base_url = m3u8_base_url
-        new_segment = Core().get_m3u8_by_quality(quality, m3u8_base_url=base_url)
+        new_segment = Core().get_m3u8_by_quality(quality, m3u8_base_url=base_url, base_qualities=base_qualities,
+                                                 seperator=seperator)
         # Split the base URL into components
         url_components = base_url.split('/')
 
@@ -129,6 +141,10 @@ class Core:
 
         # Rejoin the components into the new full URL
         new_url = '/'.join(url_components)
+
+        if source == "spankbang":
+            new_url = new_url.split(".mp4.urlset/")[1]  # Please just don't ask, I'm a terrible programmer fr
+
         master_src = Core().get_content(url=new_url).decode("utf-8")
 
         urls = [l for l in master_src.splitlines()
@@ -151,4 +167,18 @@ class Core:
         """
         illegal_chars = '<>:"/\\|?*'
         cleaned_title = ''.join([char for char in title if char in string.printable and char not in illegal_chars])
-        return cleaned_title
+        return cleaned_title
+
+    @classmethod
+    def return_path(cls, video, args):
+        path = args.output
+        if args.use_title:
+            if not str(path).endswith(os.sep):
+                path += os.sep
+
+            path += video.title + ".mp4"
+
+        else:
+            path = args.output
+
+        return path

eaf_base_api-1.6.1/base_api/modules/consts.py

@@ -0,0 +1,3 @@
+MAX_RETRIES = 4
+REQUEST_DELAY = 0
+FFMPEG_PATH = "ffmpeg"

{eaf_base_api-1.5 → eaf_base_api-1.6.1}/eaf_base_api.egg-info/PKG-INFO

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

{eaf_base_api-1.5 → eaf_base_api-1.6.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="eaf_base_api",
-    version="1.5",
+    version="1.6.1",
     packages=find_packages(),
     install_requires=[
         "requests", "ffmpeg-progress-yield"

eaf_base_api-1.5/base_api/modules/consts.py

@@ -1,2 +0,0 @@
-MAX_RETRIES = 4
-FFMPEG_PATH = "ffmpeg"