Archives
/
catcli
mirror of https://github.com/deadc0de6/catcli
2
1
Fork 0
Code Issues Releases Wiki Activity

refactoring

Browse Source
pull/30/head
deadc0de6 1 year ago
parent 45d3b096f3
commit a333f60fa7
7 changed files with 109 additions and 72 deletions
Show Stats Download Patch File Download Diff File

24
catcli/catalog.py
Unescape Escape View File

@ -7,12 +7,12 @@ Class that represents the catcli catalog
import os import os
import pickle import pickle
from typing import Optional, Union, Any, cast from typing import Optional
from anytree.exporter import JsonExporter # type: ignore from anytree.exporter import JsonExporter # type: ignore
from anytree.importer import JsonImporter # type: ignore from anytree.importer import JsonImporter # type: ignore
# local imports # local imports
from catcli.cnode import NodeMeta, NodeTop from catcli.nodes import NodeMeta, NodeTop
from catcli.utils import ask from catcli.utils import ask
from catcli.logger import Logger from catcli.logger import Logger
@ -88,32 +88,38 @@ class Catalog:
return return
Logger.debug(text) Logger.debug(text)
def _save_pickle(self, node: NodeTop) -> bool: def _save_pickle(self, top: NodeTop) -> bool:
"""pickle the catalog""" """pickle the catalog"""
with open(self.path, 'wb') as file: with open(self.path, 'wb') as file:
pickle.dump(node, file) pickle.dump(top, file)
self._debug(f'Catalog saved to pickle \"{self.path}\"') self._debug(f'Catalog saved to pickle \"{self.path}\"')
return True return True
def _restore_pickle(self) -> Union[NodeTop, Any]: def _restore_pickle(self) -> NodeTop:
"""restore the pickled tree""" """restore the pickled tree"""
with open(self.path, 'rb') as file: with open(self.path, 'rb') as file:
root = pickle.load(file) root = pickle.load(file)
msg = f'Catalog imported from pickle \"{self.path}\"' msg = f'Catalog imported from pickle \"{self.path}\"'
self._debug(msg) self._debug(msg)
return root top = NodeTop(root)
return top
def _save_json(self, node: NodeTop) -> bool: def _save_json(self, top: NodeTop) -> bool:
"""export the catalog in json""" """export the catalog in json"""
Logger.debug(f'saving {top} to json...')
exp = JsonExporter(indent=2, sort_keys=True) exp = JsonExporter(indent=2, sort_keys=True)
with open(self.path, 'w', encoding='UTF-8') as file: with open(self.path, 'w', encoding='UTF-8') as file:
exp.write(node, file) exp.write(top, file)
self._debug(f'Catalog saved to json \"{self.path}\"') self._debug(f'Catalog saved to json \"{self.path}\"')
return True return True
def _restore_json(self, string: str) -> NodeTop: def _restore_json(self, string: str) -> NodeTop:
"""restore the tree from json""" """restore the tree from json"""
imp = JsonImporter() imp = JsonImporter()
Logger.debug(f'import from string: {string}')
root = imp.import_(string) root = imp.import_(string)
self._debug(f'Catalog imported from json \"{self.path}\"') self._debug(f'Catalog imported from json \"{self.path}\"')
return cast(NodeTop, root) top = NodeTop(root)
Logger.debug(f'top imported: {top}')
return top
# return cast(NodeTop, root)

18
catcli/catcli.py
Unescape Escape View File

@ -15,9 +15,9 @@ from typing import Dict, Any, List
from docopt import docopt from docopt import docopt
# local imports # local imports
from catcli import cnode from catcli import nodes
from catcli.version import __version__ as VERSION from catcli.version import __version__ as VERSION
from catcli.cnode import NodeTop, NodeAny from catcli.nodes import NodeTop, NodeAny
from catcli.logger import Logger from catcli.logger import Logger
from catcli.colors import Colors from catcli.colors import Colors
from catcli.catalog import Catalog from catcli.catalog import Catalog
@ -44,8 +44,10 @@ USAGE = f"""
Usage: Usage:
{NAME} ls [--catalog=<path>] [--format=<fmt>] [-aBCrVSs] [<path>] {NAME} ls [--catalog=<path>] [--format=<fmt>] [-aBCrVSs] [<path>]
{NAME} find [--catalog=<path>] [--format=<fmt>] [-aBCbdVsP] [--path=<path>] [<term>] {NAME} find [--catalog=<path>] [--format=<fmt>]
{NAME} index [--catalog=<path>] [--meta=<meta>...] [-aBCcfnV] <name> <path> [-aBCbdVsP] [--path=<path>] [<term>]
{NAME} index [--catalog=<path>] [--meta=<meta>...]
[-aBCcfnV] <name> <path>
{NAME} update [--catalog=<path>] [-aBCcfnV] [--lpath=<path>] <name> <path> {NAME} update [--catalog=<path>] [-aBCcfnV] [--lpath=<path>] <name> <path>
{NAME} mount [--catalog=<path>] [-V] <mountpoint> {NAME} mount [--catalog=<path>] [-V] <mountpoint>
{NAME} rm [--catalog=<path>] [-BCfV] <storage> {NAME} rm [--catalog=<path>] [-BCfV] <storage>
@ -66,14 +68,14 @@ Options:
-C --no-color Do not output colors [default: False]. -C --no-color Do not output colors [default: False].
-c --hash Calculate md5 hash [default: False]. -c --hash Calculate md5 hash [default: False].
-d --directory Only directory [default: False]. -d --directory Only directory [default: False].
-F --format=<fmt> Print format, see command \"print_supported_formats\" [default: native]. -F --format=<fmt> see \"print_supported_formats\" [default: native].
-f --force Do not ask when updating the catalog [default: False]. -f --force Do not ask when updating the catalog [default: False].
-l --lpath=<path> Path where changes are logged [default: ] -l --lpath=<path> Path where changes are logged [default: ]
-n --no-subsize Do not store size of directories [default: False]. -n --no-subsize Do not store size of directories [default: False].
-P --parent Ignore stored relpath [default: True]. -P --parent Ignore stored relpath [default: True].
-p --path=<path> Start path. -p --path=<path> Start path.
-r --recursive Recursive [default: False]. -r --recursive Recursive [default: False].
-s --raw-size Print raw size rather than human readable [default: False]. -s --raw-size Print raw size [default: False].
-S --sortsize Sort by size, largest first [default: False]. -S --sortsize Sort by size, largest first [default: False].
-V --verbose Be verbose [default: False]. -V --verbose Be verbose [default: False].
-v --version Show version. -v --version Show version.
@ -113,6 +115,8 @@ def cmd_index(args: Dict[str, Any],
Logger.err('aborted') Logger.err('aborted')
return return
node = noder.get_storage_node(top, name) node = noder.get_storage_node(top, name)
Logger.debug(f'top node: {top}')
Logger.debug(f'storage node: {node}')
node.parent = None node.parent = None
start = datetime.datetime.now() start = datetime.datetime.now()
@ -170,7 +174,7 @@ def cmd_ls(args: Dict[str, Any],
if not path.startswith(SEPARATOR): if not path.startswith(SEPARATOR):
path = SEPARATOR + path path = SEPARATOR + path
# prepend with top node path # prepend with top node path
pre = f'{SEPARATOR}{cnode.NAME_TOP}' pre = f'{SEPARATOR}{nodes.NAME_TOP}'
if not path.startswith(pre): if not path.startswith(pre):
path = pre + path path = pre + path
# ensure ends with a separator # ensure ends with a separator

20
catcli/fuser.py
Unescape Escape View File

@ -14,8 +14,8 @@ import fuse # type: ignore
# local imports # local imports
from catcli.noder import Noder from catcli.noder import Noder
from catcli.cnode import NodeTop, NodeAny from catcli.nodes import NodeTop, NodeAny
from catcli import cnode from catcli import nodes
# build custom logger to log in /tmp # build custom logger to log in /tmp
@ -58,7 +58,7 @@ class CatcliFilesystem(fuse.LoggingMixIn, fuse.Operations): # type: ignore
def _get_entry(self, path: str) -> Optional[NodeAny]: def _get_entry(self, path: str) -> Optional[NodeAny]:
"""return the node pointed by path""" """return the node pointed by path"""
pre = f'{SEPARATOR}{cnode.NAME_TOP}' pre = f'{SEPARATOR}{nodes.NAME_TOP}'
if not path.startswith(pre): if not path.startswith(pre):
path = pre + path path = pre + path
found = self.noder.list(self.top, path, found = self.noder.list(self.top, path,
@ -71,7 +71,7 @@ class CatcliFilesystem(fuse.LoggingMixIn, fuse.Operations): # type: ignore
def _get_entries(self, path: str) -> List[NodeAny]: def _get_entries(self, path: str) -> List[NodeAny]:
"""return nodes pointed by path""" """return nodes pointed by path"""
pre = f'{SEPARATOR}{cnode.NAME_TOP}' pre = f'{SEPARATOR}{nodes.NAME_TOP}'
if not path.startswith(pre): if not path.startswith(pre):
path = pre + path path = pre + path
if not path.endswith(SEPARATOR): if not path.endswith(SEPARATOR):
@ -91,17 +91,17 @@ class CatcliFilesystem(fuse.LoggingMixIn, fuse.Operations): # type: ignore
curt = time() curt = time()
mode: Any = S_IFREG mode: Any = S_IFREG
if isinstance(entry, cnode.NodeArchived): if isinstance(entry, nodes.NodeArchived):
mode = S_IFREG mode = S_IFREG
elif isinstance(entry, cnode.NodeDir): elif isinstance(entry, nodes.NodeDir):
mode = S_IFDIR mode = S_IFDIR
elif isinstance(entry, cnode.NodeFile): elif isinstance(entry, nodes.NodeFile):
mode = S_IFREG mode = S_IFREG
elif isinstance(entry, cnode.NodeStorage): elif isinstance(entry, nodes.NodeStorage):
mode = S_IFDIR mode = S_IFDIR
elif isinstance(entry, cnode.NodeMeta): elif isinstance(entry, nodes.NodeMeta):
mode = S_IFREG mode = S_IFREG
elif isinstance(entry, cnode.NodeTop): elif isinstance(entry, nodes.NodeTop):
mode = S_IFREG mode = S_IFREG
return { return {
'st_mode': (mode), 'st_mode': (mode),

2
catcli/logger.py
Unescape Escape View File

@ -37,7 +37,7 @@ class Logger:
def debug(cls: Type[CLASSTYPE], def debug(cls: Type[CLASSTYPE],
string: str) -> None: string: str) -> None:
"""to stderr no color""" """to stderr no color"""
cls.stderr_nocolor(f'[DBG] {string}\n') cls.stderr_nocolor(f'[DBG] {string}')
@classmethod @classmethod
def info(cls: Type[CLASSTYPE], def info(cls: Type[CLASSTYPE],

70
catcli/noder.py
Unescape Escape View File

@ -13,8 +13,8 @@ import anytree # type: ignore
from pyfzf.pyfzf import FzfPrompt # type: ignore from pyfzf.pyfzf import FzfPrompt # type: ignore
# local imports # local imports
from catcli import cnode from catcli import nodes
from catcli.cnode import NodeAny, NodeStorage, \ from catcli.nodes import NodeAny, NodeStorage, \
NodeTop, NodeFile, NodeArchived, NodeDir, NodeMeta NodeTop, NodeFile, NodeArchived, NodeDir, NodeMeta
from catcli.utils import size_to_str, epoch_to_str, md5sum, fix_badchars from catcli.utils import size_to_str, epoch_to_str, md5sum, fix_badchars
from catcli.logger import Logger from catcli.logger import Logger
@ -67,7 +67,7 @@ class Noder:
""" """
found = None found = None
for node in top.children: for node in top.children:
if not isinstance(node, cnode.NodeStorage): if not isinstance(node, nodes.NodeStorage):
continue continue
if node.name == name: if node.name == name:
found = node found = node
@ -138,25 +138,26 @@ class Noder:
recursively traverse tree and return size recursively traverse tree and return size
@store: store the size in the node @store: store the size in the node
""" """
if isinstance(node, cnode.NodeFile): if isinstance(node, nodes.NodeFile):
self._debug(f'getting node size for \"{node.name}\"') self._debug(f'getting node size for \"{node.name}\"')
return node.size return node.size
msg = f'getting node size recursively for \"{node.name}\"' msg = f'getting node size recursively for \"{node.name}\"'
self._debug(msg) self._debug(msg)
size: int = 0 size: int = 0
for i in node.children: for i in node.children:
if isinstance(node, cnode.NodeDir): if isinstance(node, nodes.NodeDir):
size = self.rec_size(i, store=store) size = self.rec_size(i, store=store)
if store: if store:
i.size = size i.size = size
size += size size += size
if isinstance(node, cnode.NodeStorage): if isinstance(node, nodes.NodeStorage):
size = self.rec_size(i, store=store) size = self.rec_size(i, store=store)
if store: if store:
i.size = size i.size = size
size += size size += size
else: else:
continue continue
self._debug(f'size of {node.name} is {size}')
if store: if store:
node.size = size node.size = size
return size return size
@ -188,7 +189,9 @@ class Noder:
############################################################### ###############################################################
def new_top_node(self) -> NodeTop: def new_top_node(self) -> NodeTop:
"""create a new top node""" """create a new top node"""
return NodeTop(cnode.NAME_TOP) top = NodeTop(nodes.NAME_TOP)
self._debug(f'new top node: {top}')
return top
def new_file_node(self, name: str, path: str, def new_file_node(self, name: str, path: str,
parent: NodeAny, storagepath: str) -> Optional[NodeFile]: parent: NodeAny, storagepath: str) -> Optional[NodeFile]:
@ -251,7 +254,7 @@ class Noder:
total, total,
0, 0,
epoch, epoch,
attrs, self.attrs_to_string(attrs),
parent=parent) parent=parent)
def new_archive_node(self, name: str, path: str, def new_archive_node(self, name: str, path: str,
@ -272,19 +275,16 @@ class Noder:
attrs: Dict[str, Any] = {} attrs: Dict[str, Any] = {}
attrs['created'] = epoch attrs['created'] = epoch
attrs['created_version'] = VERSION attrs['created_version'] = VERSION
meta = NodeMeta(name=cnode.NAME_META, meta = NodeMeta(name=nodes.NAME_META,
attr=self.attrs_to_string(attrs)) attr=attrs)
if meta.attr: meta.attr['access'] = epoch
meta.attr += ', ' meta.attr['access_version'] = VERSION
meta.attr += f'access={epoch}'
meta.attr += ', '
meta.attr += f'access_version={VERSION}'
return meta return meta
def _get_meta_node(self, top: NodeTop) -> Optional[NodeMeta]: def _get_meta_node(self, top: NodeTop) -> Optional[NodeMeta]:
"""return the meta node if any""" """return the meta node if any"""
try: try:
found = next(filter(lambda x: isinstance(x, cnode.NodeMeta), found = next(filter(lambda x: isinstance(x, nodes.NodeMeta),
top.children)) top.children))
return cast(NodeMeta, found) return cast(NodeMeta, found)
except StopIteration: except StopIteration:
@ -294,7 +294,7 @@ class Noder:
"""remove any node not flagged and clean flags""" """remove any node not flagged and clean flags"""
cnt = 0 cnt = 0
for node in anytree.PreOrderIter(top): for node in anytree.PreOrderIter(top):
if not isinstance(node, (cnode.NodeDir, cnode.NodeFile)): if not isinstance(node, (nodes.NodeDir, nodes.NodeFile)):
continue continue
if self._clean(node): if self._clean(node):
cnt += 1 cnt += 1
@ -361,7 +361,7 @@ class Noder:
out.append(node.md5) # md5 out.append(node.md5) # md5
else: else:
out.append('') # fake md5 out.append('') # fake md5
if isinstance(node, cnode.NodeDir): if isinstance(node, nodes.NodeDir):
out.append(str(len(node.children))) # nbfiles out.append(str(len(node.children))) # nbfiles
else: else:
out.append('') # fake nbfiles out.append('') # fake nbfiles
@ -390,10 +390,10 @@ class Noder:
@recalcparent: get relpath from tree instead of relpath field @recalcparent: get relpath from tree instead of relpath field
@raw: print raw size rather than human readable @raw: print raw size rather than human readable
""" """
if isinstance(node, cnode.NodeTop): if isinstance(node, nodes.NodeTop):
# top node # top node
Logger.stdout_nocolor(f'{pre}{node.name}') Logger.stdout_nocolor(f'{pre}{node.name}')
elif isinstance(node, cnode.NodeFile): elif isinstance(node, nodes.NodeFile):
# node of type file # node of type file
name = node.name name = node.name
if withpath: if withpath:
@ -413,7 +413,7 @@ class Noder:
content = Logger.get_bold_text(storage.name) content = Logger.get_bold_text(storage.name)
compl += f', storage:{content}' compl += f', storage:{content}'
NodePrinter.print_file_native(pre, name, compl) NodePrinter.print_file_native(pre, name, compl)
elif isinstance(node, cnode.NodeDir): elif isinstance(node, nodes.NodeDir):
# node of type directory # node of type directory
name = node.name name = node.name
if withpath: if withpath:
@ -433,7 +433,7 @@ class Noder:
if withstorage: if withstorage:
attr.append(('storage', Logger.get_bold_text(storage.name))) attr.append(('storage', Logger.get_bold_text(storage.name)))
NodePrinter.print_dir_native(pre, name, depth=depth, attr=attr) NodePrinter.print_dir_native(pre, name, depth=depth, attr=attr)
elif isinstance(node, cnode.NodeStorage): elif isinstance(node, nodes.NodeStorage):
# node of type storage # node of type storage
sztotal = size_to_str(node.total, raw=raw) sztotal = size_to_str(node.total, raw=raw)
szused = size_to_str(node.total - node.free, raw=raw) szused = size_to_str(node.total - node.free, raw=raw)
@ -463,7 +463,7 @@ class Noder:
name, name,
argsstring, argsstring,
node.attr) node.attr)
elif isinstance(node, cnode.NodeArchived): elif isinstance(node, nodes.NodeArchived):
# archive node # archive node
if self.arc: if self.arc:
NodePrinter.print_archive_native(pre, node.name, node.archive) NodePrinter.print_archive_native(pre, node.name, node.archive)
@ -515,7 +515,7 @@ class Noder:
@fmt: output format for selected nodes @fmt: output format for selected nodes
""" """
rendered = anytree.RenderTree(node, childiter=self._sort_tree) rendered = anytree.RenderTree(node, childiter=self._sort_tree)
nodes = {} the_nodes = {}
# construct node names list # construct node names list
for _, _, rend in rendered: for _, _, rend in rendered:
if not rend: if not rend:
@ -523,17 +523,17 @@ class Noder:
parents = self._get_parents(rend) parents = self._get_parents(rend)
storage = self._get_storage(rend) storage = self._get_storage(rend)
fullpath = os.path.join(storage.name, parents) fullpath = os.path.join(storage.name, parents)
nodes[fullpath] = rend the_nodes[fullpath] = rend
# prompt with fzf # prompt with fzf
paths = self._fzf_prompt(nodes.keys()) paths = self._fzf_prompt(the_nodes.keys())
# print the resulting tree # print the resulting tree
subfmt = fmt.replace('fzf-', '') subfmt = fmt.replace('fzf-', '')
for path in paths: for path in paths:
if not path: if not path:
continue continue
if path not in nodes: if path not in the_nodes:
continue continue
rend = nodes[path] rend = the_nodes[path]
self.print_tree(rend, fmt=subfmt) self.print_tree(rend, fmt=subfmt)
@staticmethod @staticmethod
@ -626,16 +626,16 @@ class Noder:
def _callback_find_name(self, term: str, only_dir: bool) -> Any: def _callback_find_name(self, term: str, only_dir: bool) -> Any:
"""callback for finding files""" """callback for finding files"""
def find_name(node: NodeAny) -> bool: def find_name(node: NodeAny) -> bool:
if isinstance(node, cnode.NodeStorage): if isinstance(node, nodes.NodeStorage):
# ignore storage nodes # ignore storage nodes
return False return False
if isinstance(node, cnode.NodeTop): if isinstance(node, nodes.NodeTop):
# ignore top nodes # ignore top nodes
return False return False
if isinstance(node, cnode.NodeMeta): if isinstance(node, nodes.NodeMeta):
# ignore meta nodes # ignore meta nodes
return False return False
if only_dir and isinstance(node, cnode.NodeDir): if only_dir and isinstance(node, nodes.NodeDir):
# ignore non directory # ignore non directory
return False return False
@ -773,7 +773,7 @@ class Noder:
def _get_storage(self, node: NodeAny) -> NodeStorage: def _get_storage(self, node: NodeAny) -> NodeStorage:
"""recursively traverse up to find storage""" """recursively traverse up to find storage"""
if isinstance(node, cnode.NodeStorage): if isinstance(node, nodes.NodeStorage):
return node return node
return cast(NodeStorage, node.ancestors[1]) return cast(NodeStorage, node.ancestors[1])
@ -784,9 +784,9 @@ class Noder:
def _get_parents(self, node: NodeAny) -> str: def _get_parents(self, node: NodeAny) -> str:
"""get all parents recursively""" """get all parents recursively"""
if isinstance(node, cnode.NodeStorage): if isinstance(node, nodes.NodeStorage):
return '' return ''
if isinstance(node, cnode.NodeTop): if isinstance(node, nodes.NodeTop):
return '' return ''
parent = self._get_parents(node.parent) parent = self._get_parents(node.parent)
if parent: if parent:

45
catcli/cnode.py → catcli/nodes.py
Unescape Escape View File

@ -10,7 +10,6 @@ from typing import Dict, Any
from anytree import NodeMixin # type: ignore from anytree import NodeMixin # type: ignore
_TYPE_BAD = 'badtype'
_TYPE_TOP = 'top' _TYPE_TOP = 'top'
_TYPE_FILE = 'file' _TYPE_FILE = 'file'
_TYPE_DIR = 'dir' _TYPE_DIR = 'dir'
@ -30,11 +29,21 @@ class NodeAny(NodeMixin): # type: ignore
children=None): children=None):
"""build generic node""" """build generic node"""
super().__init__() super().__init__()
self._flagged = False
self.parent = parent self.parent = parent
if children: if children:
self.children = children self.children = children
def _to_str(self) -> str:
ret = str(self.__class__) + ": " + str(self.__dict__)
if self.children:
ret += '\n'
for child in self.children:
ret += ' child => ' + str(child)
return ret
def __str__(self) -> str:
return self._to_str()
def flagged(self) -> bool: def flagged(self) -> bool:
"""is flagged""" """is flagged"""
if not hasattr(self, '_flagged'): if not hasattr(self, '_flagged'):
@ -43,12 +52,12 @@ class NodeAny(NodeMixin): # type: ignore
def flag(self) -> None: def flag(self) -> None:
"""flag a node""" """flag a node"""
self._flagged = True self._flagged = True # pylint: disable=W0201
def unflag(self) -> None: def unflag(self) -> None:
"""unflag node""" """unflag node"""
self._flagged = False self._flagged = False # pylint: disable=W0201
del self._flagged delattr(self, '_flagged')
class NodeTop(NodeAny): class NodeTop(NodeAny):
@ -65,6 +74,9 @@ class NodeTop(NodeAny):
if children: if children:
self.children = children self.children = children
def __str__(self) -> str:
return self._to_str()
class NodeFile(NodeAny): class NodeFile(NodeAny):
"""a file node""" """a file node"""
@ -89,6 +101,9 @@ class NodeFile(NodeAny):
if children: if children:
self.children = children self.children = children
def __str__(self) -> str:
return self._to_str()
class NodeDir(NodeAny): class NodeDir(NodeAny):
"""a directory node""" """a directory node"""
@ -111,6 +126,9 @@ class NodeDir(NodeAny):
if children: if children:
self.children = children self.children = children
def __str__(self) -> str:
return self._to_str()
class NodeArchived(NodeAny): class NodeArchived(NodeAny):
"""an archived node""" """an archived node"""
@ -135,6 +153,9 @@ class NodeArchived(NodeAny):
if children: if children:
self.children = children self.children = children
def __str__(self) -> str:
return self._to_str()
class NodeStorage(NodeAny): class NodeStorage(NodeAny):
"""a storage node""" """a storage node"""
@ -144,8 +165,8 @@ class NodeStorage(NodeAny):
free: int, free: int,
total: int, total: int,
size: int, size: int,
indexed_dt: float, ts: float,
attr: Dict[str, Any], attr: str,
parent=None, parent=None,
children=None): children=None):
"""build a storage node""" """build a storage node"""
@ -156,18 +177,21 @@ class NodeStorage(NodeAny):
self.total = total self.total = total
self.attr = attr self.attr = attr
self.size = size self.size = size
self.indexed_dt = indexed_dt self.ts = ts
self.parent = parent self.parent = parent
if children: if children:
self.children = children self.children = children
def __str__(self) -> str:
return self._to_str()
class NodeMeta(NodeAny): class NodeMeta(NodeAny):
"""a meta node""" """a meta node"""
def __init__(self, # type: ignore[no-untyped-def] def __init__(self, # type: ignore[no-untyped-def]
name: str, name: str,
attr: str, attr: Dict[str, Any],
parent=None, parent=None,
children=None): children=None):
"""build a meta node""" """build a meta node"""
@ -178,3 +202,6 @@ class NodeMeta(NodeAny):
self.parent = parent self.parent = parent
if children: if children:
self.children = children self.children = children
def __str__(self) -> str:
return self._to_str()

2
catcli/walker.py
Unescape Escape View File

@ -11,7 +11,7 @@ from typing import Tuple, Optional
# local imports # local imports
from catcli.noder import Noder from catcli.noder import Noder
from catcli.logger import Logger from catcli.logger import Logger
from catcli.cnode import NodeAny, NodeTop from catcli.nodes import NodeAny, NodeTop
class Walker: class Walker:

Write Preview
Loading…
Cancel
Save