', + f'

{name_block} | {timestamp}

Comments:

", + "\n".join(rendered_comments), + ]) + +def render_page(content): + return f""" + + + +Shortlog - a log of everyday things + + + + +{content} + + +""" + +def render_multiday(entry_tuples, note): + entries = [] + for entry in entry_tuples: + (date, entrytext, commentcount) = entry + commentcount_suffix = "s" if commentcount != 1 else "" + commentcount_label = f"{commentcount} comment{commentcount_suffix}" + entries.append("\n".join([ + "

", + f'

{date} | {commentcount_label}

', + entrytext, + ])) + all_entry_text = "\n".join(entries) + content = f"""

Shortlog - a log of everyday things

View the past: 2013 2012 2011 2010

Atom Feed

+{note} +{all_entry_text} +""" + return render_page(content) + +def render_day(date, entry, comments): + comment_markup = render_comments(comments) + content = f"""

Shortlog - a log of everyday things

Home

{date}

+ {entry} +

+{comment_markup} +

""" + return render_page(content) + +def render_feed(timestamp, entries): + rendered_entries = [] + for entry in entries: + rendered_entries.append(f""" + {entry["date"]} + + https://zarvox.org/shortlog/{entry["date"]} + {entry["timestamp"]} +

{entry["content"]}

+ """) + entries_text = "\n".join(rendered_entries) + content = f""" + + Shortlog + A log of everyday things + + + https://zarvox.org/shortlog + {timestamp} + + Drew Fisher + zarvox@zarvox.org + +{entries_text} + +""" + return content + +# Route definitions + +def serve_static(match, env): + requested_filename = env["PATH_INFO"][len("/static/"):] + path = os.path.normpath(os.path.join(staticsdir, requested_filename)) + if os.path.commonprefix([path, staticsdir]) == staticsdir: + content_type = mimetypes.guess_type(path) + with open(path, "rb") as f: + content = f.read() + return Response(200, [("Content-Type", content_type[0])], [content]) + return Response(404, [("Content-Type", "text/html")], + [b"

404 Asset " + requested_filename.encode('utf-8') + b" Not Found :(

"]) + +def serve_test_page(match, env): + return Response(200, [("Content-Type", "text/html")], + [b"

It works!

"]) + +def serve_year(match, env): + (year,) = match.groups() + files = sorted(os.listdir(entriesdir)) + filelist = [ os.path.join(entriesdir, x) for x in files if re.match(year,x) ] + # It makes more sense to sort fixed chunks of time in chronological order, rather than feed-style + #filelist.reverse() + dates = [ re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename) for filename in filelist ] + entries = [markdoku.markdown(readFile(x)) for x in filelist] + commentcounts = map(len, map( getCommentFiles, dates)) + note = f"Entries from {year}" + body = render_multiday(zip(dates, entries, commentcounts), note) + return Response(200, [('Content-Type', 'text/html; charset=utf-8')], [body.encode('utf-8')]) + +def serve_month(match, env): + (year, month) = match.groups() + files = sorted(os.listdir(entriesdir)) + filelist = [ os.path.join(entriesdir, x) for x in files if re.match(f"{year}-{month}", x) ] + #filelist.reverse() + dates = [ re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename) for filename in filelist ] + entries = [markdoku.markdown(readFile(x)) for x in filelist] + commentcounts = map(len, map( getCommentFiles, dates)) + note = f"Entries from {monthnames[month]}, {year}" + body = render_multiday(zip(dates, entries, commentcounts), note) + return Response(200, [('Content-Type', 'text/html; charset=utf-8')], [body.encode('utf-8')]) + +def serve_day(match, env): + (year, month, day) = match.groups() + datestr = f"{year}-{month}-{day}" + filename = os.path.join(entriesdir, f"{datestr}.txt") + if os.path.isfile(filename): + entry = markdoku.markdown(readFile(filename)) + commentfilelist = os.listdir(commentsdir) + files = sorted([os.path.join(commentsdir, filename) for filename in commentfilelist if re.match("(.*)%s-%s-%s_(\d\d\d\d\d\d).txt$" % (year, month, day), filename) ]) + comments = [] + for f in files: + comments.append(loadComment(f)) + body = render_day(datestr, entry, comments) + return Response(200, [('Content-Type', 'text/html; charset=utf-8')], [body.encode('utf-8')]) + else: + body = render_no_entry(datestr) + return Response(404, [('Content-Type', 'text/html; charset=utf-8')], [body.encode('utf-8')]) + +def serve_feed(match, env): + filelist = os.listdir(entriesdir) + files = [os.path.join(entriesdir, f) for f in filelist if re.match("(.*)(\d\d\d\d-\d\d-\d\d).txt$", f)] + stats = [os.stat(f) for f in files] + decorated = [(stat.st_mtime, filename) for (filename, stat) in zip(files, stats)] + decorated.sort(reverse=True) + if len(decorated) == 0: + body = render_feed(datetime.datetime.today(), []) + else: group_timestamp = datetime.datetime.fromtimestamp(decorated[0][0]).isoformat() + "-06:00" entries = [] for d in decorated[:10]: @@ -250,20 +324,80 @@ class feed: "content": markdoku.markdown(readFile(d[1])), "timestamp": (mtime.isoformat() + "-06:00") } entries.append(second) - render = web.template.render(templatesdir) - return render.feed(group_timestamp, entries) + body = render_feed(group_timestamp, entries) + return Response(200, [('Content-Type', 'application/atom+xml')], + [body.encode('utf-8')]) + +def serve_most_recent(match, env): + filelist = [ os.path.join(entriesdir, x) for x in most_recent_entries_filelist(20) ] + filelist.reverse() + dates = [ re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename) for filename in filelist ] + print(dates) + entries = [markdoku.markdown(readFile(x)) for x in filelist] + commentcounts = map(len, map( getCommentFiles, dates)) + note = "" + body = render_multiday(zip(dates, entries, commentcounts), note) + return Response(200, [('Content-Type', 'text/html; charset=utf-8')], [body.encode('utf-8')]) + +router = Router([ + Route("/static/", serve_static, prefix_match=True), + Route("/(\d\d\d\d)-(\d\d)-(\d\d)", serve_day), + Route("/(\d\d\d\d)/(\d\d)/(\d\d)", serve_day), + Route("/(\d\d\d\d)-(\d\d)", serve_month), + Route("/(\d\d\d\d)/(\d\d)", serve_month), + Route("/(\d\d\d\d)", serve_year), + Route("/feed", serve_feed), + Route("/", serve_most_recent), +]) + +#def redir(match, env): +# return Response(302, [("Location", "/")], []) + +#urls = ( +# '', 'redir', +# '/week', 'pastweek' , +# '/month', 'pastmonth' , +# '/year', 'pastyear' , +# '/feed', 'feed' , +# '/', 'pastweek', +# ) + +def application(env, start_response): + (route, match) = router.match(env) + + response = None + if route: + try: + response = route.handle(match, env) + except e: + print("EXCEPTION:", e) + pass + else: + print("No route matched", repr(env["PATH_INFO"])) + response = Response(404, [("Content-Type", "text/html")], + [b"

404 Not Found :(

"]) + + + if response is None: + response = Response(500, [("Content-Type", "text/html")], + [b"

Internal Server Error

"]) -# web.py 0.3+ way -application = web.application(urls, globals()).wsgifunc() + print(env["REQUEST_METHOD"], env["PATH_INFO"], response.status) + return response.send(start_response) -# web.py 0.2 way -#application = web.wsgifunc(web.webpyfunc(urls, globals())) if __name__ == "__main__": # CGI interface CGIHandler().run(application) - ## The web.py 0.3+ way - #app.run() - ## The web.py 0.2 way - #web.run(urls, globals()) + # cherrypy WSGI container + #import cherrypy + #cherrypy.tree.graft(application, "/") + #cherrypy.server.unsubscribe() + #server = cherrypy._cpserver.Server() + #server.socket_host = "127.0.0.1" + #server.socket_port= 5000 + #server.thread_pool = 4 + #server.subscribe() + #cherrypy.engine.start() + #cherrypy.engine.block()