hs-m3u8 0.1.3__py3-none-any.whl → 0.1.5__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.3"
+__version__ = "0.1.5"

hs_m3u8/main.py

@@ -9,6 +9,7 @@ import shutil
 import subprocess
 from collections.abc import Callable
 from hashlib import md5
+from importlib import resources
 from pathlib import Path
 from urllib.parse import urljoin, urlparse
 from zipfile import ZipFile
@@ -28,20 +29,18 @@ def get_ffmpeg():
     if current_os != "Windows":
         return "ffmpeg"
 
-    res_path = Path(__file__).parent.parent.parent / "res"
-    ffmpeg_bin = res_path / "ffmpeg_win.exe"
+    with resources.as_file(resources.files("hs_m3u8.res")) as package_dir:
+        ffmpeg_bin = package_dir / "ffmpeg_win.exe"
+        if ffmpeg_bin.exists():
+            return str(ffmpeg_bin)
 
-    if ffmpeg_bin.exists():
-        return str(ffmpeg_bin)
+        # ZIP 文件
+        ffmpeg_bin_zip = package_dir / "ffmpeg_win.exe.zip"
+        if ffmpeg_bin_zip.exists():
+            with ZipFile(ffmpeg_bin_zip, "r") as zip_ref:
+                zip_ref.extractall(ffmpeg_bin.parent)
 
-    # ZIP 文件
-    ffmpeg_bin_zip = Path(ffmpeg_bin.parent) / f"{ffmpeg_bin.name}.zip"
-    if ffmpeg_bin_zip.exists():
-        # 解压缩到同一目录
-        with ZipFile(ffmpeg_bin_zip, "r") as zip_ref:
-            zip_ref.extractall(ffmpeg_bin.parent)
-
-    return ffmpeg_bin
+        return ffmpeg_bin
 
 
 class M3u8Key:
@@ -54,8 +53,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:
@@ -78,6 +78,7 @@ class M3u8Downloader:
         decrypt=False,
         max_workers=None,
         headers=None,
+        key: M3u8Key = None,
         get_m3u8_func: Callable = None,
     ):
         """
@@ -101,6 +102,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)
@@ -216,10 +218,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
@@ -244,7 +252,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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hs-m3u8
-Version: 0.1.3
+Version: 0.1.5
 Summary: m3u8 下载器
 Project-URL: homepage, https://github.com/x-haose/hs-m3u8
 Project-URL: repository, https://github.com/x-haose/hs-m3u8

hs_m3u8-0.1.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+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,,

hs_m3u8-0.1.3.dist-info/RECORD

@@ -1,5 +0,0 @@
-hs_m3u8/__init__.py,sha256=t0R3Q2zVnUtOiJ8e2sL29N4QkkBHXKgC54n6OqMbwJs,63
-hs_m3u8/main.py,sha256=kJ4HV1eISz80ttxsr2E9K-tfTKK79URiEJviPcc5tfg,11259
-hs_m3u8-0.1.3.dist-info/METADATA,sha256=nskQSk_KjDfVtGPhdr6cYXdJbfrbHJXnf7JnvtxIcjg,2204
-hs_m3u8-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hs_m3u8-0.1.3.dist-info/RECORD,,