Use portable Git status paths and Python 3.10 metadata parsing

Signed-off-by: Lukas Geiger <lukas@um-bruch.org>

Author: Lukas Geiger

.github/workflows/ci.yml

@@ -80,7 +80,7 @@ jobs:
       - name: Install Project Dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -r requirements.txt pytest Pillow
+          python -m pip install -r requirements.txt pytest Pillow tomli
 
       - name: Run Pytest Test Suite
         run: pytest -v

features/project_view.py

@@ -10,7 +10,7 @@
 
 from __future__ import annotations
 
-from pathlib import Path
+from pathlib import Path, PurePosixPath, PureWindowsPath
 from typing import Optional, Dict, TYPE_CHECKING
 from PySide6.QtWidgets import (
     QWidget, QVBoxLayout, QHBoxLayout, QTreeView, QFileSystemModel,
@@ -52,10 +52,13 @@ def status_for_path(
     Returns:
         GitFileStatus oder None.
     """
+    path_type = PureWindowsPath if PureWindowsPath(repo_root).drive else PurePosixPath
     try:
-        rel = Path(abs_path).relative_to(repo_root)
+        rel = path_type(abs_path).relative_to(path_type(repo_root))
     except ValueError:
         return None
+    if ".." in rel.parts:
+        return None
     return status_dict.get(rel.as_posix())
 
 

tests/test_git_project_view_status.py

@@ -96,6 +96,32 @@ def test_windows_nested_backslash(self):
         self.assertIsNotNone(result)
         self.assertTrue(result.is_modified)
 
+    def test_windows_forward_slashes_and_case(self):
+        status = _file_status("src/main.py", is_modified=True)
+        result = status_for_path("c:/PROJECT/src/main.py", r"C:\project", {"src/main.py": status})
+        self.assertIs(result, status)
+
+    def test_windows_unc_share(self):
+        status = _file_status("src/main.py", is_modified=True)
+        result = status_for_path(
+            r"\\server\share\repo\src\main.py", r"\\server\share\repo", {"src/main.py": status}
+        )
+        self.assertIs(result, status)
+
+    def test_windows_other_drive_is_outside(self):
+        self.assertIsNone(status_for_path(r"D:\repo\main.py", r"C:\repo", {"main.py": _file_status("main.py")}))
+
+    def test_sibling_prefix_is_outside(self):
+        self.assertIsNone(status_for_path("/repo-other/main.py", "/repo", {"main.py": _file_status("main.py")}))
+
+    def test_parent_traversal_is_outside(self):
+        self.assertIsNone(status_for_path("/repo/../main.py", "/repo", {"../main.py": _file_status("../main.py")}))
+
+    def test_posix_literal_backslash_filename(self):
+        name = r"file\name.py"
+        status = _file_status(name, is_modified=True)
+        self.assertIs(status_for_path("/repo/" + name, "/repo", {name: status}), status)
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_metadata.py

@@ -2,9 +2,13 @@
 
 import json
 import re
-import tomllib
 from pathlib import Path
 
+try:
+    import tomllib
+except ModuleNotFoundError:  # Python 3.10
+    import tomli as tomllib
+
 import pytest
 
 PROJECT_ROOT = Path(__file__).resolve().parents[1]