From fc31100a0f6e1933cf084e46898ad20d33d892b9 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Fri, 4 Jun 2021 18:02:45 +0200
Subject: [PATCH] Always use '/' as path separator for regex rules

Previously, regex-matching paths on windows would, in some cases, require four
backslashes ('\\\\') to escape a single path separator. That's just too much.

With this commit, regex transforms now use '/' instead of '\' as path separator,
meaning rules can more easily be shared between platforms (although they are not
guaranteed to be 100% compatible since on Windows, '\' is still recognized as a
path separator).

To make rules more intuitive to write, local relative paths are now also printed
with '/' as path separator on Windows. Since Windows also accepts '/' as path
separator, this change doesn't really affect other rules that parse their sides
as paths.
---
 CHANGELOG.md         | 3 +++
 PFERD/transformer.py | 4 ++--
 PFERD/utils.py       | 8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87c1d05..980f96e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@ ambiguous situations.
 
 ## Unreleased
 
+### Changed
+- Use `/` instead of `\` as path separator for (regex) rules on Windows
+
 ## 3.0.1 - 2021-06-01
 
 ### Added
diff --git a/PFERD/transformer.py b/PFERD/transformer.py
index 83ffde4..ed123eb 100644
--- a/PFERD/transformer.py
+++ b/PFERD/transformer.py
@@ -10,7 +10,7 @@ from pathlib import PurePath
 from typing import Dict, Optional, Sequence, Union
 
 from .logging import log
-from .utils import fmt_path
+from .utils import fmt_path, str_path
 
 
 class Rule(ABC):
@@ -116,7 +116,7 @@ class ReRule(Rule):
         self._right = right
 
     def transform(self, path: PurePath) -> Union[PurePath, bool]:
-        if match := re.fullmatch(self._left, str(path)):
+        if match := re.fullmatch(self._left, str_path(path)):
             if isinstance(self._right, bool):
                 return self._right or path
 
diff --git a/PFERD/utils.py b/PFERD/utils.py
index 397feda..7c7b6f4 100644
--- a/PFERD/utils.py
+++ b/PFERD/utils.py
@@ -91,8 +91,14 @@ def url_set_query_params(url: str, params: Dict[str, str]) -> str:
     return result
 
 
+def str_path(path: PurePath) -> str:
+    if not path.parts:
+        return "."
+    return "/".join(path.parts)
+
+
 def fmt_path(path: PurePath) -> str:
-    return repr(str(path))
+    return repr(str_path(path))
 
 
 def fmt_real_path(path: Path) -> str: