reykit 1.1.45__py3-none-any.whl → 1.1.46__py3-none-any.whl

reykit/ros.py

@@ -838,7 +838,7 @@ class Folder(Base):
         self,
         target: Literal['all', 'file', 'folder'] = 'all',
         recursion: bool = False
-    ) -> list:
+    ) -> list[str]:
         """
         Get the path of files and folders in the folder path.
 
@@ -856,7 +856,7 @@ class Folder(Base):
         """
 
         # Get paths.
-        paths = []
+        paths: list[str] = []
 
         ## Recursive.
         if recursion:
@@ -912,59 +912,65 @@ class Folder(Base):
     def search(
         self,
         pattern: str,
-        recursion: bool = False,
-        all_ : Literal[False] = False
+        target: Literal['all', 'file', 'folder'] = 'all',
+        recursion: bool = False
     ) -> str | None: ...
 
     @overload
     def search(
         self,
         pattern: str,
+        target: Literal['all', 'file', 'folder'] = 'all',
         recursion: bool = False,
         *,
-        all_ : Literal[True]
+        first: Literal[False]
     ) -> list[str]: ...
 
     def search(
         self,
         pattern: str,
+        target: Literal['all', 'file', 'folder'] = 'all',
         recursion: bool = False,
-        all_ : bool = False
+        first: bool = True
     ) -> str | list[str] | None:
         """
-        Search file by name.
+        Search file name by regular expression.
 
         Parameters
         ----------
-        pattern : Match file name pattern.
+        pattern : Regular expression pattern.
+        target : Target data.
+            - `Literal['all']`: Return file and folder path.
+            - `Literal['file']`: Return file path.
+            - `Literal['folder']`: Return folder path.
         recursion : Is recursion directory.
-        all\\_ : Whether return all match file path, otherwise return first match file path.
+        first : Whether return first search path, otherwise return all search path.
 
         Returns
         -------
-        Match file path or null.
+        Searched path or null.
         """
 
         # Get paths.
-        file_paths = self.paths('file', recursion)
+        file_paths = self.paths(target, recursion)
 
-        # All.
-        if all_:
-            match_paths = []
+        # First.
+        if first:
             for path in file_paths:
-                file_name = os_basename(path)
-                result = search(pattern, file_name)
+                name = os_basename(path)
+                result = search(pattern, name)
                 if result is not None:
-                    match_paths.append(path)
-            return match_paths
+                    return path
 
-        # First.
+        # All.
         else:
+            match_paths: list[str] = []
             for path in file_paths:
-                file_name = os_basename(path)
-                result = search(pattern, file_name)
+                name = os_basename(path)
+                result = search(pattern, name)
                 if result is not None:
-                    return path
+                    match_paths.append(path)
+            return match_paths
 
 
     def create(self, report: bool = False) -> None:
@@ -1593,59 +1599,65 @@ class TempFolder(Base):
     def search(
         self,
         pattern: str,
-        recursion: bool = False,
-        all_ : Literal[False] = False
+        target: Literal['all', 'file', 'folder'] = 'all',
+        recursion: bool = False
     ) -> str | None: ...
 
     @overload
     def search(
         self,
         pattern: str,
+        target: Literal['all', 'file', 'folder'] = 'all',
         recursion: bool = False,
         *,
-        all_ : Literal[True]
+        first: Literal[False]
     ) -> list[str]: ...
 
     def search(
         self,
         pattern: str,
+        target: Literal['all', 'file', 'folder'] = 'all',
         recursion: bool = False,
-        all_ : bool = False
-    ) -> str | None:
+        first: bool = True
+    ) -> str | list[str] | None:
         """
-        Search file by name.
+        Search file name by regular expression.
 
         Parameters
         ----------
-        pattern : Match file name pattern.
+        pattern : Regular expression pattern.
+        target : Target data.
+            - `Literal['all']`: Return file and folder path.
+            - `Literal['file']`: Return file path.
+            - `Literal['folder']`: Return folder path.
         recursion : Is recursion directory.
-        all\\_ : Whether return all match file path, otherwise return first match file path.
+        first : Whether return first search path, otherwise return all search path.
 
         Returns
         -------
-        Match file path or null.
+        Searched path or null.
         """
 
         # Get paths.
-        file_paths = self.paths('file', recursion)
+        file_paths = self.paths(target, recursion)
 
-        # All.
-        if all_:
-            match_paths = []
+        # First.
+        if first:
             for path in file_paths:
-                file_name = os_basename(path)
-                result = search(pattern, file_name)
+                name = os_basename(path)
+                result = search(pattern, name)
                 if result is not None:
-                    match_paths.append(path)
-            return match_paths
+                    return path
 
-        # First.
+        # All.
         else:
+            match_paths: list[str] = []
             for path in file_paths:
-                file_name = os_basename(path)
-                result = search(pattern, file_name)
+                name = os_basename(path)
+                result = search(pattern, name)
                 if result is not None:
-                    return path
+                    match_paths.append(path)
+            return match_paths
 
 
     @property

{reykit-1.1.45.dist-info → reykit-1.1.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.45
+Version: 1.1.46
 Summary: Kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.45.dist-info → reykit-1.1.46.dist-info}/RECORD

@@ -8,7 +8,7 @@ reykit/rlog.py,sha256=FpxIa24jyr806KVdIjhaqmiggOEwuwZ7ncros9YNNHA,25592
 reykit/rmonkey.py,sha256=9-NvBM4phThKTHpqTSPlPGfJWcoDSp4EVl8x3xHJacg,7951
 reykit/rnet.py,sha256=zvEWAM42jAdQT868FFDrm-OPn5f3SNfMZP-bU8Sbx0A,16934
 reykit/rnum.py,sha256=PhG4V_BkVfCJUsbpMDN1umGZly1Hsus80TW8bpyBtyY,3653
-reykit/ros.py,sha256=BYqFWqktxRZsSzxPU0u-QnMnNKH90SY3anwoIuajzCI,41150
+reykit/ros.py,sha256=ri7MtbvhfL20GHBiAEjyTCe6lMJqc5bRaRV5m8rSca4,41860
 reykit/rrand.py,sha256=9QPXCsREIu45g6WP-XN67X05kmW3cTmctn3InvqYxuY,8947
 reykit/rre.py,sha256=4DVxy28dl5zn6_II8-cgr7E2nVPH5QJIJVB4o7Vsf1A,6078
 reykit/rschedule.py,sha256=_nrfrXYxlFAKCDbM8ibTTb60zNDlHxyE310cv-A19Kw,5799
@@ -22,7 +22,7 @@ reykit/rwrap.py,sha256=3at29SGx5As9fmv1t9m_ibjHTvXpA6uPo-mroSsrX-I,15323
 reykit/rzip.py,sha256=ABUDLwEHQIpcvZbJE_oV78H7dik6nC7kaRz660Ro9Os,3481
 reykit/rdll/__init__.py,sha256=WrJ_8jp_hbn2nl1osrR3buZMsmAGRVY6HfQdhDoJpSM,698
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.45.dist-info/METADATA,sha256=-eot345YciZjs3CkwiEwHq18-P-Pr8Pa6_eYTzGPP18,1872
-reykit-1.1.45.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.45.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.45.dist-info/RECORD,,
+reykit-1.1.46.dist-info/METADATA,sha256=rSDs_msZ4jYEbCqkDHBV5dnm2_AsxH_AJihnZ0bkrUk,1872
+reykit-1.1.46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.46.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.46.dist-info/RECORD,,