dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Code cleanup.

Browse source
This commit is contained in:
Bastian Kleineidam 2013-04-11 18:27:43 +02:00
parent cacbf3bf7d
commit 6ca4eaa492
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dosagelib/events.py
View file

@ -106,6 +106,7 @@ class HtmlEventHandler(EventHandler):
"""Output in HTML format.""" """Output in HTML format."""
name = 'html' name = 'html'
encoding = 'utf-8'
def fnFromDate(self, date): def fnFromDate(self, date):
"""Get filename from date.""" """Get filename from date."""
@ -134,18 +135,18 @@ class HtmlEventHandler(EventHandler):
yesterdayUrl = self.getUrlFromFilename(self.fnFromDate(yesterday)) yesterdayUrl = self.getUrlFromFilename(self.fnFromDate(yesterday))
tomorrowUrl = self.getUrlFromFilename(self.fnFromDate(tomorrow)) tomorrowUrl = self.getUrlFromFilename(self.fnFromDate(tomorrow))
self.html = codecs.open(fn, 'w', 'utf-8') self.html = codecs.open(fn, 'w', self.encoding)
self.html.write(u'''<!DOCTYPE html> self.html.write(u'''<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=%s"/>
<meta name="generator" content="%s"/> <meta name="generator" content="%s"/>
<title>Comics for %s</title> <title>Comics for %s</title>
</head> </head>
<body> <body>
<a href="%s">Previous Day</a> | <a href="%s">Next Day</a> <a href="%s">Previous Day</a> | <a href="%s">Next Day</a>
<ul> <ul>
''' % (configuration.App, time.strftime('%Y/%m/%d', today), ''' % (self.encoding, configuration.App, time.strftime('%Y/%m/%d', today),
yesterdayUrl, tomorrowUrl)) yesterdayUrl, tomorrowUrl))
# last comic name (eg. CalvinAndHobbes) # last comic name (eg. CalvinAndHobbes)
self.lastComic = None self.lastComic = None
@ -189,6 +190,7 @@ class JSONEventHandler(EventHandler):
"""Output metadata for comics in JSON format.""" """Output metadata for comics in JSON format."""
name = 'json' name = 'json'
encoding = 'utf-8'
def start(self): def start(self):
"""Start with empty data.""" """Start with empty data."""
@ -204,7 +206,7 @@ class JSONEventHandler(EventHandler):
"""Return dictionary with comic info.""" """Return dictionary with comic info."""
if comic not in self.data: if comic not in self.data:
if os.path.exists(self.jsonFn(comic)): if os.path.exists(self.jsonFn(comic)):
with codecs.open(self.jsonFn(comic), 'r', 'utf-8') as f: with codecs.open(self.jsonFn(comic), 'r', self.encoding) as f:
self.data[comic] = json.load(f) self.data[comic] = json.load(f)
else: else:
self.data[comic] = {'pages':{}} self.data[comic] = {'pages':{}}
@ -230,7 +232,7 @@ class JSONEventHandler(EventHandler):
def end(self): def end(self):
"""Write all JSON data to files.""" """Write all JSON data to files."""
for comic in self.data: for comic in self.data:
with codecs.open(self.jsonFn(comic), 'w', 'utf-8') as f: with codecs.open(self.jsonFn(comic), 'w', self.encoding) as f:
json.dump(self.data[comic], f, indent=2, separators=(',', ': '), sort_keys=True) json.dump(self.data[comic], f, indent=2, separators=(',', ': '), sort_keys=True)
@ -255,7 +257,7 @@ def getHandlerNames():
_handlers = [] _handlers = []
def addHandler(name, basepath=None, baseurl=None): def addHandler(name, basepath=None, baseurl=None):
"""Install a global handler with given name.""" """Add an event handler with given name."""
if basepath is None: if basepath is None:
basepath = '.' basepath = '.'
_handlers.append(_handler_classes[name](basepath, baseurl)) _handlers.append(_handler_classes[name](basepath, baseurl))