Shortlog - a log of everyday things

From c25691b30169518ad836e78d844ecd34542cf645 Mon Sep 17 00:00:00 2001 From: Drew Fisher Date: Wed, 5 Jan 2011 13:49:16 -0600 Subject: [PATCH 1/1] Import of running code as of 2011-01-05. It seemed a really bad idea to NOT have this in version control, and it also was hindering deployment. --- comments/.gitignore | 1 + entries/.gitignore | 1 + pending/.gitignore | 0 shortlog.py | 259 ++++++++++++++++++++++++++++++++++++++++ static/.gitignore | 2 + templates/day.html | 42 +++++++ templates/feed.xml | 22 ++++ templates/multiday.html | 24 ++++ templates/noentry.html | 13 ++ 9 files changed, 364 insertions(+) create mode 100644 comments/.gitignore create mode 100644 entries/.gitignore create mode 100644 pending/.gitignore create mode 100644 shortlog.py create mode 100644 static/.gitignore create mode 100644 templates/day.html create mode 100644 templates/feed.xml create mode 100644 templates/multiday.html create mode 100644 templates/noentry.html diff --git a/comments/.gitignore b/comments/.gitignore new file mode 100644 index 0000000..2211df6 --- /dev/null +++ b/comments/.gitignore @@ -0,0 +1 @@ +*.txt diff --git a/entries/.gitignore b/entries/.gitignore new file mode 100644 index 0000000..2211df6 --- /dev/null +++ b/entries/.gitignore @@ -0,0 +1 @@ +*.txt diff --git a/pending/.gitignore b/pending/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/shortlog.py b/shortlog.py new file mode 100644 index 0000000..a341b66 --- /dev/null +++ b/shortlog.py @@ -0,0 +1,259 @@ +#!/usr/bin/env python + +import web +import os +import datetime +import re +import smtplib +import md5 + +pwd = os.path.dirname( os.path.realpath( __file__ ) ) + +web.config.debug = True + +monthnames = {"01": "January", + "02": "February", + "03": "March", + "04": "April", + "05": "May", + "06": "June", + "07": "July", + "08": "August", + "09": "September", + "10": "October", + "11": "November", + "12": "December"} + +urls = ( + '/', 'pastweek', + '/week', 'pastweek' , + '/month', 'pastmonth' , + '/year', 'pastyear' , + '/feed', 'feed' , + '/(\d\d\d\d)/(\d\d)/(\d\d)', 'day' , + '/(\d\d\d\d)-(\d\d)-(\d\d)', 'day' , + '/(\d\d\d\d)/(\d\d)', 'month' , + '/(\d\d\d\d)', 'year', + '', 'redir', + ) + +## This is the way to do it in web.py 0.3+ +#app = web.application(urls, globals()) + +## Workaround for autoreloading and sessions when using web.config.debug = True +## Note: I don't actually use sessions +#if web.config.get("_session") is None: +# session = web.session.Session(app, web.session.DiskStore('sessions'), initializer={'count': 0}) +# web.config._session = session +#else: +# session = web.config._session + +# read the paragraphs from a file +def readFile(filepath): + f = open(filepath) + lines = map(str.strip, f.readlines()) + return makeParas(lines) + +def loadComment(filepath): + f = open(filepath) + nameline = f.readline().strip() + emailline = f.readline().strip() + websiteline = f.readline().strip() + timestamp = f.readline().strip() + commentbody = makeParas(map(str.strip, f.readlines())) + m = md5.new() + m.update(emailline.lower()) + gravatar = "http://www.gravatar.com/avatar/%s?s=48&d=identicon" % str(m.hexdigest()) + #timestamp = datetime.datetime.fromtimestamp(os.stat(filepath).st_mtime).isoformat() + return (nameline, emailline, websiteline, commentbody, timestamp, gravatar) + +def getCommentFiles(date): # Returns a list of paths to comment files associated with date + filelist = filter( lambda x: re.match(date, x), os.listdir(pwd + "/comments")) + return filelist + +# Collect lines into paragraph blocks. Returns a list of strings, each containing a well-formed HTML block. +def makeParas(lines): + paragraphs = [] + thispara = [] + for line in lines: + if len(line) != 0: + thispara.append(line) + else: + paragraphs.append("\n".join(thispara)) + thispara = [] + if len(thispara) > 0: + paragraphs.append("\n".join(thispara)) + + # wrap paragraphs in

if they aren't other HTML tags that don't want to be wrapped in

tags + return map( lambda x: x if "

" in x else "" + x + "", paragraphs)
+
+
+def getFileList(numdays=7):
+	files = os.listdir(pwd + "/entries")
+	today = datetime.date.today()
+	then = today - datetime.timedelta(days=numdays)
+	return filter( lambda x: x > then.isoformat() , sorted(files))
+
+class year:
+	def GET(self, theyear):
+		files = sorted(os.listdir(pwd + "/entries"))
+		filelist = filter( lambda x: re.match(theyear, x), files)
+		filelist = map( lambda x: pwd + "/entries/" + x, filelist)
+		# It makes more sense to sort fixed chunks of time in chronological order, rather than feed-style
+		#filelist.reverse()
+		dates = map( lambda filename: re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename), filelist )
+		entries = map( readFile, filelist)
+		commentcounts = map(len, map( getCommentFiles, dates))
+		render = web.template.render(pwd + "/templates")
+		# This mess is because web.py 0.2 doesn't include passing common useful functions to the template engine
+		web.template.Template.globals['xrange'] = xrange
+		web.template.Template.globals['len'] = len
+		print render.multiday(zip(dates, entries, commentcounts), "Entries from %s" % theyear)
+		# This is the web.py 0.3+ way to do it.
+		#return render.multiday(dates, entries, "Entries from %s" % theyear)
+
+class month:
+	def GET(self, theyear, themonth):
+		files = sorted(os.listdir(pwd + "/entries"))
+		filelist = filter( lambda x: re.match("%s-%s" % (theyear, themonth), x), files)
+		filelist = map( lambda x: pwd + "/entries/" + x, filelist)
+		#filelist.reverse()
+		dates = map( lambda filename: re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename), filelist )
+		entries = map( readFile, filelist)
+		commentcounts = map(len, map( getCommentFiles, dates))
+		render = web.template.render(pwd + "/templates")
+		web.template.Template.globals['xrange'] = xrange
+		web.template.Template.globals['len'] = len
+		print render.multiday(zip(dates, entries, commentcounts), "Entries from %s, %s" % (monthnames[themonth], theyear))
+
+class day:
+	def GET(self, year, month, day):
+		filename = pwd + "/entries/" + year + "-" + month + "-" + day + ".txt"
+		if os.path.isfile(filename):
+			paras = readFile(filename)
+			commentfilelist = os.listdir(pwd + "/comments")
+			files = filter(lambda x: re.match("(.*)" + year + "-" + month + "-" + day + "_(\d\d\d\d\d\d).txt$", x), commentfilelist)
+			files = sorted([pwd + "/comments/" + x for x in files])
+			comments = []
+			for f in files:
+				comments.append(loadComment(f))
+			render = web.template.render(pwd + "/templates")
+			web.template.Template.globals['xrange'] = xrange
+			web.template.Template.globals['len'] = len
+			print render.day("%s-%s-%s" % (year, month, day), paras, comments)
+		else:
+			render = web.template.render(pwd + "/templates")
+			web.template.Template.globals['xrange'] = xrange
+			web.template.Template.globals['len'] = len
+			print render.noentry("%s-%s-%s" % (year, month, day))
+
+
+	def POST(self, year, month, day):
+		i = web.input()
+		name = i.name.strip()
+		email = i.email.strip()
+		website = i.website.strip()
+		if website != "" and not website.startswith("http"):
+			website = "http://" + website
+		comment = i.comment.strip()
+		timestamp = datetime.datetime.today().isoformat()
+		# find a file name that isn't taken
+		fname = ""
+		for i in xrange(0, 1000000):
+			fname = pwd + "/pending/" + year + "-" + month + "-" + day + "_" + ("%06d" % i) + ".txt"
+			if not os.path.exists(fname):
+				break
+		f = open(fname, "a+")
+		f.write(name + "\n")
+		f.write(email + "\n")
+		f.write(website + "\n")
+		f.write(timestamp + "\n")
+		f.write(comment + "\n")
+		f.close()
+
+		s = smtplib.SMTP("127.0.0.1")
+		s.sendmail("shortlog@zarvox.org", ["drew.m.fisher@gmail.com"], "To: Drew Fisher \nFrom: Shortlog \nSubject: [shortlog] new comment on %s-%s-%s\n\nName: %s\nEmail: %s\nWebsite: %s\nComment: %s" % (year, month, day, name, email, website, comment ))
+		s.quit()
+		web.header('Content-Type', 'text/html')
+		print "Thanks! Your comment has been submitted and will be posted pending review."
+#		paras = readFile(pwd + "/entries/" + year + "-" + month + "-" + day + ".txt")
+#		render = web.template.render(pwd + "/templates")
+#		web.template.Template.globals['xrange'] = xrange
+#		web.template.Template.globals['len'] = len
+#		print render.day("%s-%s-%s" % (year, month, day), paras)
+
+
+class pastyear:
+	def GET(self):
+		filelist = map( lambda x: pwd + "/entries/" + x, getFileList(365) )
+		filelist.reverse()
+		dates = map( lambda filename: re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename), filelist )
+		entries = map( readFile, filelist)
+		commentcounts = map(len, map( getCommentFiles, dates))
+		render = web.template.render(pwd + "/templates")
+		web.template.Template.globals['xrange'] = xrange
+		web.template.Template.globals['len'] = len
+		print render.multiday(zip(dates, entries, commentcounts))
+
+class pastmonth:
+	def GET(self):
+		filelist = map( lambda x: pwd + "/entries/" + x, getFileList(30) )
+		filelist.reverse()
+		dates = map( lambda filename: re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename), filelist )
+		entries = map( readFile, filelist)
+		commentcounts = map(len, map( getCommentFiles, dates))
+		render = web.template.render(pwd + "/templates")
+		web.template.Template.globals['xrange'] = xrange
+		web.template.Template.globals['len'] = len
+		print render.multiday(zip(dates, entries, commentcounts))
+
+class pastweek:
+	def GET(self):
+		filelist = map( lambda x: pwd + "/entries/" + x, getFileList(7) )
+		filelist.reverse()
+		dates = map( lambda filename: re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", filename), filelist )
+		entries = map( readFile, filelist)
+		commentcounts = map(len, map( getCommentFiles, dates))
+		render = web.template.render(pwd + "/templates")
+		web.template.Template.globals['xrange'] = xrange
+		web.template.Template.globals['len'] = len
+		print render.multiday(zip(dates, entries, commentcounts))
+
+class redir:
+	def GET(self): 
+		web.redirect("/")
+
+class feed:
+	def GET(self):
+		web.header('Content-Type', 'application/atom+xml')
+		filelist = os.listdir(pwd + "/entries")
+		files = filter(lambda x: re.match("(.*)(\d\d\d\d-\d\d-\d\d).txt$", x), filelist)
+		files = [pwd + "/entries/" + x for x in files]
+		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:
+			return render.feed(datetime.datetime.today(), [] )
+		group_timestamp = datetime.datetime.fromtimestamp(decorated[0][0]).isoformat() + "-06:00"
+		entries = []
+		for d in decorated[:10]:
+			mtime = datetime.datetime.fromtimestamp(d[0])
+			second = {"date" : re.sub("(.*)(\d\d\d\d-\d\d-\d\d).txt", "\g<2>", d[1]),
+					"content": "".join(readFile(d[1])),
+					"timestamp": (mtime.isoformat() + "-06:00") }
+			entries.append(second)
+		render = web.template.render(pwd +"/templates")
+		print render.feed(group_timestamp, entries)
+
+# web.py 0.3+ way
+#application = web.application(urls, globals()).wsgifunc()
+
+# web.py 0.2 way
+application = web.wsgifunc(web.webpyfunc(urls, globals()))
+
+if __name__ == "__main__":
+	## The web.py 0.3+ way
+	#app.run()
+	## The web.py 0.2 way
+	web.run(urls, globals())
+
diff --git a/static/.gitignore b/static/.gitignore
new file mode 100644
index 0000000..88cc107
--- /dev/null
+++ b/static/.gitignore
@@ -0,0 +1,2 @@
+*.jpg
+*.png
diff --git a/templates/day.html b/templates/day.html
new file mode 100644
index 0000000..df4b4fe
--- /dev/null
+++ b/templates/day.html
@@ -0,0 +1,42 @@
+$def with (date, paras, comments)
+ 
+ 
+ 
+ 
+Shortlog - a log of everyday things 
+ 
+ 
+Shortlog - a log of everyday things 
+Home
+
+$date
+$for p in paras:
+	$:p
+
+
+$if len(comments) > 0:
+	
Comments:
+$for c in comments:
+	
+	
+	$if c[2]:
+		
$c[0] | $c[4]
+	$else:
+		$c[0] | $c[4]
+	$for paragraph in c[3]:
+		$:paragraph
+	
+	
+
+
+Write a comment:
+
+	Name
+	Email (required, but won't be posted)
+	Website (optional)
+	
+	
+
+
+
+
diff --git a/templates/feed.xml b/templates/feed.xml
new file mode 100644
index 0000000..86c7721
--- /dev/null
+++ b/templates/feed.xml
@@ -0,0 +1,22 @@
+$def with (timestamp, entries)
+
+
+	Shortlog
+	A log of everyday things
+	
+	
+	http://zarvox.org/shortlog/
+	$timestamp
+	
+		Drew Fisher
+		zarvox@zarvox.org
+	
+$for entry in entries:
+	
+		$entry["date"]
+		
+		http://zarvox.org/shortlog/$entry['date']
+		$entry["timestamp"]
+		$entry["content"]
+	
+
diff --git a/templates/multiday.html b/templates/multiday.html
new file mode 100644
index 0000000..b9fc9c7
--- /dev/null
+++ b/templates/multiday.html
@@ -0,0 +1,24 @@
+$def with (entries, notes="")
+$# entries is a list of tuples as follows:
+$# (date of entry,
+$#  [paragraphs],
+$#  comment count)
+ 
+ 
+ 
+ 
+Shortlog - a log of everyday things 
+ 
+ 
+Shortlog - a log of everyday things 
+View the past: Week Month Year
+Atom Feed
+$notes
+$for i in xrange(len(entries)):
+	
+	$entries[i][0] | $entries[i][2] comments
+	$for sec in entries[i][1]:
+		$:sec
+	
+
+
diff --git a/templates/noentry.html b/templates/noentry.html
new file mode 100644
index 0000000..1402f10
--- /dev/null
+++ b/templates/noentry.html
@@ -0,0 +1,13 @@
+$def with (date)
+ 
+ 
+ 
+ 
+Shortlog - a log of everyday things 
+ 
+ 
+Shortlog - a log of everyday things 
+Home
+There's no entry for $date.  Perhaps you reached this page by mistake?
+
+
-- 
2.39.2