fix(settings): normalize default root path comparisons

This commit is contained in:
Will Miao
2026-04-21 09:43:37 +08:00
parent 1eeba666f5
commit ef4923fd94
4 changed files with 96 additions and 8 deletions

View File

@@ -1,5 +1,6 @@
import os
import platform
import posixpath
import threading
from pathlib import Path
import folder_paths # type: ignore
@@ -25,6 +26,15 @@ standalone_mode = (
logger = logging.getLogger(__name__)
def _normalize_root_identity(path: str) -> str:
"""Normalize a root path for comparisons across slash styles."""
normalized = posixpath.normpath(path.strip().replace("\\", "/"))
if len(normalized) >= 2 and normalized[1] == ":":
return normalized.lower()
return normalized
def _resolve_valid_default_root(
current: str, primary_paths: List[str], allowed_paths: List[str], name: str
) -> str:
@@ -37,14 +47,17 @@ def _resolve_valid_default_root(
if not isinstance(path, str):
continue
stripped = path.strip()
if not stripped or stripped in seen:
if not stripped:
continue
seen.add(stripped)
identity = _normalize_root_identity(stripped)
if identity in seen:
continue
seen.add(identity)
fallback_paths.append(stripped)
allowed = set(fallback_paths)
allowed = {_normalize_root_identity(path) for path in fallback_paths}
if current and current in allowed:
if current and _normalize_root_identity(current) in allowed:
return current
if not valid_paths:

View File

@@ -2,6 +2,7 @@ import asyncio
import copy
import json
import os
import posixpath
import shutil
import tempfile
import logging
@@ -103,6 +104,15 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
}
def _normalize_root_identity(path: str) -> str:
"""Normalize a root path for equality checks across slash styles."""
normalized = posixpath.normpath(path.strip().replace("\\", "/"))
if len(normalized) >= 2 and normalized[1] == ":":
return normalized.lower()
return normalized
class SettingsManager:
def __init__(self):
self.settings_file = ensure_settings_file(logger)
@@ -773,7 +783,7 @@ class SettingsManager:
return False
allowed_roots = self._get_allowed_roots(key)
if current and current in allowed_roots:
if current and _normalize_root_identity(current) in allowed_roots:
return False
self.settings[setting_key] = primary_candidates[0]
@@ -824,16 +834,19 @@ class SettingsManager:
if not isinstance(value, str):
continue
normalized = value.strip()
if not normalized or normalized in seen:
if not normalized:
continue
seen.add(normalized)
identity = _normalize_root_identity(normalized)
if identity in seen:
continue
seen.add(identity)
candidates.append(normalized)
return candidates
def _get_allowed_roots(self, key: str) -> set[str]:
"""Return all valid roots for a model type, including extra roots."""
return set(self._get_valid_root_candidates(key))
return {_normalize_root_identity(path) for path in self._get_valid_root_candidates(key)}
def _check_environment_variables(self) -> None:
"""Check for environment variables and update settings if needed"""