# HG changeset patch # User Jeff Hammel # Date 1374857146 25200 # Node ID 5ae5ada91ac803d67053a8b71e6aa6c7b8751fc5 # Parent 8d1ad56761b0f2599ca785f29f6a61240da003bc simple numbering diff -r 8d1ad56761b0 -r 5ae5ada91ac8 python/tree.py --- a/python/tree.py Fri Jul 26 05:56:18 2013 -0700 +++ b/python/tree.py Fri Jul 26 09:45:46 2013 -0700 @@ -36,12 +36,11 @@ basename = os.path.basename(dirpath) parent = os.path.abspath(os.path.dirname(dirpath)) indent = depth(dirpath) - level - import pdb; pdb.set_trace() dirnames[:] = sorted(dirnames, key=lambda x: x.lower()) last[os.path.abspath(dirpath)] = dirnames and dirnames[-1] or None directories[dirpath] = dirnames - retval.append('%s%s%s %s' % ('│' * (indent-1), + retval.append('%s%s%s' % ('│' * (indent-1), ('├' if basename == basename else '└') if indent else '', basename)) filenames = sorted(filenames, key=lambda x: x.lower()) diff -r 8d1ad56761b0 -r 5ae5ada91ac8 python/tree2.py --- a/python/tree2.py Fri Jul 26 05:56:18 2013 -0700 +++ b/python/tree2.py Fri Jul 26 09:45:46 2013 -0700 @@ -23,14 +23,16 @@ def tree(directory): - sort_key=lambda x: x.lower()) + sort_key=lambda x: x.lower() retval = [directory] top = depth(directory) indent = [] + last = {} for dirpath, dirnames, filenames in os.walk(directory, topdown=True): abspath = os.path.abspath(dirpath) - parent = os.path.dirname(abspath)) + basename = os.path.basename(abspath) + parent = os.path.dirname(abspath) level = depth(abspath) - top # sort articles of interest @@ -43,6 +45,11 @@ if last.get(parent) == os.path.basename(abspath): pass + retval.append('%s%s'% (str(level) * level, basename)) + level += 1 + retval.extend([('%s%s' % (str(level) * level, filename)) + for filename in filenames]) + # retval.append('%s%s%s %s' % ('│' * (indent-1), # ('├' if basename == basename else '└') if indent else '', # basename))