/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/walker/walker.py

  • Committer: Tim Marston
  • Date: 2014-04-18 14:52:41 UTC
  • Revision ID: tim@ed.am-20140418145241-gldwc2ey6d2gjv96
defaulted Walker.generate_walk_list() to act on the.repo.full_dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/walker/walker.py
20
20
 
21
21
 
22
22
import os
23
 
import stdhome.the as the
24
23
 
25
24
 
26
25
class Walker:
32
31
        process() for more information.
33
32
        """
34
33
 
35
 
 
36
34
        def walk( self ):
37
35
                """Iterates over self.walk_list, calling process() for each entry in turn.  For
38
36
                directory entries, where process() returns False, subsequent entries in
39
37
                walk_list that fall under the directory are skipped.
40
38
                """
41
39
 
42
 
                if the.verbose >= 3:
43
 
                        print "walking [%s]" % self.__class__.__name__
44
 
 
45
40
                skip = ''
 
41
 
46
42
                for rel_file in self.walk_list:
47
43
 
48
44
                        # if we're skipping, skip entries in subdirectories, or turn off
64
60
                        # way of knowing what to check.  It could be src_type or dst_type
65
61
                        # (if src_dir or dst_dir was used to generate the walk list) or it
66
62
                        # could be neither (if the walk list came from somewhere else).  But
67
 
                        # it shouldn't matter: we add a path seperateor (os.sep) to the end
68
 
                        # of the filename, so it wuill only match files that are descendents
69
 
                        # of a directory with the name of this file.
 
63
                        # it shouldn't matter.  We adding an os.pathset to the end of the
 
64
                        # filename, so it wuill only match files that are descendents of a
 
65
                        # directory with the name of this file.
70
66
                        if not recurse: skip = rel_file + os.sep
71
67
 
72
68
 
102
98
 
103
99
 
104
100
        @staticmethod
105
 
        def generate_walk_list( full_dir, rel_file = '', recurse = True ):
 
101
        def generate_walk_list( rel_file = '', full_dir = the.repo.full_dir ):
106
102
                """Returns a list of files and directories in full_dir, specified as relative
107
103
                files (relative to full_dir), breadth first.
108
 
 
109
104
                """
110
105
 
111
106
                # ignore some files
112
 
                static_ignores = [ '.stdhome', '.stdhomerc' ] + \
113
 
                                                 the.repo.vcs.ignored_files
114
 
                if rel_file in static_ignores:
 
107
                if rel_file in { '.bzr', '.bzrignore', '.stdhome', '.stdhomerc' }:
115
108
                        return list()
116
109
 
117
110
                full_file = os.path.join( full_dir, rel_file )
123
116
                # directories are returned and recursed in to
124
117
                elif os.path.isdir( full_file ):
125
118
                        ret = [ rel_file ] if rel_file != '' else []
126
 
                        if recurse:
127
 
                                for file in os.listdir( full_file ):
128
 
                                        ret.extend( Walker.generate_walk_list(
129
 
                                                full_dir, os.path.join( rel_file, file ) ) )
 
119
                        for file in os.listdir( full_file ):
 
120
                                ret.extend( Walker.generate_walk_list(
 
121
                                        os.path.join( rel_file, file ), full_dir ) )
130
122
                        return sorted( ret )
131
123
 
132
124
                # other kinds are invalid