lazysdk 0.1.86__tar.gz → 0.1.88__tar.gz

{lazysdk-0.1.86 → lazysdk-0.1.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.86
+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.86 → lazysdk-0.1.88}/lazysdk/lazyexcel.py

@@ -7,6 +7,7 @@
 @ Gitee : https://gitee.com/ZeroSeeker
 """
 import decimal
+import json
 from collections import OrderedDict
 from . import lazydict
 import openpyxl  # 用于处理.xlsx，文档：https://openpyxl.readthedocs.io/en/stable/
@@ -335,10 +336,13 @@ def save_xlsx(
                 for each in sheet_data_f:
                     col_num = 1
                     for key in each:
+                        value = each.get(key)
+                        if isinstance(value, dict) or isinstance(value, list):
+                            value = json.dumps(value, ensure_ascii=False)
                         sheet.cell(
                             row=row_num,
                             column=col_num,
-                            value=each.get(key)
+                            value=value
                         )
                         col_num += 1
                     row_num += 1

{lazysdk-0.1.86 → lazysdk-0.1.88}/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-0.1.86 → lazysdk-0.1.88}/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.86 → lazysdk-0.1.88}/lazysdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.86
+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.86 → lazysdk-0.1.88}/lazysdk.egg-info/requires.txt

@@ -10,3 +10,4 @@ pycryptodome==3.10.1
 filetype==1.2.0
 netifaces==0.11.0
 user_agents==2.2.0
+rich>=13.5.2

{lazysdk-0.1.86 → lazysdk-0.1.88}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.86",
+    version="0.1.88",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -38,6 +38,7 @@ setuptools.setup(
         'pycryptodome==3.10.1',
         'filetype==1.2.0',
         'netifaces==0.11.0',
-        'user_agents==2.2.0'
+        'user_agents==2.2.0',
+        'rich>=13.5.2'
     ]
 )