diff --git a/catcli/catalog.py b/catcli/catalog.py index 9eea7c5..5c7542b 100644 --- a/catcli/catalog.py +++ b/catcli/catalog.py @@ -17,10 +17,16 @@ from catcli.logger import Logger class Catalog: - def __init__(self, path, pickle=False, verbose=False, force=False): - self.path = path # catalog path - self.verbose = verbose # verbosity - self.force = force # force overwrite if exists + def __init__(self, path, pickle=False, debug=False, force=False): + ''' + @path: catalog path + @pickle: use pickle + @debug: debug mode + @force: force overwrite if exists + ''' + self.path = path + self.debug = debug + self.force = force self.metanode = None self.pickle = pickle @@ -60,19 +66,22 @@ class Catalog: return self._save_pickle(node) return self._save_json(node) + def _debug(self, text): + if not self.debug: + return + Logger.debug(text) + def _save_pickle(self, node): '''pickle the catalog''' pickle.dump(node, open(self.path, 'wb')) - if self.verbose: - Logger.info('Catalog saved to pickle \"{}\"'.format(self.path)) + self._debug('Catalog saved to pickle \"{}\"'.format(self.path)) return True def _restore_pickle(self): '''restore the pickled tree''' root = pickle.load(open(self.path, 'rb')) - if self.verbose: - m = 'Catalog imported from pickle \"{}\"'.format(self.path) - Logger.info(m) + m = 'Catalog imported from pickle \"{}\"'.format(self.path) + self._debug(m) return root def _save_json(self, node): @@ -80,14 +89,12 @@ class Catalog: exp = JsonExporter(indent=2, sort_keys=True) with open(self.path, 'w') as f: exp.write(node, f) - if self.verbose: - Logger.info('Catalog saved to json \"{}\"'.format(self.path)) + self._debug('Catalog saved to json \"{}\"'.format(self.path)) return True def _restore_json(self, string): '''restore the tree from json''' imp = JsonImporter() root = imp.import_(string) - if self.verbose: - Logger.info('Catalog imported from json \"{}\"'.format(self.path)) + self._debug('Catalog imported from json \"{}\"'.format(self.path)) return root diff --git a/catcli/catcli.py b/catcli/catcli.py index edd3738..98fa7ea 100755 --- a/catcli/catcli.py +++ b/catcli/catcli.py @@ -62,7 +62,7 @@ Options: -c --hash Calculate md5 hash [default: False]. -r --recursive Recursive [default: False]. -P --parent Ignore stored relpath [default: True]. - -V --verbose Be verbose [default: False]. + -V --erbose Be verbose [default: False]. -v --version Show version. -h --help Show this screen. """.format(BANNER, NAME, CATALOGPATH) @@ -230,10 +230,10 @@ def main(): banner() # init noder - noder = Noder(verbose=args['--verbose'], sortsize=args['--sortsize'], + noder = Noder(debug=args['--verbose'], sortsize=args['--sortsize'], arc=args['--archive']) # init catalog - catalog = Catalog(args['--catalog'], verbose=args['--verbose'], + catalog = Catalog(args['--catalog'], debug=args['--verbose'], force=args['--force']) # init top node top = catalog.restore() diff --git a/catcli/noder.py b/catcli/noder.py index 29e772f..fc49110 100644 --- a/catcli/noder.py +++ b/catcli/noder.py @@ -36,9 +36,9 @@ class Noder: TYPE_STORAGE = 'storage' TYPE_META = 'meta' - def __init__(self, verbose=False, sortsize=False, arc=False): + def __init__(self, debug=False, sortsize=False, arc=False): self.hash = True - self.verbose = verbose + self.debug = debug self.sortsize = sortsize self.arc = arc if self.arc: @@ -352,8 +352,7 @@ class Noder: script=False, directory=False, startpath=None, parentfromtree=False): '''find files based on their names''' - if self.verbose: - Logger.info('searching for \"{}\"'.format(key)) + self._debug('searching for \"{}\"'.format(key)) start = root if startpath: start = self.get_node(root, startpath) @@ -390,8 +389,7 @@ class Noder: ############################################################### def walk(self, root, path, rec=False): '''walk the tree for ls based on names''' - if self.verbose: - Logger.info('walking path: \"{}\"'.format(path)) + self._debug('walking path: \"{}\"'.format(path)) r = anytree.resolver.Resolver('name') found = [] try: @@ -482,6 +480,6 @@ class Noder: return utils.md5sum(path) def _debug(self, string): - if not self.verbose: + if not self.debug: return Logger.debug(string) diff --git a/tests/test_find.py b/tests/test_find.py index 6bbef99..cb5a584 100644 --- a/tests/test_find.py +++ b/tests/test_find.py @@ -17,7 +17,7 @@ class TestFind(unittest.TestCase): def test_find(self): # init - catalog = Catalog('fake', force=True, verbose=False) + catalog = Catalog('fake', force=True, debug=False) top = catalog._restore_json(get_fakecatalog()) noder = Noder() diff --git a/tests/test_graph.py b/tests/test_graph.py index 68b3750..4d68dbc 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -23,7 +23,7 @@ class TestGraph(unittest.TestCase): gpath = tempfile.gettempdir() + os.sep + 'graph.dot' self.addCleanup(clean, path) self.addCleanup(clean, gpath) - catalog = Catalog(path, force=True, verbose=False) + catalog = Catalog(path, force=True, debug=False) top = catalog._restore_json(get_fakecatalog()) noder = Noder() diff --git a/tests/test_index.py b/tests/test_index.py index c5396ff..966acc0 100644 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -42,7 +42,7 @@ class TestIndexing(unittest.TestCase): noder = Noder() top = noder.new_top_node() - catalog = Catalog(catalogpath, force=True, verbose=False) + catalog = Catalog(catalogpath, force=True, debug=False) # create fake args tmpdirname = 'tmpdir' diff --git a/tests/test_ls.py b/tests/test_ls.py index 95d19eb..7b2061a 100644 --- a/tests/test_ls.py +++ b/tests/test_ls.py @@ -19,7 +19,7 @@ class TestWalking(unittest.TestCase): # init path = 'fake' self.addCleanup(clean, path) - catalog = Catalog(path, force=True, verbose=False) + catalog = Catalog(path, force=True, debug=False) top = catalog._restore_json(get_fakecatalog()) noder = Noder() diff --git a/tests/test_rm.py b/tests/test_rm.py index d81d5cd..81f96ef 100644 --- a/tests/test_rm.py +++ b/tests/test_rm.py @@ -19,7 +19,7 @@ class TestRm(unittest.TestCase): # init path = 'fake' self.addCleanup(clean, path) - catalog = Catalog(path, force=True, verbose=False) + catalog = Catalog(path, force=True, debug=False) top = catalog._restore_json(get_fakecatalog()) noder = Noder() diff --git a/tests/test_tree.py b/tests/test_tree.py index 238243f..66bb618 100644 --- a/tests/test_tree.py +++ b/tests/test_tree.py @@ -19,7 +19,7 @@ class TestTree(unittest.TestCase): # init path = 'fake' self.addCleanup(clean, path) - catalog = Catalog(path, force=True, verbose=False) + catalog = Catalog(path, force=True, debug=False) top = catalog._restore_json(get_fakecatalog()) noder = Noder() diff --git a/tests/test_update.py b/tests/test_update.py index 2f54b27..7e33c8e 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -44,7 +44,7 @@ class TestIndexing(unittest.TestCase): noder = Noder() top = noder.new_top_node() - catalog = Catalog(catalogpath, force=True, verbose=False) + catalog = Catalog(catalogpath, force=True, debug=False) # get checksums f4_md5 = md5sum(f4)