eaf_base_api 3.3__tar.gz → 3.3.1__tar.gz

{eaf_base_api-3.3 → eaf_base_api-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 3.3
+Version: 3.3.1
 Summary: A base API for EchterAlsFake's Porn APIs
 Author: Johannes Habel
 Author-email: Johannes Habel <EchterAlsFake@proton.me>
@@ -10,8 +10,8 @@ Classifier: Programming Language :: Python
 Requires-Dist: curl-cffi
 Requires-Dist: tenacity>=9.1.2
 Requires-Dist: m3u8 ; extra == 'hls'
-Requires-Dist: av ; python_full_version >= '3.10' and extra == 'hls'
-Requires-Python: >=3.10
+Requires-Dist: av ; python_full_version >= '3.12' and extra == 'hls'
+Requires-Python: >=3.12
 Project-URL: Homepage, https://github.com/EchterAlsFake/eaf_base_api
 Project-URL: Repository, https://github.com/EchterAlsFake/eaf_base_api
 Provides-Extra: hls

{eaf_base_api-3.3 → eaf_base_api-3.3.1}/base_api/base.py

@@ -1043,8 +1043,8 @@ a new Python file, import only m3u8 and see what error you get.
         assert m3u8 is not None
 
         if inspect.iscoroutinefunction(m3u8_url) or (callable(m3u8_url) and not isinstance(m3u8_url, str)):
-            m3u8_url = await m3u8_url()
-        elif inspect.iscoroutine(m3u8_url):
+            m3u8_url = m3u8_url()
+        if inspect.iscoroutine(m3u8_url) or inspect.isawaitable(m3u8_url):
             m3u8_url = await m3u8_url
 
         if m3u8_url.lstrip().startswith("#EXTM3U"):
@@ -1079,6 +1079,12 @@ a new Python file, import only m3u8 and see what error you get.
         Inspect the master playlist and return sorted unique heights (e.g., [240, 360, 480, 720, 1080]).
         """
         assert m3u8 is not None
+
+        if inspect.iscoroutinefunction(m3u8_url) or (callable(m3u8_url) and not isinstance(m3u8_url, str)):
+            m3u8_url = m3u8_url()
+        if inspect.iscoroutine(m3u8_url) or inspect.isawaitable(m3u8_url):
+            m3u8_url = await m3u8_url
+
         if not m3u8_url.startswith("https://"):
             master = m3u8.loads(m3u8_url)
         else:
@@ -1249,8 +1255,8 @@ a new Python file, import only m3u8 and see what error you get.
         m3u8_url = getattr(video, "m3u8_base_url", None)
 
         if inspect.iscoroutinefunction(m3u8_url) or (callable(m3u8_url) and not isinstance(m3u8_url, str)):
-            m3u8_url = await m3u8_url()
-        elif inspect.iscoroutine(m3u8_url):
+            m3u8_url = m3u8_url()
+        if inspect.iscoroutine(m3u8_url) or inspect.isawaitable(m3u8_url):
             m3u8_url = await m3u8_url
 
         self.logger.info(
@@ -1389,8 +1395,8 @@ a new Python file, import only m3u8 and see what error you get.
                         m3u8_master = getattr(video, "m3u8_base_url")
                         assert m3u8_master is not None, "m3u8_base_url is missing from video object"
                         if inspect.iscoroutinefunction(m3u8_master) or (callable(m3u8_master) and not isinstance(m3u8_master, str)):
-                            m3u8_master = await m3u8_master()
-                        elif inspect.iscoroutine(m3u8_master):
+                            m3u8_master = m3u8_master()
+                        if inspect.iscoroutine(m3u8_master) or inspect.isawaitable(m3u8_master):
                             m3u8_master = await m3u8_master
                     self.logger.info(f"Fetching segments for quality={quality} m3u8_url_master={m3u8_master}")
                     segments = await self.get_segments(quality=quality, m3u8_url_master=m3u8_master)

{eaf_base_api-3.3 → eaf_base_api-3.3.1}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "uv_build"
 
 [project]
 name = "eaf_base_api"
-version = "3.3"
+version = "3.3.1"
 description = "A base API for EchterAlsFake's Porn APIs"
 readme = { file = "README.md", content-type = "text/markdown" }
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 license = "LGPL-3.0-or-later"
 license-files = ["LICENSE*"]
 
@@ -28,7 +28,7 @@ dependencies = [
 hls = [
   "m3u8",
   # av needs Python >= 3.10, so guard it (otherwise `pip install ...[hls]` fails on 3.8/3.9)
-  "av; python_version >= '3.10'",
+  "av; python_version >= '3.12'",
 ]
 
 [project.urls]