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

Clean the "Radicale works!" message, put it in the "get" method

Browse Source
This commit is contained in:
Guillaume Ayoub 2011-08-09 14:35:34 +02:00
parent 50cdbf6efb
commit e4523bf862
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
radicale/__init__.py
View File

@ -161,18 +161,6 @@ class Application(object):
environ["PATH_INFO"] = self.sanitize_uri(environ["PATH_INFO"]) environ["PATH_INFO"] = self.sanitize_uri(environ["PATH_INFO"])
log.LOGGER.debug("Sanitized path: %s", environ["PATH_INFO"]) log.LOGGER.debug("Sanitized path: %s", environ["PATH_INFO"])
# Display an "It Works" message if the root URL is requested with
# the GET method
if environ["REQUEST_METHOD"].lower() == "get" \
and environ["PATH_INFO"] == "/":
headers = {"Content-type": "text/html"}
start_response("200 OK", list(headers.items()))
return ["<html>\n",
"<head><title>Radicale Works!</title></head>\n",
"<body><h1>Radicale Works!</h1>",
'<a href="http://radicale.org/">radicale.org</a></body>',
"\n</html>"]
# Get content # Get content
content_length = int(environ.get("CONTENT_LENGTH") or 0) content_length = int(environ.get("CONTENT_LENGTH") or 0)
if content_length: if content_length:
@ -281,6 +269,12 @@ class Application(object):
def get(self, environ, calendars, content, user): def get(self, environ, calendars, content, user):
"""Manage GET request.""" """Manage GET request."""
# Display a "Radicale works!" message if the root URL is requested
if environ["PATH_INFO"] == "/":
headers = {"Content-type": "text/html"}
answer = "<!DOCTYPE html>\n<title>Radicale</title>Radicale works!"
return client.OK, headers, answer
calendar = calendars[0] calendar = calendars[0]
item_name = xmlutils.name_from_path(environ["PATH_INFO"], calendar) item_name = xmlutils.name_from_path(environ["PATH_INFO"], calendar)
if item_name: if item_name: