tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Guillaume Ayoub
2015-12-31 12:49:41 +01:00
parent 95fe2b6824
commit e7ce00d54f
6 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/storage/filesystem.py
View File

@@ -103,8 +103,7 @@ class Collection(ical.Collection):
# make sure that the local filename can be translated
# into an internal path
if not pathutils.is_safe_path_component(filename):
log.LOGGER.debug("Skipping unsupported filename: %s",
filename)
log.LOGGER.debug("Skipping unsupported filename: %s", filename)
continue
rel_filename = posixpath.join(path, filename)
if cls.is_node(rel_filename) or cls.is_leaf(rel_filename):
@@ -118,13 +117,14 @@ class Collection(ical.Collection):
@classmethod
def is_leaf(cls, path):
filesystem_path = pathutils.path_to_filesystem(path, FOLDER)
return (os.path.isfile(filesystem_path) and not
filesystem_path.endswith(".props"))
return (
os.path.isfile(filesystem_path) and not
filesystem_path.endswith(".props"))
@property
def last_modified(self):
modification_time = \
time.gmtime(os.path.getmtime(self._filesystem_path))
modification_time = time.gmtime(
os.path.getmtime(self._filesystem_path))
return time.strftime("%a, %d %b %Y %H:%M:%S +0000", modification_time)
@property

24
radicale/storage/multifilesystem.py
View File

@@ -84,8 +84,9 @@ class Collection(filesystem.Collection):
try:
filenames = os.listdir(self._filesystem_path)
except (OSError, IOError) as e:
log.LOGGER.info('Error while reading collection %r: %r'
% (self._filesystem_path, e))
log.LOGGER.info(
'Error while reading collection %r: %r' % (
self._filesystem_path, e))
return ""
for filename in filenames:
@@ -94,25 +95,24 @@ class Collection(filesystem.Collection):
with filesystem.open(path) as fd:
items.update(self._parse(fd.read(), components))
except (OSError, IOError) as e:
log.LOGGER.warning('Error while reading item %r: %r'
% (path, e))
log.LOGGER.warning(
'Error while reading item %r: %r' % (path, e))
return ical.serialize(
self.tag, self.headers, sorted(items, key=lambda x: x.name))
@classmethod
def is_node(cls, path):
filesystem_path = pathutils.path_to_filesystem(path,
filesystem.FOLDER)
return (os.path.isdir(filesystem_path) and
not os.path.exists(filesystem_path + ".props"))
filesystem_path = pathutils.path_to_filesystem(path, filesystem.FOLDER)
return (
os.path.isdir(filesystem_path) and
not os.path.exists(filesystem_path + ".props"))
@classmethod
def is_leaf(cls, path):
filesystem_path = pathutils.path_to_filesystem(path,
filesystem.FOLDER)
return (os.path.isdir(filesystem_path) and
os.path.exists(path + ".props"))
filesystem_path = pathutils.path_to_filesystem(path, filesystem.FOLDER)
return (
os.path.isdir(filesystem_path) and os.path.exists(path + ".props"))
@property
def last_modified(self):