reykit 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

reykit/rsystem.py

@@ -208,7 +208,13 @@ def del_modules(path: str) -> list[str]:
     return deleted_dict
 
 
-def dos_command(command: str | Iterable[str]) -> str:
+@overload
+def dos_command(command: str | Iterable[str], read: False = False) -> None: ...
+
+@overload
+def dos_command(command: str | Iterable[str], read: True = False) -> str: ...
+
+def dos_command(command: str | Iterable[str], read: bool = False) -> str | None:
     """
     Execute DOS command.
 
@@ -218,26 +224,22 @@ def dos_command(command: str | Iterable[str]) -> str:
         - `str`: Use this command.
         - `Iterable[str]`: Join strings with space as command.
             When space in the string, automatic add quotation mark (e.g., ['echo', 'a b'] -> 'echo 'a b'').
+    read : Whether read command output, will block.
 
     Returns
     -------
-    Command standard output.
+    Command standard output or None.
     """
 
     # Execute.
     popen = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
 
-    # Check.
-    error_bytes: bytes = popen.stderr.read()
-    if error_bytes != b'':
-        error = error_bytes.decode('GBK')
-        throw(value=error)
-
-    # Standard output.
-    output_bytes: bytes = popen.stdout.read()
-    output = output_bytes.decode('GBK')
+    # Output.
+    if read:
+        output_bytes: bytes = popen.stdout.read()
+        output = output_bytes.decode('GBK')
 
-    return output
+        return output
 
 
 def dos_command_var(*vars: Any) -> list[Any]:
@@ -1265,6 +1267,10 @@ def popup_ask(
         - `Literal['yes_no_cancel']`: Buttons are `yes` and `no` and `cancel`.
     message : Ask box content.
     title : Ask box title.
+
+    Returns
+    -------
+    Ask result.
     """
 
     # Pop up.
@@ -1296,7 +1302,7 @@ def popup_select(
     init_folder : str | None = None,
     init_file : str | None = None,
     filter_file : list[tuple[str, str | list[str]]] | None = None
-) -> str: ...
+) -> str | None: ...
 
 @overload
 def popup_select(
@@ -1305,14 +1311,14 @@ def popup_select(
     init_folder : str | None = None,
     init_file : str | None = None,
     filter_file : list[tuple[str, str | list[str]]] | None = None
-) -> tuple[str, ...]: ...
+) -> tuple[str, ...] | None: ...
 
 @overload
 def popup_select(
     style: Literal['folder'] = 'file',
     title : str | None = None,
     init_folder : str | None = None
-) -> str: ...
+) -> str | None: ...
 
 def popup_select(
     style: Literal['file', 'files', 'folder', 'save'] = 'file',
@@ -1320,7 +1326,7 @@ def popup_select(
     init_folder : str | None = None,
     init_file : str | None = None,
     filter_file : list[tuple[str, str | list[str]]] | None = None
-) -> str | tuple[str, ...]:
+) -> str | tuple[str, ...] | None:
     """
     Pop up system select box.
 
@@ -1337,6 +1343,11 @@ def popup_select(
     filter_file : Filter file.
         - `tuple[str, str]`: Filter name and filter pattern.
         - `tuple[str, list[str]]`: Filter name and multiple filter patterns (or).
+
+    Returns
+    -------
+    File or folder path.
+        - `None`: Close select box.
     """
 
     # Pop up.
@@ -1370,5 +1381,6 @@ def popup_select(
             method = tkinter_asksaveasfilename
 
     path = method(**kwargs)
+    path = path or None
 
     return path

reykit/rtime.py

@@ -433,10 +433,11 @@ def wait(
     *args: Any,
     _interval: float = 1,
     _timeout: float | None = None,
+    _raising: bool = True,
     **kwargs: Any
-) -> float:
+) -> float | None:
     """
-    Wait success, timeout throw exception.
+    Wait success.
 
     Parameters
     ----------
@@ -446,11 +447,12 @@ def wait(
     _timeout : Timeout seconds, timeout throw exception.
         - `None`: Infinite time.
         - `float`: Use this time.
+    _raising : When timeout, whether throw exception, otherwise return None.
     kwargs : Keyword arguments of decorated function.
 
     Returns
     -------
-    Total spend seconds.
+    Total spend seconds or None.
     """
 
     # Set parameter.
@@ -477,7 +479,12 @@ def wait(
             ## Timeout.
             rtm()
             if rtm.total_spend > _timeout:
-                throw(TimeoutError, _timeout)
+
+                ### Throw exception.
+                if _raising:
+                    throw(TimeoutError, _timeout)
+
+                return
 
             ## Sleep.
             sleep(_interval)

{reykit-1.1.2.dist-info → reykit-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.2
+Version: 1.1.4
 Summary: Rey's kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.2.dist-info → reykit-1.1.4.dist-info}/RECORD

@@ -14,17 +14,17 @@ reykit/rrandom.py,sha256=fMeorpkjWAAtjD2oZCux3tpYuD2RRoBSkWI0M6NPM5Q,9102
 reykit/rregex.py,sha256=XTlnDLior8yyncFdrTr9FsVlBcqMXvsWRfpmvQS-BR8,6089
 reykit/rschedule.py,sha256=7EH_6TdEhwV-T6YyBEGYEcy85I1vTSNutDci-e_veTY,5796
 reykit/rstdout.py,sha256=vSvD4QjYybNiGnowWLXRU6q1u9ERPjr8YTXgq82eYDU,9648
-reykit/rsystem.py,sha256=LG0I4ZZjr-Bxfy6zbCqz3WvSG_bGYwtaBLowTHQ0mzY,34332
+reykit/rsystem.py,sha256=8goz-IL26EpVSDgDg47Qe3U10vhze4modHIhR2dpmYI,34651
 reykit/rtable.py,sha256=gXszf_9DE_5SMdNcxMX-xd4IpHGQVjGsN3NQIm7wVGY,12055
 reykit/rtext.py,sha256=whaKpVkd36yYVtCmZ1ptp_TVRL1v3f7Jab0vPXC8wXY,11089
-reykit/rtime.py,sha256=bV1sB_FHcqNJAP9L7WmYMZul3HrQM2QU9a2Q1zN98Aw,16980
+reykit/rtime.py,sha256=nye9VIpFiAVL4Dg3ILxotVxHyXOigg_YJIZUlKITsq8,17176
 reykit/rtype.py,sha256=HQFllZjKHPnGYLS-zTwC948Rt0HVsGY12eObjwFfOSo,1962
 reykit/rwrap.py,sha256=AJBYTDLHLGlMSiGIKoVkCsQk-Y4nDHWWFVCdnz5Bwdk,15222
 reykit/rzip.py,sha256=i6KkmeSWCnq025d-O1mbuCYezNRUhyY9OGVK0CRlNAM,3522
 reykit/rdll/__init__.py,sha256=vM9V7wSNno-WH9RrxgHTIgCkQm8LmBFoLFO8z7qovNo,306
 reykit/rdll/rdll_inject.py,sha256=bETl8tywtN1OiQudbA21u6GwBM_bqVX7jbiisNj_JBg,645
 reykit/rdll/rdll_inject_core.py,sha256=Trgh_pdJs_Lw-Y-0Kkn8kHr4BnilM9dBKnHnX25T_pM,5092
-reykit-1.1.2.dist-info/METADATA,sha256=2PvdTJEz7npFsQ53sEkQD4f8k7xHYLDAPZS81xxHQhM,1888
-reykit-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.2.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.2.dist-info/RECORD,,
+reykit-1.1.4.dist-info/METADATA,sha256=Y41lIpSdEMy8NsPp8tA4YiqYMy3MrHPAN-5qQCRXkCY,1888
+reykit-1.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.4.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.4.dist-info/RECORD,,