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

Adds git support to Radicale (Fix #30)

Browse Source
This commit is contained in:
Jean-Marc Martins 2013-08-30 17:23:04 +02:00
parent 6e98b1b3e8
commit 97a19405c4
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/__init__.py
View File

@ -546,7 +546,7 @@ class Application(object):
xmlutils.put(environ["PATH_INFO"], content, collection) xmlutils.put(environ["PATH_INFO"], content, collection)
status = client.CREATED status = client.CREATED
# Try to return the etag in the header. # Try to return the etag in the header.
# If the added item does't have the same name as the one given # If the added item doesn't have the same name as the one given
# by the client, then there's no obvious way to generate an # by the client, then there's no obvious way to generate an
# etag, we can safely ignore it. # etag, we can safely ignore it.
new_item = collection.get_item(item_name) new_item = collection.get_item(item_name)

29
radicale/storage/filesystem.py
View File

@ -27,19 +27,36 @@ import posixpath
import json import json
import time import time
from contextlib import contextmanager from contextlib import contextmanager
from .. import config, ical from .. import config, ical
FOLDER = os.path.expanduser(config.get("storage", "filesystem_folder")) FOLDER = os.path.expanduser(config.get("storage", "filesystem_folder"))
try:
from dulwich.repo import Repo
except ImportError:
GIT_FOLDER = None
else:
GIT_FOLDER = (os.path.join(FOLDER, ".git")
if os.path.isdir(os.path.join(FOLDER, ".git")) else None)
# This function overrides the builtin ``open`` function for this module # This function overrides the builtin ``open`` function for this module
# pylint: disable=W0622 # pylint: disable=W0622
@contextmanager
def open(path, mode="r"): def open(path, mode="r"):
"""Open a file at ``path`` with encoding set in the configuration.""" """Open a file at ``path`` with encoding set in the configuration."""
# On enter
abs_path = os.path.join(FOLDER, path.replace("/", os.sep)) abs_path = os.path.join(FOLDER, path.replace("/", os.sep))
return codecs.open(abs_path, mode, config.get("encoding", "stock")) with codecs.open(abs_path, mode, config.get("encoding", "stock")) as fd:
yield fd
# On exit
if GIT_FOLDER and mode == "w":
repo = Repo(FOLDER)
path = os.path.relpath(abs_path, FOLDER)
repo.stage([path])
repo.do_commit("Commit by Radicale")
# pylint: enable=W0622 # pylint: enable=W0622
@ -62,7 +79,8 @@ class Collection(ical.Collection):
def save(self, text): def save(self, text):
self._create_dirs() self._create_dirs()
open(self._path, "w").write(text) with open(self._path, "w") as fd:
fd.write(text)
def delete(self): def delete(self):
os.remove(self._path) os.remove(self._path)
@ -71,7 +89,8 @@ class Collection(ical.Collection):
@property @property
def text(self): def text(self):
try: try:
return open(self._path).read() with open(self._path) as fd:
return fd.read()
except IOError: except IOError:
return "" return ""
@ -107,8 +126,10 @@ class Collection(ical.Collection):
if os.path.exists(self._props_path): if os.path.exists(self._props_path):
with open(self._props_path) as prop_file: with open(self._props_path) as prop_file:
properties.update(json.load(prop_file)) properties.update(json.load(prop_file))
old_properties = properties.copy()
yield properties yield properties
# On exit # On exit
self._create_dirs() self._create_dirs()
if old_properties != properties:
with open(self._props_path, "w") as prop_file: with open(self._props_path, "w") as prop_file:
json.dump(properties, prop_file) json.dump(properties, prop_file)