lazysdk 0.1.2__tar.gz → 0.1.4__tar.gz

{lazysdk-0.1.2 → lazysdk-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.2
+Version: 0.1.4
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.2 → lazysdk-0.1.4}/lazysdk/lazym3u8.py

@@ -5,6 +5,7 @@ from . import lazytime
 from . import lazyfile
 from . import lazypath
 from . import lazymd5
+from . import lazyprocess
 import subprocess
 import threading
 import requests
@@ -16,6 +17,7 @@ import time
 import sys
 import os
 import re
+from rich.progress import track
 
 
 timeout = 10
@@ -435,7 +437,7 @@ def download_fragment(
     :return:
     """
     if headers is None:
-        headers_local = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36"}
+        headers_local = default_headers
     else:
         headers_local = headers
 
@@ -452,17 +454,18 @@ def download_fragment(
     fragment_file_name_list = list()
     print('开始下载...')
     for index, each_url in enumerate(url_list):
-        print(each_url)
+        print('正在下载', each_url)
         fragment_file_name = '%s%s%s.%s' % (fragment_path_new, path_separator, index, fragment_suffix)  # 生成碎片文件名
         # 开始下载碎片文件
         while True:
             try:
                 with open(fragment_file_name, "ab+") as f:
-                    time_pre = time.time()
-                    response = requests.get(url=each_url,
-                                            headers=headers_local,
-                                            stream=True,
-                                            timeout=10)
+                    response = requests.get(
+                        url=each_url,
+                        headers=headers_local,
+                        stream=True,
+                        timeout=timeout
+                    )
                     total_length = response.headers.get('content-length')
 
                     if total_length is None:
@@ -470,9 +473,12 @@ def download_fragment(
                     else:
                         dl = 0
                         total_length = int(total_length)
-                        char_list = ['\\', '|', '/', '-']
-                        _index_ = 0
-                        for data in response.iter_content(chunk_size=8192):
+                        for data in track(
+                                sequence=response.iter_content(chunk_size=8192),
+                                description='下载中',
+                                total=total_length/8192,
+                                show_speed=True
+                        ):
                             dl += len(data)
                             if aes_key is None:
                                 data_decode = data
@@ -480,18 +486,9 @@ def download_fragment(
                                 data_decode = lazyCrypto.aes_decode(data, aes_key)
                             f.write(data_decode)
                             f.flush()
-                            done = int(40 * dl / total_length)
-                            time_now = time.time()
-                            sys.stdout.write("\r第 [ %s/%s ] 部分下载中: %s [%s%s] %.2f%%  %.2fMB / %.2fMB SPEED: %.2fMB/s" % (
-                            index + 1, len(url_list), char_list[_index_], '=' * done, ' ' * (40 - done), (dl / total_length) * 100,
-                            dl / 1000000, total_length / 1000000, (dl / (1024.0 * 1024.0 * 1024.0)) / ((time_now - time_pre) / 1000)))
-                            sys.stdout.flush()
-                            _index_ = (_index_ + 1) % len(char_list)
-                    # print("")
                 break
             except:
-                print('下载超时，将在1秒后重试...')
-                showlog.error('')
+                showlog.warning('下载超时，将在1秒后重试...')
                 os.remove(fragment_file_name)
                 time.sleep(1)
                 pass
@@ -507,6 +504,103 @@ def download_fragment(
     return download_res
 
 
+def download_fragment_single(
+        task_index,
+        task_info,
+):
+    """
+    模块功能：下载单个碎片到指定文件夹
+    :param fragment_url: 碎片下载地址
+    :param fragment_url_name: 碎片名
+    :param fragment_path:碎片保存路径
+    :param aes_key: aes解密key
+    :param headers:请求头
+    :param fragment_suffix:碎片文件后缀名
+    :return:
+    """
+    fragment_url = task_info['fragment_url']
+    fragment_url_name = task_info['fragment_url_name']
+    fragment_path = task_info['fragment_path']
+    aes_key = None,
+    headers = None,
+    fragment_suffix = task_info['fragment_suffix']
+
+    if headers is None:
+        headers_local = default_headers
+    else:
+        headers_local = headers
+
+    print('正在下载', fragment_url_name, fragment_url)
+    fragment_file_name = '%s%s%s.%s' % (fragment_path, path_separator, fragment_url_name, fragment_suffix)  # 生成碎片文件名
+    # 开始下载碎片文件
+    while True:
+        try:
+            with open(fragment_file_name, "ab+") as f:
+                response = requests.get(
+                    url=fragment_url,
+                    headers=headers_local,
+                    stream=True,
+                    timeout=timeout
+                )
+                total_length = response.headers.get('content-length')
+
+                if total_length is None:
+                    print("Attention: There is no content length in header!")  # 未返回长度信息
+                else:
+                    dl = 0
+                    total_length = int(total_length)
+                    for data in track(
+                            sequence=response.iter_content(chunk_size=8192),
+                            description='下载中',
+                            total=total_length/8192,
+                            show_speed=True
+                    ):
+                        dl += len(data)
+                        if aes_key is None:
+                            data_decode = data
+                        else:
+                            data_decode = lazyCrypto.aes_decode(data, aes_key)
+                        f.write(data_decode)
+                        f.flush()
+            break
+        except:
+            showlog.warning('下载超时，将在1秒后重试...')
+            os.remove(fragment_file_name)
+            time.sleep(1)
+            pass
+
+
+def download_fragment_quick(
+        url_list
+):
+    fragment_path = 'fragment_%s' % str(time.time()).replace('.', '')  # 使用时间戳命名
+    fragment_suffix = 'ts'
+    lazypath.make_path(fragment_path)
+    task_list = list()
+    fragment_file_name_list = list()
+    for url_index, each_url in enumerate(url_list):
+        task_list.append(
+            {
+                'fragment_url': each_url,
+                'fragment_url_name': url_index,
+                'fragment_path': fragment_path,
+                'fragment_suffix': fragment_suffix
+            }
+        )
+        fragment_file_name = '%s%s%s.%s' % (fragment_path, path_separator, url_index, fragment_suffix)  # 生成碎片文件名
+        fragment_file_name_list.append(fragment_file_name)
+    lazyprocess.run(
+        task_list=url_list,
+        task_function=download_fragment_single
+    )
+    download_res = {
+        'fragment_path': fragment_path,
+        'fragment_suffix': fragment_suffix,
+        'fragment_file_name_list': fragment_file_name_list
+    }
+    return download_res
+
+
 def download_m3u8(
         m3u8_link=None,
         m3u8_file_path=None,
@@ -742,8 +836,3 @@ def convert_video(
     flags = ["ffmpeg", "-i", f"{video_input}.ts", "-acodec", "copy", "-vcodec", "copy", video_output]
     subprocess.Popen(flags, stdout=subprocess.DEVNULL).wait()
     # os.unlink(f"{video_input}.ts")  # 删除文件
-
-
-if __name__ == '__main__':
-    test_m3u8_url = input('请输入需要下载的m3u8地址：')
-    download_m3u8_to_file(m3u8_url=test_m3u8_url)

{lazysdk-0.1.2 → lazysdk-0.1.4}/lazysdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.2
+Version: 0.1.4
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.2 → lazysdk-0.1.4}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.2",
+    version="0.1.4",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",