hs-m3u8 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

hs_m3u8/__init__.py

@@ -1,3 +1,3 @@
 from hs_m3u8.main import M3u8Downloader, M3u8Key
 
-__version__ = "0.1.5"
+__version__ = "0.1.6"

hs_m3u8/main.py

@@ -16,6 +16,8 @@ from zipfile import ZipFile
 
 import m3u8
 from hssp import Net
+from hssp.models.net import RequestModel
+from hssp.network.response import Response
 from hssp.utils import crypto
 from loguru import logger
 
@@ -80,6 +82,12 @@ class M3u8Downloader:
         headers=None,
         key: M3u8Key = None,
         get_m3u8_func: Callable = None,
+        m3u8_request_before: Callable[[RequestModel], RequestModel] = None,
+        m3u8_response_after: Callable[[Response], Response] = None,
+        key_request_before: Callable[[RequestModel], RequestModel] = None,
+        key_response_after: Callable[[Response], Response] = None,
+        ts_request_before: Callable[[RequestModel], RequestModel] = None,
+        ts_response_after: Callable[[Response], Response] = None,
     ):
         """
 
@@ -91,11 +99,38 @@ class M3u8Downloader:
             headers: 情求头
             get_m3u8_func: 处理m3u8情求的回调函数。适用于m3u8地址不是真正的地址，
                            而是包含m3u8内容的情求，会把m3u8_url的响应传递给get_m3u8_func，要求返回真正的m3u8内容
+           m3u8_request_before: m3u8请求前的回调函数
+           m3u8_response_after: m3u8响应后的回调函数
+           key_request_before: key请求前的回调函数
+           key_response_after: key响应后的回调函数
+           ts_request_before: ts请求前的回调函数
+           ts_response_after: ts响应后的回调函数
         """
 
         sem = asyncio.Semaphore(max_workers) if max_workers else None
         self.headers = headers
-        self.net = Net(sem=sem)
+
+        # m3u8 内容的请求器
+        self.m3u8_net = Net(sem=sem)
+        if m3u8_request_before:
+            self.m3u8_net.request_before_signal.connect(m3u8_request_before)
+        if m3u8_response_after:
+            self.m3u8_net.response_after_signal.connect(m3u8_response_after)
+
+        # 加密key的请求器
+        self.key_net = Net()
+        if key_request_before:
+            self.key_net.request_before_signal.connect(key_request_before)
+        if key_response_after:
+            self.key_net.response_after_signal.connect(key_response_after)
+
+        # ts内容的请求器
+        self.ts_net = Net()
+        if ts_request_before:
+            self.ts_net.request_before_signal.connect(ts_request_before)
+        if ts_response_after:
+            self.ts_net.response_after_signal.connect(ts_response_after)
+
         self.decrypt = decrypt
         self.m3u8_url = urlparse(m3u8_url)
         self.get_m3u8_func = get_m3u8_func
@@ -112,7 +147,9 @@ class M3u8Downloader:
 
     async def run(self, merge=True, del_hls=False):
         await self.start(merge, del_hls)
-        await self.net.close()
+        await self.m3u8_net.close()
+        await self.key_net.close()
+        await self.ts_net.close()
 
     async def start(self, merge=True, del_hls=False):
         """
@@ -122,6 +159,7 @@ class M3u8Downloader:
         :return:
         """
         mp4_path = self.save_dir.parent / f"{self.save_name}.mp4"
+        mp4_path = mp4_path.absolute()
         if Path(mp4_path).exists():
             self.logger.info(f"{mp4_path}已存在")
             if del_hls:
@@ -131,7 +169,7 @@ class M3u8Downloader:
         self.logger.info(
             f"开始下载: 合并ts为mp4={merge}, "
             f"删除hls信息={del_hls}, "
-            f"下载地址为：{self.m3u8_url.geturl()}. 保存路径为：{self.save_dir}"
+            f"下载地址为：{self.m3u8_url.geturl()}. 保存路径为：{self.save_dir.absolute()}"
         )
 
         await self._download()
@@ -141,7 +179,7 @@ class M3u8Downloader:
         self.logger.info(f"TS应下载数量为：{count_1}, 实际下载数量为：{count_2}")
         if count_1 == 0 or count_2 == 0:
             self.logger.error("ts数量为0，请检查！！！")
-            return
+            return None
 
         if count_2 != count_1:
             self.logger.error(f"ts下载数量与实际数量不符合！！！应该下载数量为：{count_1}, 实际下载数量为：{count_2}")
@@ -182,7 +220,7 @@ class M3u8Downloader:
         :param url:
         :return:
         """
-        resp = await self.net.get(url.geturl(), headers=self.headers)
+        resp = await self.m3u8_net.get(url.geturl(), headers=self.headers)
         m3u8_text = self.get_m3u8_func(resp.text) if self.get_m3u8_func else resp.text
         m3u8_obj = m3u8.loads(m3u8_text)
         prefix = f"{url.scheme}://{url.netloc}"
@@ -220,7 +258,7 @@ class M3u8Downloader:
         if len(m3u8_obj.keys) > 0 and m3u8_obj.keys[0]:
             iv = m3u8_obj.keys[0].iv
             if not self.custom_key:
-                resp = await self.net.get(m3u8_obj.keys[0].absolute_uri, headers=self.headers)
+                resp = await self.key_net.get(m3u8_obj.keys[0].absolute_uri, headers=self.headers)
                 key_data = resp.content
             else:
                 key_data = self.custom_key.key
@@ -252,13 +290,13 @@ class M3u8Downloader:
         if Path(ts_path).exists():
             self.ts_path_list[index] = str(ts_path)
             return
-        resp = await self.net.get(ts_item["uri"], self.headers)
+        resp = await self.ts_net.get(ts_item["uri"], self.headers)
         ts_content = resp.content
         if ts_content is None:
             return
 
         if self.ts_key and self.decrypt:
-            ts_content = crypto.decrypt_aes_256_cbc_pad7(ts_content, self.ts_key.key, self.ts_key.iv)
+            ts_content = crypto.decrypt_aes_256_cbc(ts_content, self.ts_key.key, self.ts_key.iv)
 
         self.save_file(ts_content, ts_path)
         self.logger.info(f"{ts_uri}下载成功")
@@ -282,10 +320,10 @@ class M3u8Downloader:
         # mp4路径
         mp4_path = self.save_dir.parent / f"{self.save_name}.mp4"
 
-        # 如果保护mp4的头，则把ts放到后面
+        # 如果有mp4的头，则把ts放到后面
         mp4_head_data = b""
         if self.mp4_head_hrl:
-            resp = await self.net.get(self.mp4_head_hrl)
+            resp = await self.ts_net.get(self.mp4_head_hrl)
             mp4_head_data = resp.content
             mp4_head_file = self.save_dir / "head.mp4"
             mp4_head_file.write_bytes(mp4_head_data)
@@ -297,7 +335,7 @@ class M3u8Downloader:
             with open(path, "rb") as ts_file:
                 data = ts_file.read()
                 if self.ts_key:
-                    data = crypto.decrypt_aes_256_cbc_pad7(data, self.ts_key.key, self.ts_key.iv)
+                    data = crypto.decrypt_aes_256_cbc(data, self.ts_key.key, self.ts_key.iv)
                 big_ts_file.write(data)
         big_ts_file.close()
         self.logger.info("ts文件整合完毕")

{hs_m3u8-0.1.5.dist-info → hs_m3u8-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hs-m3u8
-Version: 0.1.5
+Version: 0.1.7
 Summary: m3u8 下载器
 Project-URL: homepage, https://github.com/x-haose/hs-m3u8
 Project-URL: repository, https://github.com/x-haose/hs-m3u8
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
-Requires-Dist: hssp>=0.4.4
+Requires-Dist: hssp>=0.4.18
 Requires-Dist: m3u8>=6.0.0
 Description-Content-Type: text/markdown
 

hs_m3u8-0.1.7.dist-info/RECORD

@@ -0,0 +1,6 @@
+hs_m3u8/__init__.py,sha256=_AhYioHAgwPXE10FXGZ3ZKj1urwFYR0L9xzBn8pQPJw,72
+hs_m3u8/main.py,sha256=dyRy7ciRMbvrrjAE01mhjuw1Wj4mHG_DZiJNHHVtJ9Y,13403
+hs_m3u8/res/ffmpeg_win.exe.zip,sha256=x_7Fa9N3hzN1d7Ph9ZwOiwpuRfLEVnhNL8tPjuZZMe0,60131319
+hs_m3u8-0.1.7.dist-info/METADATA,sha256=w3wygMm94rIns6-RxhisG85tS7myzNSconLpH7sJPus,2205
+hs_m3u8-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hs_m3u8-0.1.7.dist-info/RECORD,,

hs_m3u8-0.1.5.dist-info/RECORD

@@ -1,6 +0,0 @@
-hs_m3u8/__init__.py,sha256=HINaNDvyRMsgqg9VY_AsV9ierd8KhdtNyJRdQ8BcFg8,72
-hs_m3u8/main.py,sha256=jZ0650qosfrhiS1r3-UGhjp8shx6TvcElXAEls7f3jQ,11609
-hs_m3u8/res/ffmpeg_win.exe.zip,sha256=x_7Fa9N3hzN1d7Ph9ZwOiwpuRfLEVnhNL8tPjuZZMe0,60131319
-hs_m3u8-0.1.5.dist-info/METADATA,sha256=3htPtN-CKSxXaS3o9oootUP4RMdS_tQSIyn4vBT0B4I,2204
-hs_m3u8-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hs_m3u8-0.1.5.dist-info/RECORD,,