« back to all changes in this revision
Viewing changes to bzrlib/_walkdirs_win32.pyx
- browse files at revision 3731
- compare with another revision
- compare with revision 3731
- download diff
- download tarball
- view history from revision 3731
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-09-24 01:43:25 UTC
- mfrom: (3696.3.12 integration)
- Revision ID: pqm@pqm.ubuntu.com-20080924014325-ucivgbdmsbuthnqw
(robertc) Accelerate _walkdirs_utf8 on unix platforms. (Robert
Collins)
Collins)
added
removed
bzrlib/_walkdirs_win32.pyx
71
71
import operator
72
72
import stat
73
73
74
from bzrlib import osutils
74
from bzrlib import osutils, _readdir_py
75
75
76
76
77
77
cdef class _Win32Stat:
151
151
return 0
152
152
153
153
154
cdef class Win32Finder:
155
"""A class which encapsulates the search of files in a given directory"""
156
157
cdef object _top
158
cdef object _prefix
154
cdef class Win32ReadDir:
155
"""Read directories on win32."""
159
156
160
157
cdef object _directory_kind
161
158
cdef object _file_kind
162
159
163
cdef object _pending
164
cdef object _last_dirblock
165
166
def __init__(self, top, prefix=""):
167
self._top = top
168
self._prefix = prefix
169
170
self._directory_kind = osutils._directory_kind
171
self._file_kind = osutils._formats[stat.S_IFREG]
172
173
self._pending = [(osutils.safe_utf8(prefix), osutils.safe_unicode(top))]
174
self._last_dirblock = None
175
176
def __iter__(self):
177
return self
160
def __init__(self):
161
self._directory_kind = _readdir_py._directory
162
self._file_kind = _readdir_py._file
163
164
def top_prefix_to_starting_dir(self, top, prefix=""):
165
"""See DirReader.top_prefix_to_starting_dir."""
166
return (osutils.safe_utf8(prefix), None, None, None,
167
osutils.safe_unicode(top))
178
168
179
169
cdef object _get_kind(self, WIN32_FIND_DATAW *data):
180
170
if data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY:
195
185
statvalue.st_dev = 0
196
186
return statvalue
197
187
198
def _get_files_in(self, directory, relprefix):
199
"""Return the dirblock for all files in the given directory.
188
def read_dir(self, prefix, top):
189
"""Win32 implementation of DirReader.read_dir.
200
190
201
:param directory: A path that can directly access the files on disk.
202
Should be a Unicode object.
203
:param relprefix: A psuedo path for these files (as inherited from the
204
original 'prefix=XXX' when instantiating this class.)
205
It should be a UTF-8 string.
206
:return: A dirblock for all the files of the form
207
[(utf8_relpath, utf8_fname, kind, _Win32Stat, unicode_abspath)]
191
:seealso: DirReader.read_dir
208
192
"""
209
193
cdef WIN32_FIND_DATAW search_data
210
194
cdef HANDLE hFindFile
212
196
cdef WCHAR *query
213
197
cdef int result
214
198
215
top_star = directory + '*'
199
if prefix:
200
relprefix = prefix + '/'
201
else:
202
relprefix = ''
203
top_slash = top + '/'
204
205
top_star = top_slash + '*'
216
206
217
207
dirblock = []
218
208
231
221
continue
232
222
name_unicode = _get_name(&search_data)
233
223
name_utf8 = PyUnicode_AsUTF8String(name_unicode)
234
PyList_Append(dirblock,
235
(relprefix + name_utf8, name_utf8,
224
PyList_Append(dirblock,
225
(relprefix + name_utf8, name_utf8,
236
226
self._get_kind(&search_data),
237
227
self._get_stat_value(&search_data),
238
directory + name_unicode))
228
top_slash + name_unicode))
239
229
240
230
result = FindNextFileW(hFindFile, &search_data)
241
231
# FindNextFileW sets GetLastError() == ERROR_NO_MORE_FILES when it
251
241
# TODO: We should probably raise an exception if FindClose
252
242
# returns an error, however, I don't want to supress an
253
243
# earlier Exception, so for now, I'm ignoring this
244
dirblock.sort(key=operator.itemgetter(1))
254
245
return dirblock
255
256
cdef _update_pending(self):
257
"""If we had a result before, add the subdirs to pending."""
258
if self._last_dirblock is not None:
259
# push the entries left in the dirblock onto the pending queue
260
# we do this here, because we allow the user to modified the
261
# queue before the next iteration
262
for d in reversed(self._last_dirblock):
263
if d[2] == self._directory_kind:
264
self._pending.append((d[0], d[-1]))
265
self._last_dirblock = None
266
267
def __next__(self):
268
self._update_pending()
269
if not self._pending:
270
raise StopIteration()
271
relroot, top = self._pending.pop()
272
# NB: At the moment Pyrex doesn't support Unicode literals, which means
273
# that all of these string literals are going to be upcasted to Unicode
274
# at runtime... :(
275
# Maybe we could use unicode(x) during __init__?
276
if relroot:
277
relprefix = relroot + '/'
278
else:
279
relprefix = ''
280
top_slash = top + '/'
281
282
dirblock = self._get_files_in(top_slash, relprefix)
283
dirblock.sort(key=operator.itemgetter(1))
284
self._last_dirblock = dirblock
285
return (relroot, top), dirblock
286
287
288
def _walkdirs_utf8_win32_find_file(top, prefix=""):
289
"""Implement a version of walkdirs_utf8 for win32.
290
291
This uses the find files api to both list the files and to stat them.
292
"""
293
return Win32Finder(top, prefix=prefix)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1