py2ls 0.1.10.11__tar.gz → 0.1.10.12__tar.gz

{py2ls-0.1.10.11 → py2ls-0.1.10.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.10.11
+Version: 0.1.10.12
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.10.11 → py2ls-0.1.10.12}/py2ls/ips.py

@@ -58,11 +58,45 @@ except NameError:
     pass
 
 
+def unique(lst, ascending=None):
+    """
+    移除列表中的重复元素，同时可以选择按升序或降序排序。
+
+    参数:
+    lst (list): 输入的列表，其中可能包含重复的元素。
+    ascending (bool, 可选): 如果为 True，则按升序排序；如果为 False，则按降序排序；如果为 None，则不排序，只移除重复元素。
+
+    返回:
+    list: 一个列表，其中的元素是唯一的，顺序根据参数 `ascending` 进行排序。
+    """
+    if ascending is not None:
+        # 移除重复项
+        unique_items = list(set(lst))
+        # 统一元素类型（例如，转换为字符串）
+        try:
+            unique_items = sorted(
+                unique_items, key=lambda x: str(x), reverse=not ascending
+            )
+        except TypeError:
+            # 如果排序失败（例如，元素类型不一致），返回原始去重列表
+            return unique_items
+        return unique_items
+    else:
+        # 移除重复项同时保持原始顺序
+        seen = set()  # 用于记录已见的元素
+        result = []  # 用于存储结果
+        for item in lst:
+            if item not in seen:
+                seen.add(item)  # 记录该元素
+                result.append(item)  # 添加到结果列表中
+        return result
+
+
 # ************* below section: run_when *************
-def run_when(when: str = "every 2 min", job=None, sleep: int = 1):
+def run_when(when: str = "every 2 min", job=None, wait: int = 60):
     if "every" in when.lower():
         when = when.replace("every", "")
-        run_every(when=when, job=job, sleep=sleep)
+        run_every(when=when, job=job, wait=wait)
     elif any([i in when.lower() for i in ["at", "@", ":", "am", "pm"]]):
         time_words = ["at", "@", ":", "am", "pm"]
         # 判断'时间词'是否存在
@@ -71,10 +105,10 @@ def run_when(when: str = "every 2 min", job=None, sleep: int = 1):
         true_indices = [index for index, value in enumerate(time_words_bool) if value]
         time_word = time_words[true_indices[0]]  # 找到第一个'时间词'
         when = when.replace(time_word, "")  # 去除 时间词
-        run_at(when=when, job=job, sleep=sleep)
+        run_at(when=when, job=job, wait=wait)
 
 
-def run_every(when: str = None, job=None, sleep: int = 1):
+def run_every(when: str = None, job=None, wait: int = 60):
     """
     Schedules a job to run at the given interval.
 
@@ -108,7 +142,8 @@ def run_every(when: str = None, job=None, sleep: int = 1):
     # Keep the script running to execute the schedule
     while True:
         schedule.run_pending()
-        time.sleep(sleep)  # in seconds
+        time.sleep(wait)  # in seconds
+    time.sleep(wait)  # in seconds
 
 
 # # usage:
@@ -117,13 +152,13 @@ def run_every(when: str = None, job=None, sleep: int = 1):
 # run_every(when="1 sec", job=job)
 
 
-def run_at(when: str, job=None, sleep: int = 60):
+def run_at(when: str, job=None, wait: int = 60):
     """
     Schedules a job to run at an exact time of the day.
 
     :param when: String specifying the time, e.g. '1:30 pm','1.30 am','14:30', '1:30 pm', '8:45 am'.
     :param job: The function to be scheduled.
-    :param sleep: The sleep interval between checks in seconds.
+    :param wait: The sleep interval between checks in seconds.
     """
     if job is None:
         print("No job provided!")
@@ -159,10 +194,10 @@ def run_at(when: str, job=None, sleep: int = 60):
         ):
             job()  # Run the job
             time.sleep(
-                60
+                wait
             )  # Sleep for a minute to avoid running the job multiple times in the same minute
 
-        time.sleep(sleep)  # Sleep to avoid excessive CPU usage
+        time.sleep(wait)  # wait to avoid excessive CPU usage
 
 
 # # Example usage:
@@ -661,21 +696,9 @@ def str2num(s, *args, **kwargs):
 # print(str2num('111113.34555',3,',')) # Output: 111,113.346
 # print(str2num("123.55555 sec miniuets",3)) # Output: 1.3
 # print(str2num("every 3,300.55 hours and 5.045555 min", sep=",", round=1))
-
-
-def text2num(text):
-    # extract the digital nums from a text
-    num = []
-    for s in ssplit(text, by="digital"):
-        try:
-            if float(s):
-                num.append(float(s))
-        except:
-            pass
-    if len(num) == 1:
-        return num[0]
-    else:
-        return num
+# print(str2num("five hundred fourty one"), str2num(
+#     "this is 5.9435 euros for 10.04499 killograme", round=3
+# )[0])
 
 
 def num2str(num, *args, **kwargs):
@@ -712,11 +735,13 @@ def num2str(num, *args, **kwargs):
 
 
 # Examples
-# print(num2str(123),type(num2str(123)))                # Output: "123"
-# print(num2str(123.456, 2),type(num2str(123.456, 2)))         # Output: "123.46"
-# print(num2str(7000.125, 2),type(num2str(7000.125, 2)))        # Output: "7000.13"
-# print(num2str(12345.6789, ","),type(num2str(12345.6789, ",")))    # Output: "12,345.6789"
-# print(num2str(7000.00, ","),type(num2str(7000.00, ",")))       # Output: "7,000.00"
+# print(num2str(123), type(num2str(123)))  # Output: "123"
+# print(num2str(123.456, round=2), type(num2str(123.456, 2)))  # Output: "123.46"
+# print(num2str(7000.125, round=1), type(num2str(7000.125, 2)))  # Output: "7000.13"
+# print(
+#     num2str(12345333.6789, sep=","), type(num2str(12345.6789, ","))
+# )  # Output: "12,345.6789"
+# print(num2str(7000.00, sep=","), type(num2str(7000.00, ",")))  # Output: "7,000.00"
 def sreplace(*args, **kwargs):
     """
     sreplace(text, by=None, robust=True)

{py2ls-0.1.10.11 → py2ls-0.1.10.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py2ls"
-version = "0.1.10.11"
+version = "0.1.10.12"
 description = "py(thon)2(too)ls"
 authors = ["Jianfeng <Jianfeng.Liu0413@gmail.com>"]
 readme = "README.md"