home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor refactorings.
[plomtask]
/
plomtask
/
http.py
diff --git
a/plomtask/http.py
b/plomtask/http.py
index d9fa6a03194d1838fcf36f8cc860a4eab0baf6ac..8106d13c3c9f5c65b16dd1df12705543e183d46e 100644
(file)
--- a/
plomtask/http.py
+++ b/
plomtask/http.py
@@
-25,10
+25,7
@@
class TaskHandler(BaseHTTPRequestHandler):
def do_GET(self):
"""Handle any GET request."""
try:
def do_GET(self):
"""Handle any GET request."""
try:
- conn = DatabaseConnection(self.server.db)
- parsed_url = urlparse(self.path)
- site = path_split(parsed_url.path)[1]
- params = parse_qs(parsed_url.query)
+ conn, site, params = self._init_handling()
if 'calendar' == site:
html = self.do_GET_calendar(conn)
elif 'day' == site:
if 'calendar' == site:
html = self.do_GET_calendar(conn)
elif 'day' == site:
@@
-55,10
+52,7
@@
class TaskHandler(BaseHTTPRequestHandler):
def do_POST(self):
"""Handle any POST request."""
try:
def do_POST(self):
"""Handle any POST request."""
try:
- conn = DatabaseConnection(self.server.db)
- parsed_url = urlparse(self.path)
- site = path_split(parsed_url.path)[1]
- params = parse_qs(parsed_url.query)
+ conn, site, params = self._init_handling()
length = int(self.headers['content-length'])
postvars = parse_qs(self.rfile.read(length).decode(),
keep_blank_values=1)
length = int(self.headers['content-length'])
postvars = parse_qs(self.rfile.read(length).decode(),
keep_blank_values=1)
@@
-74,13
+68,17
@@
class TaskHandler(BaseHTTPRequestHandler):
def do_POST_day(self, conn: DatabaseConnection, date: str, postvars: dict):
"""Update or insert Day of date and fields defined in postvars."""
comment = postvars['comment'][0]
def do_POST_day(self, conn: DatabaseConnection, date: str, postvars: dict):
"""Update or insert Day of date and fields defined in postvars."""
comment = postvars['comment'][0]
- day = Day.by_date(conn, date)
- if day:
- day.comment = comment
- else:
- day = Day(date, comment)
+ day = Day.by_date(conn, date, create=True)
+ day.comment = comment
day.save(conn)
day.save(conn)
+ def _init_handling(self):
+ conn = DatabaseConnection(self.server.db)
+ parsed_url = urlparse(self.path)
+ site = path_split(parsed_url.path)[1]
+ params = parse_qs(parsed_url.query)
+ return conn, site, params
+
def _redirect(self, target: str):
self.send_response(302)
self.send_header('Location', target)
def _redirect(self, target: str):
self.send_response(302)
self.send_header('Location', target)