CheeseSignal 1.2.0__py2.py3-none-any.whl → 1.2.1__py2.py3-none-any.whl

CheeseSignal/signal.py

@@ -153,9 +153,6 @@ class Signal:
             - expected_receive_num: 期望接受信号的次数，超过该次数则不再响应信号；0为无限次。
 
             - auto_remove: 是否自动删除响应次数超出期望次数的接收器。
-
-        - Raise
-            - ValueError: 已有重复的函数接收器。
         '''
 
     @overload
@@ -175,9 +172,6 @@ class Signal:
             - expected_receive_num: 期望接受信号的次数，超过该次数则不再响应信号；0为无限次。
 
             - auto_remove: 是否自动删除响应次数超出期望次数的接收器。
-
-        - Raise
-            - ValueError: 已有重复的函数接收器。
         '''
 
     def connect(self, arg1: Callable | None = None, *, expected_receive_num: int = 0, auto_remove: bool = False, runType: Literal['ORDERED', 'CONCURRENT', 'NO_WAIT'] = 'ORDERED'):
@@ -190,9 +184,8 @@ class Signal:
         self._connect(arg1, expected_receive_num = expected_receive_num, auto_remove = auto_remove, runType = runType)
 
     def _connect(self, fn: Callable, *, expected_receive_num: int, auto_remove: bool, runType: Literal['ORDERED', 'CONCURRENT', 'NO_WAIT']):
-        for receiver in self.receivers:
-            if receiver.fn == fn:
-                raise ValueError('已有重复的函数接收器')
+        if any(receiver.fn == fn for receiver in self.receivers):
+            raise ValueError('已有重复的函数接收器')
 
         self.receivers.append(Receiver(self, fn, expected_receive_num = expected_receive_num, auto_remove = auto_remove, runType = runType))
 
@@ -211,6 +204,9 @@ class Signal:
 
         self._total_send_num += 1
 
+        if not self.receivers:
+            return []
+
         results = []
         for receiver in self.receivers[:]:
             if receiver.active and receiver.is_unexpired:
@@ -243,6 +239,10 @@ class Signal:
         '''
 
         self._total_send_num += 1
+
+        if not self.receivers:
+            return [], []
+
         receivers = [receiver for receiver in self.receivers.copy() if receiver.active and receiver.is_unexpired]
 
         [asyncio.create_task(receiver.fn(*args, **kwargs)) for receiver in receivers if receiver.runType == 'NO_WAIT']
@@ -250,6 +250,11 @@ class Signal:
         concurrent_results = await asyncio.gather(*concurrent_tasks) if concurrent_tasks else []
         ordered_results = [await receiver.fn(*args, **kwargs) for receiver in receivers if receiver.runType == 'ORDERED']
 
+        for receiver in receivers:
+            receiver._total_receive_num += 1
+            if receiver.is_expired:
+                self.receivers.remove(receiver)
+
         return concurrent_results, ordered_results
 
     def disconnect(self, fn: Callable):
@@ -318,7 +323,7 @@ class Signal:
 
     def index(self, fn: Callable) -> int:
         '''
-        获取接收器的顺序位置。
+        获取接收器的顺序位置；若`runType != 'ORDERED'`，则为-1。
 
         >>> from CheeseSignal import Signal
         >>>
@@ -334,11 +339,9 @@ class Signal:
             - ValueError: 未找到该函数的接收器。
         '''
 
-        i = 0
-        for receiver in self.receivers:
+        for i, receiver in enumerate(self.receivers):
             if receiver.fn == fn:
-                return i
-            i += 1
+                return i + 1 if receiver.runType == 'ORDERED' else -1
 
         raise ValueError('未找到该函数的接收器')
 

{cheesesignal-1.2.0.dist-info → cheesesignal-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: CheeseSignal
-Version: 1.2.0
+Version: 1.2.1
 Summary: 一款简约的信号系统。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseSignal
 Author-email: Cheese Unknown <cheese@cheese.ren>
@@ -66,7 +66,7 @@ signal = Signal()
 
 【只读】 总计信号发送次数。
 
-#### **`def connect(self, fn: Callable, *, expected_receive_num: int = 0, auto_remove: bool = False)`**
+#### **`def connect(self, fn: Callable, *, expected_receive_num: int = 0, auto_remove: bool = False, runType: Literal['ORDERED', 'CONCURRENT', 'NO_WAIT'] = 'ORDERED')`**
 
 通过函数注册响应函数。
 
@@ -76,11 +76,19 @@ signal = Signal()
 
     - `auto_remove`: 是否自动删除响应次数超出期望次数的接收器。
 
+    - `runType`: 运行的方式，仅在`async_send`时有效。
+
+        - ORDERED: 按顺序执行，返回结果。
+
+        - CONCURRENT: 并行执行，返回结果。
+
+        - NO_WAIT: 并行执行，不阻塞代码。
+
 - **报错**
 
     - `ValueError`: 已有重复的函数接收器。
 
-#### **`def connect(self, *, expected_receive_num: int = 0, auto_remove: bool = False)`**
+#### **`def connect(self, *, expected_receive_num: int = 0, auto_remove: bool = False, runType: Literal['ORDERED', 'CONCURRENT', 'NO_WAIT'] = 'ORDERED')`**
 
 通过装饰器注册响应函数。
 
@@ -90,6 +98,14 @@ signal = Signal()
 
     - `auto_remove`: 是否自动删除响应次数超出期望次数的接收器。
 
+    - `runType`: 运行的方式，仅在`async_send`时有效。
+
+        - ORDERED: 按顺序执行，返回结果。
+
+        - CONCURRENT: 并行执行，返回结果。
+
+        - NO_WAIT: 并行执行，不阻塞代码。
+
 - **报错**
 
     - `ValueError`: 已有重复的函数接收器。
@@ -164,9 +180,9 @@ print(signal.get_receiver(receiver))
 
     - `ValueError`: 未找到该函数的接收器。
 
-#### **`def index(self, fn: Callable) -> index`**
+#### **`def index(self, fn: Callable) -> int`**
 
-获取接收器的顺序位置。
+获取接收器的顺序位置；若`runType != 'ORDERED'`，则为-1。
 
 ```python
 from CheeseSignal import Signal
@@ -192,7 +208,7 @@ print(signal.index(receiver))
 from CheeseSignal import Receiver
 ```
 
-#### **`def __init__(self, signal: Signal, fn: Callable, *, expected_receive_num: int, auto_remove: bool)`**
+#### **`def __init__(self, signal: Signal, fn: Callable, *, expected_receive_num: int, auto_remove: bool, runType: Literal['ORDERED', 'CONCURRENT', 'NO_WAIT'] = 'ORDERED')`**
 
 - **参数**
 
@@ -200,6 +216,14 @@ from CheeseSignal import Receiver
 
     - `auto_remove`: 是否自动删除响应次数超出期望次数的接收器。
 
+    - `runType`: 运行的方式，仅在`async_send`时有效。
+
+        - ORDERED: 按顺序执行，返回结果。
+
+        - CONCURRENT: 并行执行，返回结果。
+
+        - NO_WAIT: 并行执行，不阻塞代码。
+
 #### **`self.expected_receive_num: int`**
 
 期望接受信号的次数，超过该次数则不再响应信号；0为无限次。
@@ -232,6 +256,16 @@ from CheeseSignal import Receiver
 
 【只读】 是否未过期。
 
+#### **`self.runType: Literal['ORDERED', 'CONCURRENT', 'NO_WAIT']`**
+
+【只读】 运行的方式，仅在`async_send`时有效。
+
+- ORDERED: 按顺序执行，返回结果。
+
+- CONCURRENT: 并行执行，返回结果。
+
+- NO_WAIT: 并行执行，不阻塞代码。
+
 #### **`def reset(self)`**
 
 重统计置数据。

cheesesignal-1.2.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+CheeseSignal/__init__.py,sha256=--LvG_YyRo9N3ubHlhunm4FiiMD60hM2LsdB9uiprPM,49
+CheeseSignal/signal.py,sha256=EqI99dbN7Wyxb7hvd3h9JQWruHeRHOKcHbXp4DwSfqs,11019
+cheesesignal-1.2.1.dist-info/METADATA,sha256=3obooywZfLiOHcegmLzSU1tqml1ZrIZfklxI9aniaf4,6334
+cheesesignal-1.2.1.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
+cheesesignal-1.2.1.dist-info/licenses/LICENSE,sha256=5vFb3i4UDlskszJ3jGPh8bXrM_axJfDRRuvLu1M3bIs,1070
+cheesesignal-1.2.1.dist-info/RECORD,,

cheesesignal-1.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-CheeseSignal/__init__.py,sha256=--LvG_YyRo9N3ubHlhunm4FiiMD60hM2LsdB9uiprPM,49
-CheeseSignal/signal.py,sha256=sxPyXtRIxgt23uTxn2SQjoF1QSIeRZxqz1MGwzij7to,10842
-cheesesignal-1.2.0.dist-info/METADATA,sha256=09TA7w_cQcne48pQILYiOrSl-5K0sjat4KVUvo7jvuI,5141
-cheesesignal-1.2.0.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
-cheesesignal-1.2.0.dist-info/licenses/LICENSE,sha256=5vFb3i4UDlskszJ3jGPh8bXrM_axJfDRRuvLu1M3bIs,1070
-cheesesignal-1.2.0.dist-info/RECORD,,