hs-m3u8 0.1.4__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, M3u8Key
 
-__version__ = "0.1.4"
+__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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hs-m3u8
-Version: 0.1.4
+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.4.dist-info/RECORD

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