Github/littlefs
1
Fork 0
Code Actions Activity

scripts: Changed most tree renderers to be pseudo-standalone

Browse Source 
I'm trying to avoid having classes with different implementations across
scripts, as it makes updating things error-prone, but at same time
copying all the tree renderers to all dbg scripts would be a bit much.

Monkey-patching the TreeArt class in relevant scripts seems like a
reasonable compromise.
This commit is contained in:
Christopher Haster
2025-04-01 13:54:37 -05:00
parent 682f12a953
commit f550fa9a80
3 changed files with 608 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/dbgbtree.py
+14 -10
View File
@@ -1516,11 +1516,11 @@ class TreeArt:
return '%s ' % ''.join(trunk) return '%s ' % ''.join(trunk)
# some more renderers # some more renderers
# render a btree rbyd tree for debugging # render a btree rbyd tree for debugging
@classmethod @classmethod
def _frombtreertree(cls, btree, *, def _treeartfrombtreertree(cls, btree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -1613,9 +1613,9 @@ class TreeArt:
return cls(tree) return cls(tree)
# render a btree btree tree for debugging # render a btree btree tree for debugging
@classmethod @classmethod
def _frombtreebtree(cls, btree, *, def _treeartfrombtreebtree(cls, btree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -1654,14 +1654,18 @@ class TreeArt:
return cls(tree) return cls(tree)
# render a btree tree for debugging # render a btree tree for debugging
@classmethod @classmethod
def frombtree(cls, btree, **args): def treeartfrombtree(cls, btree, **args):
if args.get('tree_btree'): if args.get('tree_btree'):
return cls._frombtreebtree(btree, **args) return cls._frombtreebtree(btree, **args)
else: else:
return cls._frombtreertree(btree, **args) return cls._frombtreertree(btree, **args)
TreeArt._frombtreertree = _treeartfrombtreertree
TreeArt._frombtreebtree = _treeartfrombtreebtree
TreeArt.frombtree = treeartfrombtree
def main(disk, roots=None, *, def main(disk, roots=None, *,
scripts/dbglfs.py
+18 -12
View File
@@ -3750,9 +3750,9 @@ class TreeArt:
# some more renderers # some more renderers
# render a btree rbyd tree for debugging # render a btree rbyd tree for debugging
@classmethod @classmethod
def _frombtreertree(cls, btree, *, def _treeartfrombtreertree(cls, btree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -3845,9 +3845,9 @@ class TreeArt:
return cls(tree) return cls(tree)
# render a btree btree tree for debugging # render a btree btree tree for debugging
@classmethod @classmethod
def _frombtreebtree(cls, btree, *, def _treeartfrombtreebtree(cls, btree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -3886,17 +3886,21 @@ class TreeArt:
return cls(tree) return cls(tree)
# render a btree tree for debugging # render a btree tree for debugging
@classmethod @classmethod
def frombtree(cls, btree, **args): def treeartfrombtree(cls, btree, **args):
if args.get('tree_btree'): if args.get('tree_btree'):
return cls._frombtreebtree(btree, **args) return cls._frombtreebtree(btree, **args)
else: else:
return cls._frombtreertree(btree, **args) return cls._frombtreertree(btree, **args)
# render a file tree for debugging TreeArt._frombtreertree = _treeartfrombtreertree
@classmethod TreeArt._frombtreebtree = _treeartfrombtreebtree
def fromfile(cls, file, **args): TreeArt.frombtree = treeartfrombtree
# render a file tree for debugging
@classmethod
def treeartfromfile(cls, file, **args):
tree = cls.frombtree(file.bshrub, **args) tree = cls.frombtree(file.bshrub, **args)
t_depth = tree.depth t_depth = tree.depth
@@ -3919,6 +3923,8 @@ class TreeArt:
return cls(tree) return cls(tree)
TreeArt.fromfile = treeartfromfile
# show the littlefs config # show the littlefs config
scripts/dbgmtree.py
+27 -19
View File
@@ -2433,11 +2433,11 @@ class TreeArt:
return '%s ' % ''.join(trunk) return '%s ' % ''.join(trunk)
# some more renderers # some more renderers
# render a btree rbyd tree for debugging # render a btree rbyd tree for debugging
@classmethod @classmethod
def _frombtreertree(cls, btree, *, def _treeartfrombtreertree(cls, btree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -2530,9 +2530,9 @@ class TreeArt:
return cls(tree) return cls(tree)
# render a btree btree tree for debugging # render a btree btree tree for debugging
@classmethod @classmethod
def _frombtreebtree(cls, btree, *, def _treeartfrombtreebtree(cls, btree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -2571,17 +2571,21 @@ class TreeArt:
return cls(tree) return cls(tree)
# render a btree tree for debugging # render a btree tree for debugging
@classmethod @classmethod
def frombtree(cls, btree, **args): def treeartfrombtree(cls, btree, **args):
if args.get('tree_btree'): if args.get('tree_btree'):
return cls._frombtreebtree(btree, **args) return cls._frombtreebtree(btree, **args)
else: else:
return cls._frombtreertree(btree, **args) return cls._frombtreertree(btree, **args)
# render an mtree tree for debugging TreeArt._frombtreertree = _treeartfrombtreertree
@classmethod TreeArt._frombtreebtree = _treeartfrombtreebtree
def _frommtreertree(cls, mtree, *, TreeArt.frombtree = treeartfrombtree
# render an mtree tree for debugging
@classmethod
def _treeartfrommtreertree(cls, mtree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -2711,9 +2715,9 @@ class TreeArt:
return cls(tree) return cls(tree)
# render an mtree tree for debugging # render an mtree tree for debugging
@classmethod @classmethod
def _frommtreebtree(cls, mtree, *, def _treeartfrommtreebtree(cls, mtree, *,
depth=None, depth=None,
inner=False, inner=False,
**args): **args):
@@ -2762,14 +2766,18 @@ class TreeArt:
return cls(tree) return cls(tree)
# render an mtree tree for debugging # render an mtree tree for debugging
@classmethod @classmethod
def frommtree(cls, mtree, **args): def treeartfrommtree(cls, mtree, **args):
if args.get('tree_btree'): if args.get('tree_btree'):
return cls._frommtreebtree(mtree, **args) return cls._frommtreebtree(mtree, **args)
else: else:
return cls._frommtreertree(mtree, **args) return cls._frommtreertree(mtree, **args)
TreeArt._frommtreertree = _treeartfrommtreertree
TreeArt._frommtreebtree = _treeartfrommtreebtree
TreeArt.frommtree = treeartfrommtree
def main(disk, mroots=None, *, def main(disk, mroots=None, *,