reykit 1.1.47__py3-none-any.whl → 1.1.49__py3-none-any.whl

reykit/ros.py

@@ -22,7 +22,6 @@ from os import (
     remove as os_remove
 )
 from os.path import (
-    abspath as os_abspath,
     join as os_join,
     isfile as os_isfile,
     isdir as os_isdir,
@@ -38,6 +37,7 @@ from os.path import (
     splitdrive as os_splitdrive
 )
 from shutil import copy as shutil_copy
+from pathlib import Path
 from json import JSONDecodeError
 from tomllib import loads as tomllib_loads
 from hashlib import md5 as hashlib_md5
@@ -74,6 +74,31 @@ type FileStr = FilePath | FileText | TextIOBase
 type FileBytes = FilePath | FileData | BufferedIOBase
 
 
+def get_path(path: str | None = None) -> str:
+    """
+    resolve relative path and replace to forward slash `/`.
+
+    Parameters
+    ----------
+    path : Path.
+        - `None`: Use working directory.
+
+    Returns
+    -------
+    Handled path.
+    """
+
+    # Handle parameter.
+    path = path or ''
+
+    # Handle.
+    path_obj = Path(path)
+    path_obj = path_obj.resolve()
+    path = path_obj.as_posix()
+
+    return path
+
+
 def get_md5(data: str | bytes) -> str:
     """
     Get MD5 value.
@@ -298,7 +323,7 @@ class File(Base):
         """
 
         # Set attribute.
-        self.path = os_abspath(path)
+        self.path = get_path(path)
 
 
     @overload
@@ -542,68 +567,68 @@ class File(Base):
         return file_bytes
 
 
-    @property
-    def name_suffix(self) -> str:
-        """
-        Return file name with suffix.
+    # @property
+    # def name_suffix(self) -> str:
+    #     """
+    #     Return file name with suffix.
 
-        Returns
-        -------
-        File name with suffix.
-        """
+    #     Returns
+    #     -------
+    #     File name with suffix.
+    #     """
 
-        # Get.
-        file_name_suffix = os_basename(self.path)
+    #     # Get.
+    #     file_name_suffix = os_basename(self.path)
 
-        return file_name_suffix
+    #     return file_name_suffix
 
 
-    @property
-    def name(self) -> str:
-        """
-        Return file name not with suffix.
+    # @property
+    # def name(self) -> str:
+    #     """
+    #     Return file name not with suffix.
 
-        Returns
-        -------
-        File name not with suffix.
-        """
+    #     Returns
+    #     -------
+    #     File name not with suffix.
+    #     """
 
-        # Get.
-        file_name, _ = os_splitext(self.name_suffix)
+    #     # Get.
+    #     file_name, _ = os_splitext(self.name_suffix)
 
-        return file_name
+    #     return file_name
 
 
-    @property
-    def suffix(self) -> str:
-        """
-        Return file suffix.
+    # @property
+    # def suffix(self) -> str:
+    #     """
+    #     Return file suffix.
 
-        Returns
-        -------
-        File suffix.
-        """
+    #     Returns
+    #     -------
+    #     File suffix.
+    #     """
 
-        # Get.
-        _, file_suffix = os_splitext(self.path)
+    #     # Get.
+    #     _, file_suffix = os_splitext(self.path)
 
-        return file_suffix
+    #     return file_suffix
 
 
-    @property
-    def dir(self) -> str:
-        """
-        Return file directory.
+    # @property
+    # def dir(self) -> str:
+    #     """
+    #     Return file directory.
 
-        Returns
-        -------
-        File directory.
-        """
+    #     Returns
+    #     -------
+    #     File directory.
+    #     """
 
-        # Get.
-        file_dir = os_dirname(self.path)
+    #     # Get.
+    #     file_dir = os_dirname(self.path)
 
-        return file_dir
+    #     return file_dir
 
 
     @property
@@ -824,14 +849,11 @@ class Folder(Base):
         Parameters
         ----------
         path : Folder path.
-            - `None`: Work folder path.
-            - `str`: Use this folder path.
+            - `None`: Use working directory.
         """
 
         # Set attribute.
-        if path is None:
-            path = ''
-        self.path = os_abspath(path)
+        self.path = get_path(path)
 
 
     def paths(
@@ -973,6 +995,25 @@ class Folder(Base):
             return match_paths
 
 
+    def join(self, path: str) -> str:
+        """
+        Join folder path and relative path.
+
+        Parameters
+        ----------
+        path : Relative path.
+
+        Returns
+        -------
+        Joined path.
+        """
+
+        # Join.
+        join_path = os_join(self.path, path)
+
+        return join_path
+
+
     def create(self, report: bool = False) -> None:
         """
         Create folders.
@@ -1182,13 +1223,13 @@ class Folder(Base):
         return folder_size
 
 
-    def __contains__(self, pattern: str) -> bool:
+    def __contains__(self, relpath: str) -> bool:
         """
-        Search file by name, recursion directory.
+        whether exist relative path object.
 
         Parameters
         ----------
-        pattern : Match file name pattern.
+        relpath : Relative path.
 
         Returns
         -------
@@ -1196,8 +1237,8 @@ class Folder(Base):
         """
 
         # Judge.
-        result = self.search(pattern)
-        judge = result is not None
+        path = self.join(relpath)
+        judge = os_exists(path)
 
         return judge
 
@@ -1205,7 +1246,10 @@ class Folder(Base):
     __call__ = paths
 
 
-class TempFile(Base):
+    __add__ = __radd__ = join
+
+
+class TempFile(File):
     """
     Temporary file type.
     """
@@ -1241,7 +1285,7 @@ class TempFile(Base):
             suffix=suffix,
             dir=dir_
         )
-        self.path = self.file.name
+        self.path = get_path(self.file.name)
 
 
     def read(self) -> bytes | str:
@@ -1518,7 +1562,7 @@ class TempFolder(Base):
 
         # Set attribute.
         self.folder = TemporaryDirectory(dir=dir_)
-        self.path = os_abspath(self.folder.name)
+        self.path = get_path(self.folder.name)
 
 
     def paths(
@@ -1660,6 +1704,25 @@ class TempFolder(Base):
             return match_paths
 
 
+    def join(self, path: str) -> str:
+        """
+        Join folder path and relative path.
+
+        Parameters
+        ----------
+        path : Relative path.
+
+        Returns
+        -------
+        Joined path.
+        """
+
+        # Join.
+        join_path = os_join(self.path, path)
+
+        return join_path
+
+
     @property
     def name(self) -> str:
         """
@@ -1807,13 +1870,13 @@ class TempFolder(Base):
         return folder_size
 
 
-    def __contains__(self, pattern: str) -> bool:
+    def __contains__(self, relpath: str) -> bool:
         """
-        Search file by name, recursion directory.
+        whether exist relative path object.
 
         Parameters
         ----------
-        pattern : Match file name pattern.
+        relpath : Relative path.
 
         Returns
         -------
@@ -1821,8 +1884,8 @@ class TempFolder(Base):
         """
 
         # Judge.
-        result = self.search(pattern)
-        judge = result is not None
+        path = self.join(relpath)
+        judge = os_exists(path)
 
         return judge
 
@@ -1839,6 +1902,9 @@ class TempFolder(Base):
     __call__ = paths
 
 
+    __add__ = __radd__ = join
+
+
 def doc_to_docx(path: str, save_path: str | None = None) -> str:
     """
     Convert `DOC` file to `DOCX` file.

{reykit-1.1.47.dist-info → reykit-1.1.49.dist-info}/METADATA

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

{reykit-1.1.47.dist-info → reykit-1.1.49.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=wzwynZvg5-j-rtjhJfzNk5ndzJwWXS3GaGTRoLEx98w,41848
+reykit/ros.py,sha256=ksnr6oUn-i8XYXv3KTbxm375YLH4NqdioMJjnhqa84A,43001
 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.47.dist-info/METADATA,sha256=ef2wlf3qkK_-SnfZ4KErOCvfA8OyEKNvN6IWhhk95ms,1872
-reykit-1.1.47.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.47.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.47.dist-info/RECORD,,
+reykit-1.1.49.dist-info/METADATA,sha256=x2fAYfK2Un5opWmyzCOXhbeHq1J9vJmcmG8ZiIgyFwE,1872
+reykit-1.1.49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.49.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.49.dist-info/RECORD,,