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

Add --raw-size (-s) option to print raw size

Browse Source 
When used the raw size in bytes will be printed, rather than a
summary in human readable form.
pull/24/head
Matthew Walker 2 years ago
parent 53d463cab6
commit 49dd45e84c
7 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File

16
catcli/catcli.py
Unescape Escape View File

@ -36,9 +36,9 @@ USAGE = """
{0} {0}
Usage: Usage:
{1} ls [--catalog=<path>] [--format=<fmt>] [-aBCrVS] [<path>] {1} ls [--catalog=<path>] [--format=<fmt>] [-aBCrVSs] [<path>]
{1} find [--catalog=<path>] [--format=<fmt>] [-aBCbdVP] [--path=<path>] <term> {1} find [--catalog=<path>] [--format=<fmt>] [-aBCbdVsP] [--path=<path>] <term>
{1} tree [--catalog=<path>] [--format=<fmt>] [-aBCVSH] [<path>] {1} tree [--catalog=<path>] [--format=<fmt>] [-aBCVSsH] [<path>]
{1} index [--catalog=<path>] [--meta=<meta>...] [-aBCcfnV] <name> <path> {1} index [--catalog=<path>] [--meta=<meta>...] [-aBCcfnV] <name> <path>
{1} update [--catalog=<path>] [-aBCcfnV] [--lpath=<path>] <name> <path> {1} update [--catalog=<path>] [-aBCcfnV] [--lpath=<path>] <name> <path>
{1} rm [--catalog=<path>] [-BCfV] <storage> {1} rm [--catalog=<path>] [-BCfV] <storage>
@ -67,6 +67,7 @@ Options:
-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 --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.
@ -148,7 +149,8 @@ def cmd_ls(args, noder, top):
path += WILD path += WILD
found = noder.walk(top, path, found = noder.walk(top, path,
rec=args['--recursive'], rec=args['--recursive'],
fmt=args['--format']) fmt=args['--format'],
raw=args['--raw-size'])
if not found: if not found:
Logger.err('\"{}\": nothing found'.format(args['<path>'])) Logger.err('\"{}\": nothing found'.format(args['<path>']))
return found return found
@ -171,15 +173,17 @@ def cmd_find(args, noder, top):
directory = args['--directory'] directory = args['--directory']
startpath = args['--path'] startpath = args['--path']
fmt = args['--format'] fmt = args['--format']
raw = args['--raw-size']
return noder.find_name(top, args['<term>'], script=args['--script'], return noder.find_name(top, args['<term>'], script=args['--script'],
startpath=startpath, directory=directory, startpath=startpath, directory=directory,
parentfromtree=fromtree, fmt=fmt) parentfromtree=fromtree, fmt=fmt, raw=raw)
def cmd_tree(args, noder, top): def cmd_tree(args, noder, top):
path = args['<path>'] path = args['<path>']
fmt = args['--format'] fmt = args['--format']
hdr = args['--header'] hdr = args['--header']
raw = args['--raw-size']
# find node to start with # find node to start with
node = top node = top
@ -188,7 +192,7 @@ def cmd_tree(args, noder, top):
if node: if node:
# print the tree # print the tree
noder.print_tree(node, fmt=fmt, header=hdr) noder.print_tree(node, fmt=fmt, header=hdr, raw=raw)
def cmd_graph(args, noder, top): def cmd_graph(args, noder, top):

59
catcli/noder.py
Unescape Escape View File

@ -283,10 +283,12 @@ class Noder:
############################################################### ###############################################################
# printing # printing
############################################################### ###############################################################
def _node_to_csv(self, node, sep=','): def _node_to_csv(self, node, sep=',', raw=False):
''' '''
print a node to csv print a node to csv
@node: the node to consider @node: the node to consider
@sep: CSV separator character
@raw: print raw size rather than human readable
''' '''
if not node: if not node:
return '' return ''
@ -300,13 +302,15 @@ class Noder:
out.append(node.type) # type out.append(node.type) # type
out.append('') # fake full path out.append('') # fake full path
sz = self._rec_size(node, store=False) sz = self._rec_size(node, store=False)
out.append(utils.human(sz)) # size out.append(utils.size_to_str(sz, raw=raw)) # size
out.append(utils.epoch_to_str(node.ts)) # indexed_at out.append(utils.epoch_to_str(node.ts)) # indexed_at
out.append('') # fake maccess out.append('') # fake maccess
out.append('') # fake md5 out.append('') # fake md5
out.append(str(len(node.children))) # nbfiles out.append(str(len(node.children))) # nbfiles
out.append(utils.human(node.free)) # fake free_space # fake free_space
out.append(utils.human(node.total)) # fake total_space out.append(utils.size_to_str(node.free, raw=raw))
# fake total_space
out.append(utils.size_to_str(node.total, raw=raw))
out.append(node.attr) # meta out.append(node.attr) # meta
else: else:
# handle other nodes # handle other nodes
@ -317,7 +321,7 @@ class Noder:
fullpath = os.path.join(storage.name, parents) fullpath = os.path.join(storage.name, parents)
out.append(fullpath.replace('"', '""')) # full path out.append(fullpath.replace('"', '""')) # full path
out.append(utils.human(node.size)) # size out.append(utils.size_to_str(node.size, raw=raw)) # size
out.append(utils.epoch_to_str(storage.ts)) # indexed_at out.append(utils.epoch_to_str(storage.ts)) # indexed_at
if self._has_attr(node, 'maccess'): if self._has_attr(node, 'maccess'):
out.append(utils.epoch_to_str(node.maccess)) # maccess out.append(utils.epoch_to_str(node.maccess)) # maccess
@ -341,7 +345,7 @@ class Noder:
def _print_node(self, node, pre='', withpath=False, def _print_node(self, node, pre='', withpath=False,
withdepth=False, withstorage=False, withdepth=False, withstorage=False,
recalcparent=False): recalcparent=False, raw=False):
''' '''
print a node print a node
@node: the node to print @node: the node to print
@ -350,6 +354,7 @@ class Noder:
@withdepth: print the node depth info @withdepth: print the node depth info
@withstorage: print the node storage it belongs to @withstorage: print the node storage it belongs to
@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
''' '''
if node.type == self.TYPE_TOP: if node.type == self.TYPE_TOP:
# top node # top node
@ -368,7 +373,8 @@ class Noder:
attr = '' attr = ''
if node.md5: if node.md5:
attr = ', md5:{}'.format(node.md5) attr = ', md5:{}'.format(node.md5)
compl = 'size:{}{}'.format(utils.human(node.size), attr) sz = utils.size_to_str(node.size, raw=raw)
compl = 'size:{}{}'.format(sz, attr)
if withstorage: if withstorage:
compl += ', storage:{}'.format(Logger.bold(storage.name)) compl += ', storage:{}'.format(Logger.bold(storage.name))
Logger.file(pre, name, compl) Logger.file(pre, name, compl)
@ -388,14 +394,14 @@ class Noder:
storage = self._get_storage(node) storage = self._get_storage(node)
attr = [] attr = []
if node.size: if node.size:
attr.append(['totsize', utils.human(node.size)]) attr.append(['totsize', utils.size_to_str(node.size, raw=raw)])
if withstorage: if withstorage:
attr.append(['storage', Logger.bold(storage.name)]) attr.append(['storage', Logger.bold(storage.name)])
Logger.dir(pre, name, depth=depth, attr=attr) Logger.dir(pre, name, depth=depth, attr=attr)
elif node.type == self.TYPE_STORAGE: elif node.type == self.TYPE_STORAGE:
# node of type storage # node of type storage
hf = utils.human(node.free) hf = utils.size_to_str(node.free, raw=raw)
ht = utils.human(node.total) ht = utils.size_to_str(node.total, raw=raw)
nbchildren = len(node.children) nbchildren = len(node.children)
freepercent = '{:.1f}%'.format( freepercent = '{:.1f}%'.format(
node.free * 100 / node.total node.free * 100 / node.total
@ -408,7 +414,7 @@ class Noder:
ds = '' ds = ''
# the children size # the children size
sz = self._rec_size(node, store=False) sz = self._rec_size(node, store=False)
sz = utils.human(sz) sz = utils.size_to_str(sz, raw=raw)
ds = 'totsize:' + '{}'.format(sz) ds = 'totsize:' + '{}'.format(sz)
# format the output # format the output
name = '{}'.format(node.name) name = '{}'.format(node.name)
@ -430,28 +436,29 @@ class Noder:
Logger.err('bad node encountered: {}'.format(node)) Logger.err('bad node encountered: {}'.format(node))
def print_tree(self, node, style=anytree.ContRoundStyle(), def print_tree(self, node, style=anytree.ContRoundStyle(),
fmt='native', header=False): fmt='native', header=False, raw=False):
''' '''
print the tree similar to unix tool "tree" print the tree similar to unix tool "tree"
@node: start node @node: start node
@style: when fmt=native, defines the tree style @style: when fmt=native, defines the tree style
@fmt: output format @fmt: output format
@header: when fmt=csv, print the header @header: when fmt=csv, print the header
@raw: print the raw size rather than human readable
''' '''
if fmt == 'native': if fmt == 'native':
rend = anytree.RenderTree(node, childiter=self._sort_tree) rend = anytree.RenderTree(node, childiter=self._sort_tree)
for pre, fill, node in rend: for pre, fill, node in rend:
self._print_node(node, pre=pre, withdepth=True) self._print_node(node, pre=pre, withdepth=True, raw=raw)
elif fmt == 'csv': elif fmt == 'csv':
self._to_csv(node, with_header=header) self._to_csv(node, with_header=header, raw=raw)
def _to_csv(self, node, with_header=False): def _to_csv(self, node, with_header=False, raw=False):
'''print the tree to csv''' '''print the tree to csv'''
rend = anytree.RenderTree(node, childiter=self._sort_tree) rend = anytree.RenderTree(node, childiter=self._sort_tree)
if with_header: if with_header:
Logger.out(self.CSV_HEADER) Logger.out(self.CSV_HEADER)
for _, _, node in rend: for _, _, node in rend:
self._node_to_csv(node) self._node_to_csv(node, raw=raw)
def to_dot(self, node, path='tree.dot'): def to_dot(self, node, path='tree.dot'):
'''export to dot for graphing''' '''export to dot for graphing'''
@ -465,7 +472,7 @@ class Noder:
def find_name(self, root, key, def find_name(self, root, key,
script=False, directory=False, script=False, directory=False,
startpath=None, parentfromtree=False, startpath=None, parentfromtree=False,
fmt='native'): fmt='native', raw=False):
''' '''
find files based on their names find files based on their names
@script: output script @script: output script
@ -494,9 +501,10 @@ class Noder:
self._print_node(f, withpath=True, self._print_node(f, withpath=True,
withdepth=True, withdepth=True,
withstorage=True, withstorage=True,
recalcparent=parentfromtree) recalcparent=parentfromtree,
raw=raw)
elif fmt == 'csv': elif fmt == 'csv':
self._node_to_csv(f) self._node_to_csv(f, raw=raw)
if parentfromtree: if parentfromtree:
paths.append(self._get_parents(f)) paths.append(self._get_parents(f))
@ -519,7 +527,7 @@ class Noder:
############################################################### ###############################################################
# climbing # climbing
############################################################### ###############################################################
def walk(self, root, path, rec=False, fmt='native'): def walk(self, root, path, rec=False, fmt='native', raw=False):
''' '''
walk the tree for ls based on names walk the tree for ls based on names
@root: start node @root: start node
@ -538,7 +546,7 @@ class Noder:
if rec: if rec:
# print the entire tree # print the entire tree
self.print_tree(found[0].parent, fmt=fmt) self.print_tree(found[0].parent, fmt=fmt, raw=raw)
return found return found
# sort found nodes # sort found nodes
@ -547,18 +555,19 @@ class Noder:
# print the parent # print the parent
if fmt == 'native': if fmt == 'native':
self._print_node(found[0].parent, self._print_node(found[0].parent,
withpath=False, withdepth=True) withpath=False, withdepth=True, raw=raw)
elif fmt == 'csv': elif fmt == 'csv':
self._node_to_csv(found[0].parent) self._node_to_csv(found[0].parent, raw=raw)
# print all found nodes # print all found nodes
for f in found: for f in found:
if fmt == 'native': if fmt == 'native':
self._print_node(f, withpath=False, self._print_node(f, withpath=False,
pre='- ', pre='- ',
withdepth=True) withdepth=True,
raw=raw)
elif fmt == 'csv': elif fmt == 'csv':
self._node_to_csv(f) self._node_to_csv(f, raw=raw)
except anytree.resolver.ChildResolverError: except anytree.resolver.ChildResolverError:
pass pass

6
catcli/utils.py
Unescape Escape View File

@ -37,11 +37,11 @@ def md5sum(path):
return None return None
def human(size): def size_to_str(size, raw=True):
'''human readable size''' '''convert size to string, optionally human readable'''
div = 1024. div = 1024.
suf = ['B', 'K', 'M', 'G', 'T', 'P'] suf = ['B', 'K', 'M', 'G', 'T', 'P']
if size < div: if raw or size < div:
return '{}'.format(size) return '{}'.format(size)
for i in suf: for i in suf:
if size < div: if size < div:

2
tests/test_find.py
Unescape Escape View File

@ -25,7 +25,7 @@ class TestFind(unittest.TestCase):
args = {'<term>': '7544G', '--script': True, args = {'<term>': '7544G', '--script': True,
'--verbose': True, '--parent': False, '--verbose': True, '--parent': False,
'--directory': False, '--path': None, '--directory': False, '--path': None,
'--format': 'native'} '--format': 'native', '--raw-size': False}
# try to find something # try to find something
found = cmd_find(args, noder, top) found = cmd_find(args, noder, top)

3
tests/test_ls.py
Unescape Escape View File

@ -26,7 +26,8 @@ class TestWalking(unittest.TestCase):
# create fake args # create fake args
args = {'<path>': '', '--recursive': False, args = {'<path>': '', '--recursive': False,
'--verbose': True, '--verbose': True,
'--format': 'native'} '--format': 'native',
'--raw-size': False}
# list root # list root
args['<path>'] = '' args['<path>'] = ''

3
tests/test_rm.py
Unescape Escape View File

@ -26,7 +26,8 @@ class TestRm(unittest.TestCase):
# create fake args dict # create fake args dict
args = {'<path>': '', '--recursive': False, args = {'<path>': '', '--recursive': False,
'--verbose': True, '--verbose': True,
'--format': 'native'} '--format': 'native',
'--raw-size': False}
# list files and make sure there are children # list files and make sure there are children
args['<path>'] = '' args['<path>'] = ''

1
tests/test_tree.py
Unescape Escape View File

@ -29,6 +29,7 @@ class TestTree(unittest.TestCase):
'--verbose': True, '--verbose': True,
'--format': 'native', '--format': 'native',
'--header': False, '--header': False,
'--raw-size': False,
} }
# print tree and wait for any errors # print tree and wait for any errors

Write Preview
Loading…
Cancel
Save