Improve cuddly #1

Merged
hannaeko merged 8 commits from improve-cuddly into main 2026-11-16 22:58:43 +01:00
2 changed files with 20 additions and 25 deletions
Showing only changes of commit e0efccbfd6 - Show all commits

add support for KDL 2.0 (upgrade kde-py)

ariasuni 2026-11-08 18:47:36 +01:00
No known key found for this signature in database

View file

@ -43,33 +43,28 @@ class CuddlyNode:
Provide helper method to render to HTMl. Provide helper method to render to HTMl.
Allow access to children nodes like object properties. Allow access to children nodes like object properties.
""" """
def __init__(self, inner): def __init__(self, kdl_node):
self.inner = inner self.name = getattr(kdl_node, 'name', None)
self.children = {}
for node in self.inner.nodes:
self.children.setdefault(node.name, [])
self.children[node.name].append(CuddlyNode(node))
self.children = {name: CuddlyMaybeList(nodes) for name, nodes in self.children.items()} self.values = []
self.attributes = {}
for entry in getattr(kdl_node, 'entries', []):
if entry[0] is None:
self.values.append(entry[1])
else:
self.attributes[entry[0]] = entry[1]
children = {}
for node in kdl_node.nodes:
children.setdefault(node.name, []).append(CuddlyNode(node))
self.children = {
name: CuddlyMaybeList(nodes) for name, nodes in children.items()
}
@property @property
def value(self): def value(self):
if args := getattr(self.inner, 'args', None): return next(iter(self.values), None)
return args[0]
else:
return None
@property
def values(self):
return getattr(self.inner, 'args', [])
@property
def attributes(self):
return getattr(self.inner, 'props', {})
@property
def name(self):
return getattr(self.inner, 'name', None)
def __getattr__(self, name): def __getattr__(self, name):
return self.children.get(name) return self.children.get(name)

View file

@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
version = "0.1" version = "0.1"
name = "cuddly" name = "cuddly"
dependencies = [ dependencies = [
"kdl-py==1.2.0", "kdl-py @ git+https://github.com/tabatkins/kdlpy@d9a220762fb9f55e4f59296256221084c26f54da",
"beautifulsoup4==4.12.3", "beautifulsoup4==4.12.3",
"Jinja2==3.1.3", "Jinja2==3.1.3",
"click==8.1.7", "click==8.1.7",