hs-m3u8 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

hs_m3u8/__init__.py

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

hs_m3u8/main.py

@@ -8,10 +8,8 @@ import posixpath
 import shutil
 import subprocess
 from collections.abc import Callable
-from enum import Enum, auto
 from hashlib import md5
 from pathlib import Path
-from typing import Any
 from urllib.parse import urljoin, urlparse
 from zipfile import ZipFile
 
@@ -46,16 +44,6 @@ def get_ffmpeg():
     return ffmpeg_bin
 
 
-class ContentType(Enum):
-    """
-    获取URL数据的，类型枚举
-    """
-
-    Text = auto()
-    Json = auto()
-    Bytes = auto()
-
-
 class M3u8Key:
     """
     M3u8key
@@ -66,8 +54,9 @@ class M3u8Key:
         :param key: 密钥
         :param iv: 偏移
         """
+        iv = bytes.fromhex(iv[2:]) if iv and iv.startswith("0x") else iv
         self.key = key
-        self.iv = iv or key
+        self.iv = iv
 
 
 class M3u8Downloader:
@@ -80,6 +69,7 @@ class M3u8Downloader:
     ts_url_list: list = []
     ts_path_list: list = []
     ts_key: M3u8Key = None
+    mp4_head_hrl: str = None
     m3u8_md5 = ""
 
     def __init__(
@@ -89,6 +79,7 @@ class M3u8Downloader:
         decrypt=False,
         max_workers=None,
         headers=None,
+        key: M3u8Key = None,
         get_m3u8_func: Callable = None,
     ):
         """
@@ -112,6 +103,7 @@ class M3u8Downloader:
         self.save_dir = Path(save_path) / "hls"
         self.save_name = Path(save_path).name
         self.key_path = self.save_dir / "key.key"
+        self.custom_key = key
 
         if not self.save_dir.exists():
             self.save_dir.mkdir(parents=True)
@@ -165,7 +157,7 @@ class M3u8Downloader:
         if not merge:
             return True
 
-        if self.merge():
+        if await self.merge():
             self.logger.info("合并成功")
         else:
             self.logger.error(
@@ -185,30 +177,6 @@ class M3u8Downloader:
         self.ts_path_list = [None] * len(self.ts_url_list)
         await asyncio.gather(*[self._download_ts(url) for url in self.ts_url_list])
 
-    async def get_url_content(self, url: str, content_type: ContentType) -> bytes | str | Any:
-        """
-        按照类型获取url内容
-        :param url: 请求地址
-        :param content_type: 内容类型
-        :return:
-        """
-        data = None
-        try:
-            resp = await self.net.get(url, headers=self.headers)
-            if content_type == ContentType.Bytes:
-                data = resp.content
-            if content_type == ContentType.Text:
-                data = resp.text
-            if content_type == ContentType.Json:
-                data = resp.json
-            if resp.status_code != 200:
-                self.logger.error(f"请求{url}内容时返回码不正确，类型为：{content_type}, 返回码为:{resp.status_code}")
-                return None
-        except BaseException as exception:
-            self.logger.error(f"请求{url}内容时发生异常，类型为：{content_type}, 异常信息为:{exception}")
-
-        return data
-
     async def get_ts_list(self, url) -> list[dict]:
         """
         解析m3u8并保存至列表
@@ -235,6 +203,14 @@ class M3u8Downloader:
             self.logger.info(f"选择的播放地址：{play_url}，比特率：{bandwidth}")
             return await self.get_ts_list(urlparse(play_url))
 
+        # 处理具有 #EXT-X-MAP:URI="*.mp4" 的情况
+        segment_map_count = len(m3u8_obj.segment_map)
+        if segment_map_count > 0:
+            if segment_map_count > 1:
+                raise ValueError("暂不支持segment_map有多个的情况，请提交issues，并告知m3u8的地址，方便做适配")
+            self.mp4_head_hrl = prefix + m3u8_obj.segment_map[0].uri
+            m3u8_obj.segment_map[0].uri = "head.mp4"
+
         # 遍历ts文件
         for index, segments in enumerate(m3u8_obj.segments):
             ts_uri = segments.uri if "http" in m3u8_obj.segments[index].uri else segments.absolute_uri
@@ -243,10 +219,16 @@ class M3u8Downloader:
 
         # 保存解密key
         if len(m3u8_obj.keys) > 0 and m3u8_obj.keys[0]:
-            resp = await self.net.get(m3u8_obj.keys[0].absolute_uri, headers=self.headers)
-            key_data = resp.content
+            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)
+                key_data = resp.content
+            else:
+                key_data = self.custom_key.key
+                iv = self.custom_key.iv or iv
+
             self.save_file(key_data, self.key_path)
-            self.ts_key = M3u8Key(key=key_data, iv=m3u8_obj.keys[0].iv)
+            self.ts_key = M3u8Key(key=key_data, iv=iv)
             key = m3u8_obj.segments[0].key
             key.uri = "key.key"
             m3u8_obj.segments[0].key = key
@@ -271,7 +253,7 @@ class M3u8Downloader:
         if Path(ts_path).exists():
             self.ts_path_list[index] = str(ts_path)
             return
-        resp = await self.net.get(ts_item["uri"])
+        resp = await self.net.get(ts_item["uri"], self.headers)
         ts_content = resp.content
         if ts_content is None:
             return
@@ -283,7 +265,7 @@ class M3u8Downloader:
         self.logger.info(f"{ts_uri}下载成功")
         self.ts_path_list[index] = str(ts_path)
 
-    def merge(self):
+    async def merge(self):
         """
         合并ts文件为mp4文件
         :return:
@@ -301,8 +283,17 @@ class M3u8Downloader:
         # mp4路径
         mp4_path = self.save_dir.parent / f"{self.save_name}.mp4"
 
+        # 如果保护mp4的头，则把ts放到后面
+        mp4_head_data = b""
+        if self.mp4_head_hrl:
+            resp = await self.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)
+
         # 把ts文件整合到一起
         big_ts_file = big_ts_path.open("ab+")
+        big_ts_file.write(mp4_head_data)
         for path in self.ts_path_list:
             with open(path, "rb") as ts_file:
                 data = ts_file.read()
@@ -316,7 +307,7 @@ class M3u8Downloader:
         ffmpeg_bin = get_ffmpeg()
         command = (
             f'{ffmpeg_bin} -i "{big_ts_path}" '
-            f'-c copy -map 0:v -map 0:a -bsf:a aac_adtstoasc -threads 32 "{mp4_path}" -y'
+            f'-c copy -map 0:v -map 0:a? -bsf:a aac_adtstoasc -threads 32 "{mp4_path}" -y'
         )
         self.logger.info(f"ts整合成功，开始转为mp4。 command：{command}")
         result = subprocess.run(command, shell=True, capture_output=True, text=True)

{hs_m3u8-0.1.2.dist-info → hs_m3u8-0.1.4.dist-info}/METADATA

@@ -1,12 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hs-m3u8
-Version: 0.1.2
+Version: 0.1.4
 Summary: m3u8 下载器
 Project-URL: homepage, https://github.com/x-haose/hs-m3u8
 Project-URL: repository, https://github.com/x-haose/hs-m3u8
 Project-URL: documentation, https://github.com/x-haose/hs-m3u8
 Author-email: 昊色居士 <xhrtxh@gmail.com>
-License: MIT
+License-Expression: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -36,6 +36,13 @@ m3u8 视频下载工具。支持大部分的m3u8视频下载。后续增加UI界
 - 可选择保留ts文件
 - 内置Windows平台ffmpeg可执行文件（由于Linux及Mac下权限问题，需自行安装ffmpeg文件）
 
+## 计划
+
+- 增加cli功能，通过终端执行命令去下载
+- 增加支持curl参数功能。直接在curl里面读取请求头及cookie
+- 编写详细文档
+- 选择一个合适的技术栈，增加UI界面
+
 ## 安装
 
 ### pip包安装

hs_m3u8-0.1.4.dist-info/RECORD

@@ -0,0 +1,5 @@
+hs_m3u8/__init__.py,sha256=WxYMLrnGwdYDEmbxZmUV-l2DPs9jrYDP0cAnHxkqtFs,72
+hs_m3u8/main.py,sha256=RELt4z7AM7OuXYiRkCe-yf4A1JGQ9FtIaBj6Vov3Ig0,11574
+hs_m3u8-0.1.4.dist-info/METADATA,sha256=ddVI5SkdoINuFHSPS9uFGDeOmCybhT1al4_4SmXPHRs,2204
+hs_m3u8-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hs_m3u8-0.1.4.dist-info/RECORD,,

{hs_m3u8-0.1.2.dist-info → hs_m3u8-0.1.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

hs_m3u8-0.1.2.dist-info/RECORD

@@ -1,5 +0,0 @@
-hs_m3u8/__init__.py,sha256=VWzgd1ZOktIFqMuyNnZFhKltLMFS7g9IOS5FUZXZpoE,63
-hs_m3u8/main.py,sha256=tq-JtMzfEy1YTTpZFL9Oas5ZzrON3eigWxlKAduc-oU,11592
-hs_m3u8-0.1.2.dist-info/METADATA,sha256=e6BAuDJEiq0k_mhn5uuYUpLcW6f6eEw1yocday1-NW0,1979
-hs_m3u8-0.1.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-hs_m3u8-0.1.2.dist-info/RECORD,,