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

PUT and GET requests updated, adding Evolution support.

Browse Source
This commit is contained in:
Guillaume Ayoub 2010-04-19 16:09:50 +02:00
parent 8f1a56ceac
commit 8eb6520931
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -9,6 +9,9 @@
0.5 - **Not released yet** 0.5 - **Not released yet**
========================== ==========================
* Evolution support
0.2 - Snowflakes 0.2 - Snowflakes
================ ================

2
TODO
View File

@ -17,4 +17,4 @@
=== ===
* iCal filters and rights * iCal filters and rights
* Other CalDAV clients supports * [IN PROGRESS] Other CalDAV clients supports

23
radicale/__init__.py
View File

@ -149,10 +149,25 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
@check_rights @check_rights
def do_GET(self): def do_GET(self):
"""Manage GET request.""" """Manage GET request."""
answer = self._calendar.text.encode(self._encoding) item_name = (xmlutils.name_from_path(self.path))
if item_name:
# Get calendar item
items = self._calendar.timezones
item = self._calendar.get_item(item_name)
items.append(item)
answer_text = ical.serialize(
headers=self._calendar.headers, items=items)
etag = item.etag
else:
# Get whole calendar
answer_text = self._calendar.text
etag = self._calendar.etag
answer = answer_text.encode(self._encoding)
self.send_response(client.OK) self.send_response(client.OK)
self.send_header("Content-Length", len(answer)) self.send_header("Content-Length", len(answer))
self.send_header("Content-Type", "text/calendar")
self.send_header("ETag", etag)
self.end_headers() self.end_headers()
self.wfile.write(answer) self.wfile.write(answer)
@ -193,7 +208,8 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
@check_rights @check_rights
def do_PUT(self): def do_PUT(self):
"""Manage PUT request.""" """Manage PUT request."""
item = self._calendar.get_item(xmlutils.name_from_path(self.path)) item_name = xmlutils.name_from_path(self.path)
item = self._calendar.get_item(item_name)
if (not item and not self.headers.get("If-Match")) or \ if (not item and not self.headers.get("If-Match")) or \
(item and self.headers.get("If-Match", item.etag) == item.etag): (item and self.headers.get("If-Match", item.etag) == item.etag):
# PUT allowed in 3 cases # PUT allowed in 3 cases
@ -203,8 +219,11 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
ical_request = self._decode( ical_request = self._decode(
self.rfile.read(int(self.headers["Content-Length"]))) self.rfile.read(int(self.headers["Content-Length"])))
xmlutils.put(self.path, ical_request, self._calendar) xmlutils.put(self.path, ical_request, self._calendar)
etag = self._calendar.get_item(item_name).etag
self.send_response(client.CREATED) self.send_response(client.CREATED)
self.send_header("ETag", etag)
self.end_headers()
else: else:
# PUT rejected in all other cases # PUT rejected in all other cases
self.send_response(client.PRECONDITION_FAILED) self.send_response(client.PRECONDITION_FAILED)