htmlplayer 0.1.0__tar.gz → 0.1.1__tar.gz

{htmlplayer-0.1.0 → htmlplayer-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlplayer
-Version: 0.1.0
+Version: 0.1.1
 Summary: 一个简单的HTML视频播放器，使用Edge浏览器或系统默认浏览器播放视频
 Home-page: https://github.com/yourusername/htmlplayer
 Author: lenvy1

{htmlplayer-0.1.0 → htmlplayer-0.1.1}/htmlplayer/__init__.py

@@ -7,7 +7,7 @@ from .core import (
     calculate_window_size
 )
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __all__ = [
     "play_video",
     "play_with_edge",

htmlplayer-0.1.1/htmlplayer/core.py

@@ -0,0 +1,140 @@
+
+import subprocess
+import os
+
+
+def find_edge_browser():
+    edge_paths = [
+        r'C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe',
+        r'C:\Program Files\Microsoft\Edge\Application\msedge.exe',
+        os.path.expanduser(r'~\AppData\Local\Microsoft\Edge\Application\msedge.exe'),
+    ]
+    for path in edge_paths:
+        if os.path.exists(path):
+            return path
+    return None
+
+
+def calculate_window_size(width, height, scale=0.5):
+    """
+    根据输入的宽高计算合适的窗口大小（严格等比缩放）
+    
+    参数:
+        width (int/float): 目标宽度（像素）
+        height (int/float): 目标高度（像素）
+        scale (float): 窗口相对于输入尺寸的缩放比例，默认0.5（即50%尺寸）
+    
+    返回:
+        tuple: 包含窗口宽度和高度的元组 (final_width, final_height)，均为真实的浮点数
+    """
+    # 1. 跨平台自动检测屏幕分辨率
+    if width is None or height is None:
+        try:
+            import tkinter as tk
+            root = tk.Tk()
+            root.withdraw()  # 隐藏主窗口，避免闪烁
+            width = root.winfo_screenwidth()
+            height = root.winfo_screenheight()
+            root.destroy()
+        except Exception as e:
+            raise RuntimeError(f"无法自动获取屏幕分辨率，请手动传入 screen_width 和 screen_height。错误信息: {e}")
+    # 2. 根据传入的宽高直接计算目标宽高比
+    target_ratio = width / height
+
+    # 3. 针对竖屏视频的视觉体验优化
+    # 竖屏视频(如 9:16，比例约为 0.56)若按默认比例缩放会导致画面过小，因此放大显示
+    if target_ratio <= 0.6:
+        scale = 0.9 
+
+    # 4. 计算允许的最大边界
+    max_width = width * scale
+    max_height = height * scale
+
+    # 5. 核心等比缩放计算（取最小限制比例，确保不超出屏幕且保持绝对比例）
+    if max_width / target_ratio <= max_height:
+        # 宽度先触达边界，以宽度为基准计算高度
+        final_width = max_width
+        final_height = max_width / target_ratio
+    else:
+        # 高度先触达边界，以高度为基准计算宽度
+        final_height = max_height
+        final_width = max_height * target_ratio
+
+    return final_width, final_height
+
+
+def play_video(url, width=None, height=None,
+               use_edge=True, use_browser_fallback=True):
+    """
+    使用Edge浏览器或系统默认浏览器播放视频
+
+    参数:
+        url (str): 视频URL地址
+        width (int, optional): 窗口宽度
+        height (int, optional): 窗口高度
+        use_edge (bool): 是否优先使用Edge浏览器，默认True
+        use_browser_fallback (bool): Edge不可用时是否使用默认浏览器，默认True
+
+    返回:
+        bool: 播放是否成功启动
+    """
+    if not url or not isinstance(url, str):
+        raise ValueError("url参数无效，必须提供有效的URL字符串")
+
+    url = url.strip()
+    if not url.startswith('http'):
+        raise ValueError("url必须以http或https开头")
+
+    final_width, final_height = calculate_window_size(width=width, height=height)
+
+    edge_path = find_edge_browser() if use_edge else None
+
+    if edge_path:
+        subprocess.Popen([
+            edge_path,
+            '--app=' + url,
+            '--new-window',
+            f'--window-size={int(final_width)},{int(final_height)}',
+            '--disable-extensions',
+            '--disable-plugins',
+            '--inprivate'
+        ])
+        return True
+    elif use_browser_fallback:
+        import webbrowser
+        webbrowser.open(url)
+        return True
+    else:
+        return False
+
+
+def play_with_edge(url, width=None, height=None):
+    """
+    仅使用Edge浏览器播放视频
+
+    参数:
+        url (str): 视频URL地址
+        width (int, optional): 窗口宽度
+        height (int, optional): 窗口高度
+
+    返回:
+        bool: 播放是否成功启动
+    """
+    return play_video(url, width, height, use_edge=True, use_browser_fallback=False)
+
+
+def play_with_browser(url, width=None, height=None):
+    """
+    使用系统默认浏览器播放视频
+
+    参数:
+        url (str): 视频URL地址
+        width (int, optional): 窗口宽度
+        height (int, optional): 窗口高度
+
+    返回:
+        bool: 播放是否成功启动
+    """
+    return play_video(url, width, height,
+                     use_edge=False, use_browser_fallback=True)
+

{htmlplayer-0.1.0 → htmlplayer-0.1.1}/htmlplayer/examples/simple_example.py

@@ -10,26 +10,18 @@ def main():
     print("HTMLPlayer 视频播放库 - 简单示例")
     print("=" * 50)
     
-    # 示例 1: 基础用法
     print("\n1. 基础用法:")
     print("   from htmlplayer import play_video")
     print("   play_video('https://example.com/video.m3u8')")
     
-    # 示例 2: 指定窗口大小
     print("\n2. 指定窗口大小:")
     print("   play_video('https://example.com/video.m3u8', width=1280, height=720)")
     
-    # 示例 3: 指定视频宽高比
-    print("\n3. 指定视频宽高比:")
-    print("   play_video('https://example.com/video.m3u8', video_aspect_ratio=21/9)")
-    
-    # 示例 4: 仅使用Edge浏览器
-    print("\n4. 仅使用Edge浏览器:")
+    print("\n3. 仅使用Edge浏览器:")
     print("   from htmlplayer import play_with_edge")
     print("   play_with_edge('https://example.com/video.m3u8')")
     
-    # 示例 5: 使用系统默认浏览器
-    print("\n5. 使用系统默认浏览器:")
+    print("\n4. 使用系统默认浏览器:")
     print("   from htmlplayer import play_with_browser")
     print("   play_with_browser('https://example.com/video.m3u8')")
     
@@ -39,10 +31,7 @@ def main():
     
     # 实际演示（取消注释以运行）
     # print("\n正在播放示例视频...")
-    # play_video(
-    #     'https://jx.xmflv.com/?url=https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8',
-    #     video_aspect_ratio=16/9
-    # )
+    # play_video('https://jx.xmflv.com/?url=https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8')
 
 
 if __name__ == '__main__':

{htmlplayer-0.1.0 → htmlplayer-0.1.1}/htmlplayer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlplayer
-Version: 0.1.0
+Version: 0.1.1
 Summary: 一个简单的HTML视频播放器，使用Edge浏览器或系统默认浏览器播放视频
 Home-page: https://github.com/yourusername/htmlplayer
 Author: lenvy1

{htmlplayer-0.1.0 → htmlplayer-0.1.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "htmlplayer"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
   { name = "lenvy1", email = "lenvy1@163.com" }
 ]

{htmlplayer-0.1.0 → htmlplayer-0.1.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="htmlplayer",
-    version="0.1.0",
+    version="0.1.1",
     packages=find_packages(),
     include_package_data=True,
     description="一个简单的HTML视频播放器，使用Edge浏览器或系统默认浏览器播放视频",

htmlplayer-0.1.0/htmlplayer/core.py

@@ -1,121 +0,0 @@
-
-import subprocess
-import os
-
-
-def find_edge_browser():
-    edge_paths = [
-        r'C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe',
-        r'C:\Program Files\Microsoft\Edge\Application\msedge.exe',
-        os.path.expanduser(r'~\AppData\Local\Microsoft\Edge\Application\msedge.exe'),
-    ]
-    for path in edge_paths:
-        if os.path.exists(path):
-            return path
-    return None
-
-
-def calculate_window_size(screen_width=None, screen_height=None,
-                          video_aspect_ratio=16/9, scale=0.5):
-    if screen_width is None or screen_height is None:
-        import ctypes
-        user32 = ctypes.windll.user32
-        screen_width = user32.GetSystemMetrics(0)
-        screen_height = user32.GetSystemMetrics(1)
-
-    if video_aspect_ratio <= 0.6:
-        scale = 0.9
-
-    max_width = screen_width * scale
-    max_height = screen_height * scale
-
-    width = max_width
-    height = width / video_aspect_ratio
-
-    if height > max_height:
-        height = max_height
-        width = height * video_aspect_ratio
-
-    return int(width), int(height)
-
-
-def play_video(url, width=None, height=None, video_aspect_ratio=16/9,
-               use_edge=True, use_browser_fallback=True):
-    """
-    使用Edge浏览器或系统默认浏览器播放视频
-
-    参数:
-        url (str): 视频URL地址
-        width (int, optional): 窗口宽度
-        height (int, optional): 窗口高度
-        video_aspect_ratio (float): 视频宽高比，默认16:9
-        use_edge (bool): 是否优先使用Edge浏览器，默认True
-        use_browser_fallback (bool): Edge不可用时是否使用默认浏览器，默认True
-
-    返回:
-        bool: 播放是否成功启动
-    """
-    if not url or not isinstance(url, str):
-        raise ValueError("url参数无效，必须提供有效的URL字符串")
-
-    url = url.strip()
-    if not url.startswith('http'):
-        raise ValueError("url必须以http或https开头")
-
-    if width is None or height is None:
-        width, height = calculate_window_size(video_aspect_ratio=video_aspect_ratio)
-
-    edge_path = find_edge_browser() if use_edge else None
-
-    if edge_path:
-        subprocess.Popen([
-            edge_path,
-            '--app=' + url,
-            '--new-window',
-            f'--window-size={width},{height}',
-            '--disable-extensions',
-            '--disable-plugins',
-            '--inprivate'
-        ])
-        return True
-    elif use_browser_fallback:
-        import webbrowser
-        webbrowser.open(url)
-        return True
-    else:
-        return False
-
-
-def play_with_edge(url, width=None, height=None, video_aspect_ratio=16/9):
-    """
-    仅使用Edge浏览器播放视频
-
-    参数:
-        url (str): 视频URL地址
-        width (int, optional): 窗口宽度
-        height (int, optional): 窗口高度
-        video_aspect_ratio (float): 视频宽高比，默认16:9
-
-    返回:
-        bool: 播放是否成功启动
-    """
-    return play_video(url, width, height, video_aspect_ratio,
-                     use_edge=True, use_browser_fallback=False)
-
-
-def play_with_browser(url, width=None, height=None, video_aspect_ratio=16/9):
-    """
-    使用系统默认浏览器播放视频
-
-    参数:
-        url (str): 视频URL地址
-        width (int, optional): 窗口宽度
-        height (int, optional): 窗口高度
-        video_aspect_ratio (float): 视频宽高比，默认16:9
-
-    返回:
-        bool: 播放是否成功启动
-    """
-    return play_video(url, width, height, video_aspect_ratio,
-                     use_edge=False, use_browser_fallback=True)
-