refactor: match the OSW-ID as the 32 hex characters it is

- drop the dashed-uuid alternation, an OSW-ID never carries dashes
- use [0-9a-fA-F]{32} as regex_pattern.py already does
- drop IGNORECASE, the prefix was never case insensitive before

Author: LukasGold

src/osw/utils/wiki.py

@@ -7,9 +7,8 @@
 
 OSW_ID_PATTERN = re.compile(
     r"^(?:OSW)?"  # the prefix, absent when a bare uuid is passed
-    r"([0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12})"
-    r"(?:\.[\w-]+)*$",  # file suffixes, e.g. '.png' or '.drawio.png'
-    re.IGNORECASE,
+    r"([0-9a-fA-F]{32})"  # the uuid, in the hex form an OSW-ID carries it
+    r"(?:\.[\w-]+)*$"  # file suffixes, e.g. '.png' or '.drawio.png'
 )
 """Matches an OSW-ID with an optional prefix and any number of file suffixes"""
 

tests/utils/utils_test.py

@@ -42,12 +42,11 @@ def test_get_uuid_ignores_file_suffixes(suffix):
     assert get_uuid(osw_id) == uuid_
 
 
-@pytest.mark.parametrize("prefix", ["", "OSW", "osw"])
-def test_get_uuid_accepts_a_bare_uuid(prefix):
+def test_get_uuid_accepts_a_bare_uuid():
+    """The prefix is optional, as it was when it was stripped by str.replace."""
     uuid_ = uuid.uuid4()
 
-    assert get_uuid(f"{prefix}{str(uuid_).replace('-', '')}") == uuid_
-    assert get_uuid(f"{prefix}{uuid_}") == uuid_  # dashed
+    assert get_uuid(str(uuid_).replace("-", "")) == uuid_
 
 
 @pytest.mark.parametrize(
@@ -60,6 +59,8 @@ def test_get_uuid_accepts_a_bare_uuid(prefix):
         "OSW2ea5b605c91f4e5a95593dff79fdd4a5x",
         "OSW2ea5b605c91f4e5a95593dff79fdd4a5.",  # empty suffix
         "OSWzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
+        "osw2ea5b605c91f4e5a95593dff79fdd4a5",  # prefix is case sensitive
+        "2ea5b605-c91f-4e5a-9559-3dff79fdd4a5",  # an OSW-ID carries no dashes
     ],
 )
 def test_get_uuid_rejects_what_is_not_an_osw_id(osw_id):