nearxos/kicad-mcp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: parse quoted KiCad library table URIs with spaces

Browse Source
This commit is contained in:
jbjardine
2026-05-24 12:34:47 +02:00
parent ece116d563
commit 458631b24c
3 changed files with 90 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/commands/library.py
View File

@@ -91,14 +91,19 @@ class LibraryManager:
with open(table_path, "r") as f:
content = f.read()
# Simple regex-based parser for lib entries
# Pattern: (lib (name "NAME")(type TYPE)(uri "URI")...)
lib_pattern = r'\(lib\s+\(name\s+"?([^")\s]+)"?\)\s*\(type\s+"?([^")\s]+)"?\)\s*\(uri\s+"?([^")\s]+)"?'
# Simple regex-based parser for lib entries. Name, type, and URI
# may be quoted or bare; quoted URIs can contain spaces.
lib_pattern = (
r"\(lib\s+"
r'\(name\s+(?:"([^"]+)"|([^"\)\s]+))\)\s*'
r'\(type\s+(?:"([^"]+)"|([^"\)\s]+))\)\s*'
r'\(uri\s+(?:"([^"]+)"|([^"\)\s]+))'
)
for match in re.finditer(lib_pattern, content, re.IGNORECASE):
nickname = match.group(1)
lib_type = match.group(2)
uri = match.group(3)
nickname = match.group(1) or match.group(2)
lib_type = match.group(3) or match.group(4)
uri = match.group(5) or match.group(6)
if lib_type.lower() == "table":
table_uri = uri

21
python/commands/library_symbol.py
View File

@@ -127,14 +127,19 @@ class SymbolLibraryManager:
with open(table_path, "r", encoding="utf-8") as f:
content = f.read()
# Simple regex-based parser for lib entries
# Pattern: (lib (name "NAME")(type TYPE)(uri "URI")...)
lib_pattern = r'\(lib\s+\(name\s+"?([^")\s]+)"?\)\s*\(type\s+"?([^")\s]+)"?\)\s*\(uri\s+"?([^")\s]+)"?'
# Simple regex-based parser for lib entries. Name, type, and URI
# may be quoted or bare; quoted URIs can contain spaces.
lib_pattern = (
r"\(lib\s+"
r'\(name\s+(?:"([^"]+)"|([^"\)\s]+))\)\s*'
r'\(type\s+(?:"([^"]+)"|([^"\)\s]+))\)\s*'
r'\(uri\s+(?:"([^"]+)"|([^"\)\s]+))'
)
for match in re.finditer(lib_pattern, content, re.IGNORECASE):
nickname = match.group(1)
lib_type = match.group(2)
uri = match.group(3)
nickname = match.group(1) or match.group(2)
lib_type = match.group(3) or match.group(4)
uri = match.group(5) or match.group(6)
if lib_type.lower() == "table":
table_uri = uri
@@ -554,9 +559,7 @@ class SymbolLibraryCommands:
if value:
start = Path(value).expanduser().parent
for ancestor in [start, *start.parents]:
if (ancestor / "sym-lib-table").exists() or list(
ancestor.glob("*.kicad_pro")
):
if (ancestor / "sym-lib-table").exists() or list(ancestor.glob("*.kicad_pro")):
return ancestor
return start