From 7efb91c1f723e5d9414e8ce6ff3445a25f799837 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 21 Nov 2026 13:54:01 +0100 Subject: [PATCH] fix: use forward slashes in page names on Windows hosts Co-Authored-By: Claude Opus 5.5 --- truewiki/metadata.py | 2 ++ truewiki/storage/local.py | 4 +++- truewiki/web_routes.py | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/truewiki/metadata.py b/truewiki/metadata.py index cc2a3e0..192f0f5 100644 --- a/truewiki/metadata.py +++ b/truewiki/metadata.py @@ -224,6 +224,7 @@ async def _scan_folder(folder, notified=None): notified = set() for node in glob.glob(f"{singleton.STORAGE.folder}/{folder}/*"): + node = node.replace(os.sep, "/") if os.path.isdir(node): folder = node[len(singleton.STORAGE.folder) + 1 :] pages_seen.update(await _scan_folder(folder, notified)) @@ -396,6 +397,7 @@ async def load_metadata(self): for subfolder in ("Page", "Template", "Category", "File"): # Index all languages (the superset of all folders). for node in glob.glob(f"{singleton.STORAGE.folder}/{subfolder}/*"): + node = node.replace(os.sep, "/") if os.path.isdir(node): language = node.split("/")[-1] LANGUAGES.add(language) diff --git a/truewiki/storage/local.py b/truewiki/storage/local.py index 4488cea..ff52876 100644 --- a/truewiki/storage/local.py +++ b/truewiki/storage/local.py @@ -69,7 +69,9 @@ def dir_make(self, dirname: str) -> None: os.makedirs(f"{self._folder}/{dirname}", exist_ok=True) def dir_listing(self, dirname: str) -> List[str]: - return [item[len(f"{self._folder}/") :] for item in glob.glob(f"{self._folder}/{dirname}/*")] + return [ + item.replace(os.sep, "/")[len(f"{self._folder}/") :] for item in glob.glob(f"{self._folder}/{dirname}/*") + ] @property def folder(self): diff --git a/truewiki/web_routes.py b/truewiki/web_routes.py index 0d73910..b530a3a 100644 --- a/truewiki/web_routes.py +++ b/truewiki/web_routes.py @@ -1,6 +1,6 @@ import click import logging -import os +import posixpath import urllib from aiohttp import web @@ -46,8 +46,8 @@ def _validate_page(page: str) -> None: if "/" not in page: return - filename = os.path.basename(page) - path = os.path.normpath(os.path.dirname(page)) + filename = posixpath.basename(page) + path = posixpath.normpath(posixpath.dirname(page)) fullpath = f"{path}/{filename}" # Don't allow directory traversal @@ -205,8 +205,8 @@ async def edit_page_post(request): # Make sure that page names don't contain /../ or anything silly. new_page = payload.get("page", page) - filename = os.path.basename(new_page) - path = os.path.normpath(os.path.dirname(new_page)) + filename = posixpath.basename(new_page) + path = posixpath.normpath(posixpath.dirname(new_page)) new_page = f"{path}/{filename}" source_edit_nonce = singleton.STORAGE.get_file_nonce(WikiPage.page_ondisk_name(page))