diff --git a/catcli/catcli.py b/catcli/catcli.py index 05451d6..85fea0a 100755 --- a/catcli/catcli.py +++ b/catcli/catcli.py @@ -238,8 +238,8 @@ def cmd_edit(args, noder, catalog, top): def banner(): - Logger.out(BANNER) - Logger.out("") + Logger.out_err(BANNER) + Logger.out_err("") def main(): diff --git a/catcli/logger.py b/catcli/logger.py index 1f1dbef..d9d1e3a 100644 --- a/catcli/logger.py +++ b/catcli/logger.py @@ -89,6 +89,11 @@ class Logger: string = _fix_badchars(string) sys.stdout.write('{}\n'.format(string)) + def out_err(string): + '''to stderr no color''' + string = _fix_badchars(string) + sys.stderr.write('{}\n'.format(string)) + def debug(string): '''to stderr no color''' string = _fix_badchars(string) diff --git a/catcli/noder.py b/catcli/noder.py index 396c77d..c969909 100644 --- a/catcli/noder.py +++ b/catcli/noder.py @@ -35,7 +35,7 @@ class Noder: TYPE_ARC = 'arc' TYPE_STORAGE = 'storage' TYPE_META = 'meta' - CSV_HEADER = 'name,type,path,size,md5' + CSV_HEADER = 'name,type,path,size,indexed_at,maccess,md5' def __init__(self, debug=False, sortsize=False, arc=False): ''' @@ -313,6 +313,12 @@ class Noder: else: out.append('') + # indexed date/time + out.append(utils.epoch_to_str(storage.ts)) + + # maccess + out.append(utils.epoch_to_str(node.maccess)) + # md5 if any if node.md5: out.append(node.md5) @@ -551,6 +557,8 @@ class Noder: def _get_storage(self, node): '''recursively traverse up to find storage''' + if node.type == self.TYPE_STORAGE: + return node return node.ancestors[1] def _has_attr(self, node, attr):