robotcode-core 0.78.2__tar.gz → 0.79.0__tar.gz

{robotcode_core-0.78.2 → robotcode_core-0.79.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-core
-Version: 0.78.2
+Version: 0.79.0
 Summary: Some core classes for RobotCode
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://github.com/sponsors/d-biehl

robotcode_core-0.79.0/src/robotcode/core/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.79.0"

{robotcode_core-0.78.2 → robotcode_core-0.79.0}/src/robotcode/core/uri.py

@@ -7,6 +7,8 @@ from pathlib import Path
 from typing import Any, Iterator, Mapping, Optional, Union, overload
 from urllib import parse
 
+from .utils.path import normalized_path
+
 _IS_WIN = os.name == "nt"
 
 _RE_DRIVE_LETTER_PATH = re.compile(r"^\/[a-zA-Z]:")
@@ -158,6 +160,10 @@ class Uri(Mapping[str, str]):
     def query(self) -> str:
         return self._parts.query
 
+    @property
+    def fragment(self) -> str:
+        return self._parts.fragment
+
     @staticmethod
     def from_path(path: Union[str, Path, os.PathLike[str]]) -> Uri:
         result = Uri(Path(path).as_uri())
@@ -188,6 +194,26 @@ class Uri(Mapping[str, str]):
 
     def normalized(self) -> Uri:
         if self.scheme == "file":
-            return Uri.from_path(self.to_path().resolve())
+            return Uri.from_path(normalized_path(self.to_path()))
 
         return Uri(str(self))
+
+    def change(
+        self,
+        *,
+        scheme: Optional[str] = None,
+        netloc: Optional[str] = None,
+        path: Optional[str] = None,
+        params: Optional[str] = None,
+        query: Optional[str] = None,
+        fragment: Optional[str] = None,
+    ) -> Uri:
+
+        return Uri(
+            scheme=scheme if scheme is not None else self.scheme,
+            netloc=netloc if netloc is not None else self.netloc,
+            path=path if path is not None else self.path,
+            params=params if params is not None else self.params,
+            query=query if query is not None else self.query,
+            fragment=fragment if fragment is not None else self.fragment,
+        )

robotcode_core-0.79.0/src/robotcode/core/utils/path.py

@@ -0,0 +1,49 @@
+import os
+import re
+from pathlib import Path
+from typing import Any, Union
+
+
+def path_is_relative_to(
+    path: Union[Path, str, "os.PathLike[Any]"],
+    other_path: Union[Path, str, "os.PathLike[Any]"],
+) -> bool:
+    try:
+        Path(path).relative_to(other_path)
+        return True
+    except ValueError:
+        return False
+
+
+_RE_DRIVE_LETTER_PATH = re.compile(r"^[a-zA-Z]:")
+
+
+def normalized_path(path: Union[Path, str, "os.PathLike[Any]"]) -> Path:
+    p = os.path.normpath(os.path.abspath(path))
+
+    if os.name == "nt" and _RE_DRIVE_LETTER_PATH.match(str(p)):
+        return Path(p[0].upper() + p[1:])
+
+    return Path(p)
+
+
+def normalized_path_full(path: Union[Path, str, "os.PathLike[Any]"]) -> Path:
+    p = normalized_path(path)
+
+    orig_parents = list(reversed(p.parents))
+    orig_parents.append(p)
+
+    parents = []
+    for index, parent in enumerate(orig_parents):
+        if parent.exists():
+            ps = (
+                next((f.name for f in parent.parent.iterdir() if f.samefile(parent)), None)
+                if parent.parent is not None and parent.parent != parent
+                else parent.name or parent.anchor
+            )
+
+            parents.append(ps if ps is not None else parent.name)
+        else:
+            return Path(*parents, *[f.name for f in orig_parents[index:]])
+
+    return Path(*parents)

robotcode_core-0.78.2/src/robotcode/core/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.78.2"

robotcode_core-0.78.2/src/robotcode/core/utils/path.py

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from os import PathLike
-from pathlib import Path
-from typing import Any, Union
-
-
-def path_is_relative_to(
-    path: Union[Path, str, PathLike[Any]],
-    other_path: Union[Path, str, PathLike[Any]],
-) -> bool:
-    try:
-        Path(path).relative_to(other_path)
-        return True
-    except ValueError:
-        return False