diff --git a/__pycache__/bookdb.cpython-37.pyc b/__pycache__/bookdb.cpython-37.pyc new file mode 100644 index 0000000..2e79c59 Binary files /dev/null and b/__pycache__/bookdb.cpython-37.pyc differ diff --git a/bookapp.py b/bookapp.py index d2284c6..8123c0b 100644 --- a/bookapp.py +++ b/bookapp.py @@ -1,23 +1,76 @@ import re - +import traceback from bookdb import BookDB DB = BookDB() def book(book_id): - return "

a book with id %s

" % book_id + page = """ +

{title}

+ + + + +
Author{author}
Publisher{publisher}
ISBN{isbn}
+Back to the list +""" + book = DB.title_info(book_id) + if book is None: + raise NameError + return page.format(**book) def books(): - return "

a list of books

" + all_books = DB.titles() + body = ['

My Bookshelf

', '') + return '\n'.join(body) + + +def resolve_path(path): + funcs = { + '': books, + 'book': book, + } + + path = path.strip('/').split('/') + + func_name = path[0] + args = path[1:] + + try: + func = funcs[func_name] + except KeyError: + raise NameError + + return func, args def application(environ, start_response): status = "200 OK" headers = [('Content-type', 'text/html')] - start_response(status, headers) - return ["

No Progress Yet

".encode('utf8')] + try: + path = environ.get('PATH_INFO', None) + if path is None: + raise NameError + func, args = resolve_path(path) + body = func(*args) + status = "200 OK" + except NameError: + status = "404 Not Found" + body = "

Not Found

" + except Exception: + status = "500 Internal Server Error" + body = "

Internal Server Error

" + print(traceback.format_exc()) + finally: + headers.append(('Content-length', str(len(body)))) + start_response(status, headers) + return [body.encode('utf8')] if __name__ == '__main__': diff --git a/wsgi_1.py b/wsgi_1.py index 85498d1..c7e7fda 100644 --- a/wsgi_1.py +++ b/wsgi_1.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -import datetime +from datetime import datetime default = "No Value Set" @@ -21,11 +21,11 @@ def application(environ, start_response): response_body = body.format( software=environ.get('SERVER_SOFTWARE', default), - path="aaaa", - month="bbbb", - date="cccc", - year="dddd", - client_ip="eeee" + path=environ.get("SERVER_PATH", default), + month=datetime.today().strftime("%B"), + date=datetime.today().strftime("%#d"), + year=datetime.today().strftime("%Y"), + client_ip=environ.get("REMOTE_ADDR", default) ) status = '200 OK'