hs-m3u8 0.1.1__tar.gz → 0.1.3__tar.gz

{hs_m3u8-0.1.1 → hs_m3u8-0.1.3}/PKG-INFO

@@ -1,9 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hs-m3u8
-Version: 0.1.1
+Version: 0.1.3
 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
@@ -33,6 +36,13 @@ m3u8 视频下载工具。支持大部分的m3u8视频下载。后续增加UI界
 - 可选择保留ts文件
 - 内置Windows平台ffmpeg可执行文件（由于Linux及Mac下权限问题，需自行安装ffmpeg文件）
 
+## 计划
+
+- 增加cli功能，通过终端执行命令去下载
+- 增加支持curl参数功能。直接在curl里面读取请求头及cookie
+- 编写详细文档
+- 选择一个合适的技术栈，增加UI界面
+
 ## 安装
 
 ### pip包安装

{hs_m3u8-0.1.1 → hs_m3u8-0.1.3}/README.md

@@ -10,6 +10,13 @@ m3u8 视频下载工具。支持大部分的m3u8视频下载。后续增加UI界
 - 可选择保留ts文件
 - 内置Windows平台ffmpeg可执行文件（由于Linux及Mac下权限问题，需自行安装ffmpeg文件）
 
+## 计划
+
+- 增加cli功能，通过终端执行命令去下载
+- 增加支持curl参数功能。直接在curl里面读取请求头及cookie
+- 编写详细文档
+- 选择一个合适的技术栈，增加UI界面
+
 ## 安装
 
 ### pip包安装

{hs_m3u8-0.1.1 → hs_m3u8-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hs-m3u8"
-version = "0.1.1"
+version = "0.1.3"
 description = "m3u8 下载器"
 authors = [
     { name = "昊色居士", email = "xhrtxh@gmail.com" }
@@ -29,6 +29,11 @@ dependencies = [
     "hssp>=0.4.4",
 ]
 
+[project.urls]
+homepage = "https://github.com/x-haose/hs-m3u8"
+repository = "https://github.com/x-haose/hs-m3u8"
+documentation = "https://github.com/x-haose/hs-m3u8"
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -37,6 +42,7 @@ build-backend = "hatchling.build"
 managed = true
 dev-dependencies = [
     "pre-commit>=4.0.1",
+    "twine>=6.0.1",
 ]
 include = [
     "src/hs_m3u8/"
@@ -131,8 +137,8 @@ unfixable = []
 
 
 [tool.rye.scripts]
-publish_testpypi = { cmd = "rye publish --repository testpypi --repository-url https://test.pypi.org/legacy/" }
-publish_pypi = { cmd = "rye publish" }
+publish_testpypi = { cmd = "rye run twine upload -r testpypi dist/*" }
+publish_pypi = { cmd = "rye run twine upload dist/*" }
 sb = { cmd = "rye build --clean" }
 spt = { chain = ["sb", "publish_testpypi"] }
 sp = { chain = ["sb", "publish_pypi"] }

{hs_m3u8-0.1.1 → hs_m3u8-0.1.3}/requirements-dev.lock

@@ -46,6 +46,8 @@ datarecorder==3.6.2
     # via downloadkit
 distlib==0.3.9
     # via virtualenv
+docutils==0.21.2
+    # via readme-renderer
 downloadkit==2.0.5
     # via drissionpage
 drissionpage==4.1.0.12
@@ -84,8 +86,16 @@ idna==3.10
     # via requests
     # via tldextract
     # via yarl
+jaraco-classes==3.4.0
+    # via keyring
+jaraco-context==6.0.1
+    # via keyring
+jaraco-functools==4.1.0
+    # via keyring
 jmespath==1.0.1
     # via parsel
+keyring==25.6.0
+    # via twine
 loguru==0.7.2
     # via hssp
 lxml==5.3.0
@@ -93,9 +103,18 @@ lxml==5.3.0
     # via parsel
 m3u8==6.0.0
     # via hs-m3u8
+markdown-it-py==3.0.0
+    # via rich
+mdurl==0.1.2
+    # via markdown-it-py
+more-itertools==10.6.0
+    # via jaraco-classes
+    # via jaraco-functools
 multidict==6.1.0
     # via aiohttp
     # via yarl
+nh3==0.2.20
+    # via readme-renderer
 nodeenv==1.9.1
     # via pre-commit
 openpyxl==3.1.5
@@ -104,8 +123,11 @@ orderedmultidict==1.0.1
     # via furl
 packaging==24.2
     # via parsel
+    # via twine
 parsel==1.9.1
     # via hssp
+pkginfo==1.12.0
+    # via twine
 platformdirs==4.3.6
     # via virtualenv
 pre-commit==4.0.1
@@ -124,6 +146,9 @@ pydantic-core==2.23.4
     # via pydantic
 pydantic-settings==2.6.1
     # via hssp
+pygments==2.19.1
+    # via readme-renderer
+    # via rich
 python-dotenv==1.0.1
     # via pydantic-settings
 pytz==2024.2
@@ -131,14 +156,24 @@ pytz==2024.2
 pyyaml==6.0.2
     # via pre-commit
     # via pydantic-settings
+readme-renderer==44.0
+    # via twine
 requests==2.32.3
     # via downloadkit
     # via drissionpage
     # via hssp
     # via requests-file
+    # via requests-toolbelt
     # via tldextract
+    # via twine
 requests-file==2.1.0
     # via tldextract
+requests-toolbelt==1.0.0
+    # via twine
+rfc3986==2.0.0
+    # via twine
+rich==13.9.4
+    # via twine
 six==1.16.0
     # via apscheduler
     # via furl
@@ -152,6 +187,7 @@ tldextract==5.1.3
     # via drissionpage
 tomli==2.1.0
     # via pydantic-settings
+twine==6.0.1
 typing-extensions==4.12.2
     # via curl-cffi
     # via pydantic
@@ -160,6 +196,7 @@ tzlocal==5.2
     # via apscheduler
 urllib3==2.2.3
     # via requests
+    # via twine
 uvloop==0.21.0
     # via hssp
 virtualenv==20.27.1

{hs_m3u8-0.1.1 → hs_m3u8-0.1.3}/src/hs_m3u8/__init__.py

@@ -1,3 +1,3 @@
 from hs_m3u8.main import M3u8Downloader
 
-__version__ = "0.1.1"
+__version__ = "0.1.3"

{hs_m3u8-0.1.1 → hs_m3u8-0.1.3}/src/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
@@ -80,6 +68,7 @@ class M3u8Downloader:
     ts_url_list: list = []
     ts_path_list: list = []
     ts_key: M3u8Key = None
+    mp4_head_hrl: str = None
     m3u8_md5 = ""
 
     def __init__(
@@ -165,7 +154,7 @@ class M3u8Downloader:
         if not merge:
             return True
 
-        if self.merge():
+        if await self.merge():
             self.logger.info("合并成功")
         else:
             self.logger.error(
@@ -185,30 +174,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 +200,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
@@ -283,7 +256,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 +274,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 +298,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)