moved powershell tilde expansion handling so it happens sooner

Author: andren

confluence_markdown_exporter/confluence.py

@@ -180,10 +180,6 @@ def from_json(cls, data: JsonResponse) -> "Space":
     @classmethod
     @functools.lru_cache(maxsize=100)
     def from_key(cls, space_key: str) -> "Space":
-        # Personal Confluence spaces start with ~. Exporting them on Windows leads to
-        # Powershell expanding tilde to the Users directory, which is handled here
-        space_key = re.sub(r"^[A-Z]:\\Users\\", "~", space_key, count=1, flags=re.IGNORECASE)
-
         return cls.from_json(
             cast("JsonResponse", confluence.get_space(space_key, expand="homepage"))
         )

confluence_markdown_exporter/main.py

@@ -1,4 +1,5 @@
 import os
+import re
 from pathlib import Path
 from typing import Annotated
 
@@ -72,13 +73,14 @@ def spaces(
 ) -> None:
     from confluence_markdown_exporter.confluence import Space
 
-    with measure(f"Export spaces {', '.join(space_keys)}"):
-        for space_key in space_keys:
+    normalized_space_keys = [_normalize_space_key(key) for key in space_keys]
+
+    with measure(f"Export spaces {', '.join(normalized_space_keys)}"):
+        for space_key in normalized_space_keys:
             override_output_path_config(output_path)
             space = Space.from_key(space_key)
             space.export()
 
-
 @app.command(help="Export all Confluence pages across all spaces to Markdown.")
 def all_spaces(
     output_path: Annotated[
@@ -125,6 +127,10 @@ def version() -> None:
     """Display the current version."""
     typer.echo(f"confluence-markdown-exporter {__version__}")
 
+def _normalize_space_key(space_key: str) -> str:
+    # Personal Confluence spaces start with ~. Exporting them on Windows leads to
+    # Powershell expanding tilde to the Users directory, which is handled here
+    return re.sub(r"^[A-Z]:\\Users\\", "~", space_key, count=1, flags=re.IGNORECASE)
 
 if __name__ == "__main__":
     app()