X-Git-Url: https://git.llucax.com/software/blitiri.git/blobdiff_plain/2b64be9dc6ae52efdbc2beaf76b87c747857c4a1..HEAD:/blitiri.cgi diff --git a/blitiri.cgi b/blitiri.cgi index 8ce4298..532bf72 100755 --- a/blitiri.cgi +++ b/blitiri.cgi @@ -51,6 +51,9 @@ encoding = "utf8" # below for details. captcha_method = "title" +# How many articles to show in the index +index_articles = 10 + # # End of configuration @@ -192,6 +195,7 @@ default_main_footer = """ years: %(yearlinks)s
subscribe: atom
views: blog list
+ tags: %(taglinks)s
@@ -583,6 +587,7 @@ class Templates (object): 'showyear': showyear, 'monthlinks': ' '.join(db.get_month_links(showyear)), 'yearlinks': ' '.join(db.get_year_links()), + 'taglinks': ' '.join(db.get_tag_links()), } def get_template(self, page_name, default_template, extra_vars = None): @@ -615,9 +620,9 @@ class Templates (object): vars = comment.to_vars() if comment.link: vars['linked_author'] = '%s' \ - % (comment.link, comment.author) + % (vars['link'], vars['author']) else: - vars['linked_author'] = comment.author + vars['linked_author'] = vars['author'] return self.get_template( 'com_header', default_comment_header, vars) @@ -776,7 +781,7 @@ class CommentDB (object): # if comments were enabled after the article was added, we # will need to create the directory if not os.path.exists(self.path): - os.mkdir(self.path, 0755) + os.mkdir(self.path, 0777) self.comments = [] self.load(article) @@ -864,19 +869,11 @@ class Article (object): self.load() return self._comments - def __cmp__(self, other): - if self.path == other.path: - return 0 - if not self.created: - return 1 - if not other.created: - return -1 - if self.created < other.created: - return -1 - return 1 - def title_cmp(self, other): - return cmp(self.title, other.title) + def __eq__(self, other): + if self.path == other.path: + return True + return False def add_comment(self, author, raw_content, link = ''): @@ -920,7 +917,10 @@ class Article (object): self.loaded = True def to_html(self): - return rst_to_html(self.raw_content) + dirname = os.path.dirname + post_url = '/'.join(dirname(full_url), data_path, dirname(self.path)) + rst = self.raw_content.replace('##POST_URL##', post_url) + return rst_to_html(rst) def to_vars(self): return { @@ -967,6 +967,7 @@ class ArticleDB (object): self.uuids = {} self.actyears = set() self.actmonths = set() + self.acttags = set() self.load() def get_articles(self, year = 0, month = 0, day = 0, tags = None): @@ -1004,6 +1005,7 @@ class ArticleDB (object): datetime.datetime.fromtimestamp(float(l[1])), datetime.datetime.fromtimestamp(float(l[2]))) self.uuids[a.uuid] = a + self.acttags.update(a.tags) self.actyears.add(a.created.year) self.actmonths.add((a.created.year, a.created.month)) self.articles.append(a) @@ -1038,6 +1040,12 @@ class ArticleDB (object): ml.append(s) return ml + def get_tag_links(self): + tl = list(self.acttags) + tl.sort() + return [ '%s' % (blog_url, + sanitize(t), sanitize(t)) for t in tl ] + # # Main # @@ -1125,9 +1133,9 @@ def render_atom(articles): %(ciso)sZ %(uiso)sZ -

+

%(contents)s -

+
""" % vars @@ -1138,6 +1146,37 @@ def render_style(): print 'Content-type: text/css\r\n\r\n', print default_css +# Get a dictionary with sort() arguments (key and reverse) by parsing the sort +# specification format: +# [+-]?? +# Where "-" is used to specify reverse order, while "+" is regular, ascending, +# order (reverse = False). The key value is an Article's attribute name (title, +# author, created, updated and uuid are accepted), and will be used as key for +# sorting. If a value is omitted, that value is taken from the default, which +# should be provided using the same format specification, with the difference +# that all values must be provided for the default. +def get_sort_args(sort_str, default): + def parse(s): + d = dict() + if not s: + return d + key = None + if len(s) > 0: + # accept ' ' as an alias of '+' since '+' is translated + # to ' ' in URLs + if s[0] in ('+', ' ', '-'): + key = s[1:] + d['reverse'] = (s[0] == '-') + else: + key = s + if key in ('title', 'author', 'created', 'updated', 'uuid'): + d['key'] = lambda a: getattr(a, key) + return d + args = parse(default) + assert args['key'] is not None and args['reverse'] is not None + args.update(parse(sort_str)) + return args + def handle_cgi(): import cgitb; cgitb.enable() @@ -1146,6 +1185,7 @@ def handle_cgi(): month = int(form.getfirst("month", 0)) day = int(form.getfirst("day", 0)) tags = set(form.getlist("tag")) + sort_str = form.getfirst("sort", None) uuid = None atom = False style = False @@ -1204,8 +1244,8 @@ def handle_cgi(): db = ArticleDB(os.path.join(data_path, 'db')) if atom: articles = db.get_articles(tags = tags) - articles.sort(reverse = True) - render_atom(articles[:10]) + articles.sort(**get_sort_args(sort_str, '-created')) + render_atom(articles[:index_articles]) elif style: render_style() elif post: @@ -1216,9 +1256,9 @@ def handle_cgi(): render_html( [article], db, year, enable_comments ) elif artlist: articles = db.get_articles() - articles.sort(cmp = Article.title_cmp) + articles.sort(**get_sort_args(sort_str, '+title')) render_artlist(articles, db) - elif comment: + elif comment and enable_comments: form_data = CommentFormData(author.strip().replace('\n', ' '), link.strip().replace('\n', ' '), captcha, body.replace('\r', '')) @@ -1266,9 +1306,9 @@ def handle_cgi(): form_data ) else: articles = db.get_articles(year, month, day, tags) - articles.sort(reverse = True) + articles.sort(**get_sort_args(sort_str, '-created')) if not year and not month and not day and not tags: - articles = articles[:10] + articles = articles[:index_articles] render_html(articles, db, year)