pathlibutil 0.1.8__tar.gz → 0.1.9__tar.gz

{pathlibutil-0.1.8 → pathlibutil-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pathlibutil
-Version: 0.1.8
+Version: 0.1.9
 Summary: inherits from pathlib.Path with methods for hashing, copying, deleting and more
 Home-page: https://d-chris.github.io
 License: MIT
@@ -52,6 +52,9 @@ Description-Content-Type: text/markdown
   - `TimeInt` objects for `atime`, `ctime`, `mtime` and `birthtime`
   - `ByteInt` object for `size`
 - `Path.relative_to()` to get relative path from a file or directory, `walk_up` to walk up the directory tree.
+- `Path.with_suffix()` to change the multiple suffixes of a file
+- `Path.cwd()` to get the current working directory or executable path when script is bundled, e.g. with `pyinstaller`
+- `Path.resolve()` to resolve a unc path to a mapped windows drive.
 
 ## Installation
 
@@ -261,3 +264,40 @@ backup = archive.move("./backup/")
 print(f"archive created: {archive.name} and moved to: {backup.parent}")
 ```
 
+## Example 6
+
+Access the current working directory with optional parameter `frozen` to determine
+different directories when script is bundled to an executable,
+e.g. with `pyinstaller`.
+> `Path.cwd()`
+
+```cmd
+>>> poetry run examples/example6.py -b
+Building frozen: K:/pathlibutil/examples/example6.exe
+Build succeeded: 0
+
+>>> poetry run examples/example6.py
+we are                          not frozen
+
+bundle dir is                   K:/pathlibutil/examples
+sys.argv[0] is                  K:/pathlibutil/examples/example6.py
+sys.executable is               K:/pathlibutil/.venv/Scripts/python.exe
+os.getcwd is                    K:/pathlibutil
+
+Path.cwd(frozen=True) is        K:/pathlibutil
+Path.cwd(frozen=False) is       K:/pathlibutil
+Path.cwd(frozen=_MEIPASS) is    K:/pathlibutil
+
+>>> examples/example6.exe
+we are                          ever so frozen
+
+bundle dir is                   C:/Users/CHRIST~1.DOE/AppData/Local/Temp/_MEI106042
+sys.argv[0] is                  examples/example6.exe
+sys.executable is               K:/pathlibutil/examples/example6.exe
+os.getcwd is                    K:/pathlibutil
+
+Path.cwd(frozen=True) is        K:/pathlibutil/examples
+Path.cwd(frozen=False) is       K:/pathlibutil
+Path.cwd(frozen=_MEIPASS) is    C:/Users/CHRIST~1.DOE/AppData/Local/Temp/_MEI106042
+```
+

{pathlibutil-0.1.8 → pathlibutil-0.1.9}/README.md

@@ -28,6 +28,9 @@
   - `TimeInt` objects for `atime`, `ctime`, `mtime` and `birthtime`
   - `ByteInt` object for `size`
 - `Path.relative_to()` to get relative path from a file or directory, `walk_up` to walk up the directory tree.
+- `Path.with_suffix()` to change the multiple suffixes of a file
+- `Path.cwd()` to get the current working directory or executable path when script is bundled, e.g. with `pyinstaller`
+- `Path.resolve()` to resolve a unc path to a mapped windows drive.
 
 ## Installation
 
@@ -236,3 +239,40 @@ backup = archive.move("./backup/")
 
 print(f"archive created: {archive.name} and moved to: {backup.parent}")
 ```
+
+## Example 6
+
+Access the current working directory with optional parameter `frozen` to determine
+different directories when script is bundled to an executable,
+e.g. with `pyinstaller`.
+> `Path.cwd()`
+
+```cmd
+>>> poetry run examples/example6.py -b
+Building frozen: K:/pathlibutil/examples/example6.exe
+Build succeeded: 0
+
+>>> poetry run examples/example6.py
+we are                          not frozen
+
+bundle dir is                   K:/pathlibutil/examples
+sys.argv[0] is                  K:/pathlibutil/examples/example6.py
+sys.executable is               K:/pathlibutil/.venv/Scripts/python.exe
+os.getcwd is                    K:/pathlibutil
+
+Path.cwd(frozen=True) is        K:/pathlibutil
+Path.cwd(frozen=False) is       K:/pathlibutil
+Path.cwd(frozen=_MEIPASS) is    K:/pathlibutil
+
+>>> examples/example6.exe
+we are                          ever so frozen
+
+bundle dir is                   C:/Users/CHRIST~1.DOE/AppData/Local/Temp/_MEI106042
+sys.argv[0] is                  examples/example6.exe
+sys.executable is               K:/pathlibutil/examples/example6.exe
+os.getcwd is                    K:/pathlibutil
+
+Path.cwd(frozen=True) is        K:/pathlibutil/examples
+Path.cwd(frozen=False) is       K:/pathlibutil
+Path.cwd(frozen=_MEIPASS) is    C:/Users/CHRIST~1.DOE/AppData/Local/Temp/_MEI106042
+```

{pathlibutil-0.1.8 → pathlibutil-0.1.9}/pathlibutil/path.py

@@ -2,8 +2,11 @@ import errno
 import hashlib
 import itertools
 import os
+import re
 import shutil
-from typing import Callable, Dict, Generator, List, Set, Union
+import subprocess
+import sys
+from typing import Callable, Dict, Generator, List, Literal, Set, Union
 
 from pathlibutil.base import BasePath, _Path
 from pathlibutil.types import ByteInt, StatResult, _stat_result, byteint
@@ -475,6 +478,95 @@ class Path(BasePath):
 
         return relative
 
+    @classmethod
+    def cwd(cls, *, frozen: Literal[True, False, "_MEIPASS"] = False) -> _Path:
+        """
+        Return a `Path` object representing the current working directory.
+
+        The `frozen` parameter takes only effect when the script is bundled to a
+        executable, e.g. with `pyinstaller`.
+
+        - `False`: Returns the current working directory, this is the default.
+        - `True`: Returns the directory of the executable.
+        - `"_MEIPASS"`: Returns the directory of the bundled resources.
+        """
+        if getattr(sys, "frozen", False):
+            if frozen is True:
+                return cls(sys.executable).parent
+            elif isinstance(frozen, str):
+                return cls(getattr(sys, frozen))
+
+        return super().cwd()
+
+    @classmethod
+    def _net_use(cls) -> Dict[str, str]:
+        """
+        Return a dictionary of mapped network drives. Keys are UNC paths and values
+        are drive letters.
+        """
+
+        def run(cmd: str) -> str:
+            """execute `command` and return stdout with cp850 encoding."""
+            result = subprocess.run(
+                cmd,
+                capture_output=True,
+                shell=True,
+                encoding="cp850",
+            )
+
+            return result.stdout
+
+        try:
+            mapped_drives = re.finditer(
+                r"^OK\s+(?P<drive>[A-Z]):\s+(?P<unc>\S+)",
+                run("net use"),
+                re.IGNORECASE | re.MULTILINE,
+            )
+            return {
+                match.group("unc") + "\\": match.group("drive") + ":\\"
+                for match in mapped_drives
+            }
+        except Exception:
+            return {}
+
+    def _resolve_unc(self) -> _Path:
+        """
+        Resolve UNC paths to mapped network drives.
+        """
+        if not hasattr(self.__class__, "_netuse"):
+            self.__class__._netuse = self._net_use()
+
+        try:
+            drive = self._netuse[self.anchor]
+            return self.__class__(drive).joinpath(self.relative_to(self.anchor))
+        except KeyError:
+            return self
+
+    def resolve(self, strict: bool = False, unc: bool = True) -> _Path:
+        """
+        Make the path absolute, resolving all symlinks on the way and also normalizing
+        it.
+
+        If `strict` is `True`, a `FileNotFoundError` will be raised if the path does
+        not exist.
+
+        On Windows if `unc` is `False`, UNC paths will be resolved to mapped network
+        drives.
+
+        >>> Path("T:/file.txt").resolve()
+        Path("\\\\server\\temp\\file.txt")
+
+        >>> Path("//server/temp/file.txt").resolve(unc=False)
+        Path("T:\\file.txt")
+        """
+
+        p = super().resolve(strict)
+
+        if unc is True or os.name != "nt":
+            return p
+
+        return p._resolve_unc()
+
 
 class Register7zFormat(Path, archive="7z"):
     """

{pathlibutil-0.1.8 → pathlibutil-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pathlibutil"
-version = "v0.1.8"
+version = "v0.1.9"
 description = "inherits from pathlib.Path with methods for hashing, copying, deleting and more"
 authors = ["Christoph Dörrer <d-chris@web.de>"]
 readme = "README.md"
@@ -44,6 +44,7 @@ docformatter = "^1.7.5"
 jinja2-pdoc = "^0.2.0"
 pdoc = "^14.3.0"
 click = "^8.1.7"
+pyinstaller = "^6.5.0"
 
 [[tool.poetry.source]]
 name = "PyPI"