← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to lib/fileservice_lib/listing.py

  • Committer: wagrant
  • Date: 2008-07-16 01:26:48 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:884
common.svn: Add a wrapper object to make a pysvn listing object look
            like the result of os.stat.
fileservice_lib: Factor out the last bit of statting duplication, this
                 time from the pysvn listing bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/fileservice_lib/listing.py
247
247
    return listing
248
248
 
249
249
def _fullpath_stat_fileinfo(fullpath, ind):
 
250
    file_stat = os.stat(fullpath)
 
251
    return _stat_fileinfo(fullpath, file_stat, ind)
 
252
 
 
253
def _stat_fileinfo(fullpath, file_stat, ind):
250
254
    d = ind.copy()
251
 
    file_stat = os.stat(fullpath)
252
255
    if stat.S_ISDIR(file_stat.st_mode):
253
256
        d["isdir"] = True
254
257
        d["type_nice"] = util.nice_filetype("/")
325
328
    d = {}
326
329
    d["svnstatus"] = "revision" # A special status
327
330
 
328
 
    if pysvnlist.kind == pysvn.node_kind.dir:
329
 
        d["isdir"] = True
330
 
        d["type_nice"] = util.nice_filetype("/")
331
 
        # Only directories can be published
332
 
        d["published"] = studpath.published(fullpath)
333
 
    else:
334
 
        d["isdir"] = False
335
 
        d["size"] = pysvnlist.size
336
 
        (type, _) = mimetypes.guess_type(fullpath)
337
 
        if type is None:
338
 
            type = conf.mimetypes.default_mimetype
339
 
        d["type"] = type
340
 
        d["type_nice"] = util.nice_filetype(filename)
341
 
        d["mtime"] = pysvnlist.time
342
 
        d["mtime_nice"] = make_date_nice(pysvnlist.time)
343
 
        d["mtime_short"] = make_date_nice_short(pysvnlist.time)
 
331
    wrapped = common.svn.PysvnListStatWrapper(pysvnlist)
 
332
    d.update(_stat_fileinfo(fullpath, wrapped, {}))
344
333
 
345
334
    return filename, d
346
335