lazysdk 0.1.115__tar.gz → 0.1.117__tar.gz

{lazysdk-0.1.115 → lazysdk-0.1.117}/PKG-INFO

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

lazysdk-0.1.117/lazysdk/lazy_input.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+# coding = utf8
+from lazysdk import showdata
+
+
+def convert2dict(header_str: str):
+    header_temp = header_str.split('\n')
+    header_dict = dict()
+    for each in header_temp:
+        if len(each) == 0:
+            continue
+        else:
+            each_split = each.split(': ')
+            header_dict[each_split[0]] = each_split[1]
+    return header_dict
+
+
+def get_lines():
+    lines = []
+    print("请输入多行数据，以空行结束：")
+    while True:
+        line = input()
+        if line:
+            lines.append(line)
+        else:
+            break
+
+    print("您输入的多行数据是：")
+    return "\n".join(lines)
+
+
+if __name__ == '__main__':
+    test_lines = get_lines()
+    showdata.show_dict(convert2dict(header_str=test_lines))
+

{lazysdk-0.1.115 → lazysdk-0.1.117}/lazysdk/lazyexcel.py

@@ -233,7 +233,8 @@ def save_xlsx(
         datetime_cols: list = None,
         num_cols: list = None,
         col_name_dict: dict = None,
-        col_name_sort: list = None
+        col_name_sort: list = None,
+        cell_number_format: dict = None
 ):
     """
     如果输入的value是乱序，将重新排序
@@ -244,6 +245,7 @@ def save_xlsx(
     :param num_cols: 数字列列表
     :param col_name_dict: 自定义列名的对照关系，规则为：{'旧名称1':'新名称1', '旧名称2':'新名称2'}
     :param col_name_sort: 自定义列名排序，将按照列表顺序排，如果不在列表中，将随机
+    :param cell_number_format: 自定义列数据格式，例如{"a": "0.00", "b": "0.00%"}
     将输出保存后的文件绝对路径
     """
     if os.path.isabs(file):  # 判断是否为绝对路径
@@ -339,11 +341,14 @@ def save_xlsx(
                         value = each.get(key)
                         if isinstance(value, dict) or isinstance(value, list):
                             value = json.dumps(value, ensure_ascii=False)
-                        sheet.cell(
+                        cell = sheet.cell(
                             row=row_num,
                             column=col_num,
                             value=value
                         )
+                        value_cell_number_format = cell_number_format.get(key)
+                        if value_cell_number_format:
+                            cell.number_format = value_cell_number_format  # 设置单元格数据格式
                         col_num += 1
                     row_num += 1
             else:

{lazysdk-0.1.115 → lazysdk-0.1.117}/lazysdk/lazywebhook.py

@@ -259,7 +259,7 @@ def send_text(
                         return response
                     time.sleep(1)
     elif webhook_hostname == 'open.feishu.cn':
-        lazyrequests.lazy_requests(
+        return lazyrequests.lazy_requests(
             url=webhook,
             method="POST",
             headers={"Content-Type": "application/json"},
@@ -267,9 +267,54 @@ def send_text(
         )
     elif webhook_hostname == 'api.day.app':
         # 支持简单的Bark推送
-        lazyrequests.lazy_requests(
+        return lazyrequests.lazy_requests(
             url=webhook,
             method="GET"
         )
     else:
         return {'errcode': -2, 'errmsg': '暂不支持此webhook'}
+
+
+def send(
+        msg: str = None,
+
+        env_file_name: str = None,
+        webhook: str = None,
+        webhooks: list = None,
+        at_ids: list = None,
+        at_mobiles: list = None,
+        is_at: bool = None,
+        at_all: bool = None,
+        ensure_success: bool = False,
+        ensure_success_limit: int = 60
+):
+    webhooks_all = list()
+    send_res = list()
+    if webhook:
+        webhooks_all.append(webhook)
+    if webhooks:
+        webhooks_all.extend(webhooks)
+
+    if not webhooks_all:
+        showlog.warning("无有效的webhook地址")
+    else:
+        for each_index, each_webhook in enumerate(webhooks_all):
+            showlog.info(f"正在发送第 {each_index+1}/{len(webhooks_all)} 条推送: \n{msg}\n")
+            each_send_res = send_text(
+                msg=msg,
+                env_file_name=env_file_name,
+                webhook=each_webhook,
+                at_ids=at_ids,
+                at_mobiles=at_mobiles,
+                is_at=is_at,
+                at_all=at_all,
+                ensure_success=ensure_success,
+                ensure_success_limit=ensure_success_limit
+            )
+            send_res.append({
+                "webhook": each_webhook,
+                "msg": msg,
+                "send_res": each_send_res,
+            })
+
+    return send_res

{lazysdk-0.1.115 → lazysdk-0.1.117}/lazysdk.egg-info/PKG-INFO

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

{lazysdk-0.1.115 → lazysdk-0.1.117}/lazysdk.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ lazysdk/__init__.py
 lazysdk/lazyCrypto.py
 lazysdk/lazy_header.py
 lazysdk/lazy_id_card.py
+lazysdk/lazy_input.py
 lazysdk/lazybase64.py
 lazysdk/lazycache.py
 lazysdk/lazychromedriver.py

{lazysdk-0.1.115 → lazysdk-0.1.117}/setup.py

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