lazysdk 0.1.87__py3-none-any.whl → 0.1.88__py3-none-any.whl

lazysdk/lazyfile.py

@@ -21,7 +21,8 @@ import xlrd
 import json
 import sys
 import os
-import zipfile
+# import zipfile
+from rich.progress import Progress
 from requests import exceptions
 
 headers_default = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Firefox/68.0"}
@@ -183,9 +184,9 @@ def download(
         temp_size = 0  # 已经下载文件大小
     else:
         temp_size = range_start + 0  # 已经下载文件大小
-    chunk_size = 1024  # 分割文件大小，字节B
+    chunk_size = 1024 * 1024  # 分割文件大小，字节B
     total_size = int(total_length)  # 文件总大小
-    total_size_mb = round(total_size / (1024 * 1024), 2)  # 换算到MB的文件大小
+    # total_size_mb = round(total_size / (1024 * 1024), 2)  # 换算到MB的文件大小
     # 添加文件大小控制，跳过下载超大文件
     if size_limit is None:
         pass
@@ -195,7 +196,6 @@ def download(
         else:
             pass
 
-    time_start = time.time()  # 获取下载开始时间
     is_finish = False
 
     if overwrite and os.path.exists(path_local):
@@ -216,54 +216,26 @@ def download(
         pass
 
     with open(path_local, "ab") as f:  # wb新建文件，a追加
-        for chunk in response.iter_content(chunk_size=chunk_size):
-            try:
-                temp_time_now = time.time()  # 时间采样
-                time_spend_total = temp_time_now - time_start
-                if time_spend_total == 0:
-                    total_speed = round((temp_size-range_start) / (1024 * 1024) / 0.001, 2)  # 计算速度：MB/s
-                else:
-                    total_speed = round((temp_size-range_start) / (1024 * 1024) / time_spend_total, 2)  # 计算速度：MB/s
-                if not chunk:
-                    if temp_size >= total_size:
-                        is_finish = True
-                    else:
-                        is_finish = False
-                    break
-                else:
-                    temp_size += len(chunk)
-                    f.write(chunk)
-                    f.flush()
-                    done = int(50 * temp_size / total_size)
-                    if total_speed == 0 or time_spend_total == 0:
-                        time_left = 0
-                    else:
-                        time_left = (total_size - temp_size) / total_speed / 1024 / 1024
-                    show_dict = {
-                        'finish_mark': '█' * done,
-                        'not_finish_mark': ' ' * (50 - done),
-                        'total_size': total_size_mb,  # 换算到M
-                        'total_percent': round(100 * temp_size / total_size, 4),
-                        'total_speed': total_speed,
-                        'finish_size': round(temp_size / (1024 * 1024), 2),
-                        'time_spend_total': int(time_spend_total),
-                        'time_left': int(time_left)
-                    }
-                    show_msg = "\r[%(finish_mark)s%(not_finish_mark)s] " \
-                               "总大小:%(total_size)sMB " \
-                               "总进度:%(total_percent)s%% " \
-                               "平均速度:%(total_speed)sMB/s " \
-                               "已下载:%(finish_size)sMB " \
-                               "已耗时 %(time_spend_total)s 秒 " \
-                               "预计剩余 %(time_left)s 秒" % show_dict
-                    sys.stdout.write(show_msg)
-                    sys.stdout.flush()
-                    if temp_size >= total_size:
-                        is_finish = True
+        with Progress() as progress:
+            task = progress.add_task(description="[red]Downloading...", total=total_size)
+            for chunk in response.iter_content(chunk_size=chunk_size):
+                try:
+                    if not chunk:
+                        if temp_size >= total_size:
+                            is_finish = True
+                        else:
+                            is_finish = False
+                        break
                     else:
-                        is_finish = False
-            except:
-                showlog.error('')
+                        f.write(chunk)
+                        f.flush()
+                        progress.update(task, advance=chunk_size)
+                        if temp_size >= total_size:
+                            is_finish = True
+                        else:
+                            is_finish = False
+                except:
+                    showlog.error('')
     print("\n  ==> 文件已全部下载完成，保存位置:", path_local)
     res_dict = {
         'file_dir': path_local,

lazysdk/lazytime.py

@@ -975,3 +975,13 @@ def get_recent_days_date(
         start_date=get_date_string(days=num_start),
         end_date=get_date_string(days=num_end)
     )
+
+
+def network_timestamp():
+    """
+    获取网络时间，精确到毫秒
+    """
+    url = 'https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp'  # 淘宝网络取时
+    res = requests.get(url=url)
+    net_t = res.json()['data']['t']  # 精确到毫秒的时间戳
+    return int(net_t)

{lazysdk-0.1.87.dist-info → lazysdk-0.1.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.87
+Version: 0.1.88
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker
@@ -22,6 +22,7 @@ Requires-Dist: pycryptodome ==3.10.1
 Requires-Dist: filetype ==1.2.0
 Requires-Dist: netifaces ==0.11.0
 Requires-Dist: user-agents ==2.2.0
+Requires-Dist: rich >=13.5.2
 
 # lazysdk
 ![](https://img.shields.io/badge/Python-3.8.6-green.svg)

{lazysdk-0.1.87.dist-info → lazysdk-0.1.88.dist-info}/RECORD

@@ -8,7 +8,7 @@ lazysdk/lazydecode.py,sha256=z3no94VDhxVxJCPQFwKxKTxz8v9Eikjk18TZWDttN6A,414
 lazysdk/lazydict.py,sha256=LOUUpsPlewgZEX3jb90BEA_C4haOSrXods5B1g1nt_k,8883
 lazysdk/lazyenv.py,sha256=P6HjO9cbBPzHD_Vs-Ww_GThDq-h9Wn31VSiu9OzTNWI,3024
 lazysdk/lazyexcel.py,sha256=adZTtQYuVZ2u5jMSRBJlKluGVdN7oHxJsLpxawV1ros,15835
-lazysdk/lazyfile.py,sha256=sJD9JHFm6IPd2U-j5KBY2EmMFek1uaBoUk2y6CsdGnU,21899
+lazysdk/lazyfile.py,sha256=SoOLCongBAx93QYBxU5jMc5F37e9BM7R9fzaB4LC1Cw,20263
 lazysdk/lazyflask.py,sha256=VUhJqtNz_evVyGOS40FKkkQWWrqGEUZ26cv1RQxS388,727
 lazysdk/lazyhtml.py,sha256=vTtiLPoAhWMzXsDBFsF0DoFSsKbfmuEPjPMOZI_n6ag,1867
 lazysdk/lazyid.py,sha256=tpiIjITLvYRVs9JASZZM2hvA-ngzoVFwGnepAzMhWT8,1287
@@ -24,14 +24,14 @@ lazysdk/lazyrandom.py,sha256=XZ8hTcNvc68FAI-BfaIt7QpCmzZ7m4RGDrfpy_U7zTw,1420
 lazysdk/lazyredis.py,sha256=78jM_tXNgUKULcp08CQEHmfAlzwlWuOsl6SuLwoLDdM,37918
 lazysdk/lazyrequests.py,sha256=qOUNkFhIThHNLALDTmOqPjKgMse5BVD-Kf9kheadMAY,3750
 lazysdk/lazytext.py,sha256=iJbdxU2hDK3q3ivLYoYTRHQJXSDYxR5F-yG6Hxl5mlQ,2052
-lazysdk/lazytime.py,sha256=GhSjpqTiccFvCbBZu3lYyT1JhZGcVRAE4tsCVvG4CtA,26224
+lazysdk/lazytime.py,sha256=3GHfck89GNg556gYCoCd5NpntybBU848gJ1Udv1jikk,26530
 lazysdk/lazyua.py,sha256=IqLmqGDECdJa3Wcr8h6sTxMErJZlCTM3Jk7IWm90UzI,4827
 lazysdk/lazyurl.py,sha256=N89QLK2A6vXr9gqp-9vnk9RXv_fOjw171lVl9eEoxtE,1550
 lazysdk/lazywebhook.py,sha256=HwJIZ5j3wUpnEfPkFY-Xq9T_9xdhCJ71dYsWNX22_3Y,8386
 lazysdk/lazywifi.py,sha256=FOvLPTcb6BQE6D8kjfB0TLpfgGxw8jqC3vZbTs6LbD4,716
 lazysdk/showdata.py,sha256=957JMXq7qfJ4ELpA3nBJwkyEUn6mRwtVXVBGYfZaCgg,1683
-lazysdk-0.1.87.dist-info/LICENSE,sha256=OC5E4ENUG6B4dGEVGwUpdsD-D9SZsCVC92NAgaqvE-c,1088
-lazysdk-0.1.87.dist-info/METADATA,sha256=1pGXswmyfkJU9HjPiwc3rZNvSqF05D6MO9q0KhT_s28,1853
-lazysdk-0.1.87.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-lazysdk-0.1.87.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
-lazysdk-0.1.87.dist-info/RECORD,,
+lazysdk-0.1.88.dist-info/LICENSE,sha256=OC5E4ENUG6B4dGEVGwUpdsD-D9SZsCVC92NAgaqvE-c,1088
+lazysdk-0.1.88.dist-info/METADATA,sha256=mYyr3bOyYlQOdzdOPUbO_3gODcsuNVNCa6dTLI1XQXk,1882
+lazysdk-0.1.88.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+lazysdk-0.1.88.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
+lazysdk-0.1.88.dist-info/RECORD,,