X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=7193d5520b50af8bb709453f3cb53f721d9c7efd;hb=e3f54bfe72a742afbe81e363bacc1869959f50c9;hp=e110d8dafe256395a021980b7d8813eb0fa5d58c;hpb=1549a288ad7fa65066b0b52739618c011898d2a3;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index e110d8d..7193d55 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -1,4 +1,5 @@ -#! /usr/bin/env python +#!/usr/bin/python +# -*- coding: utf-8 -*- # # Copyright 1999, 2000 Martin Pool # Copyright 2002 Gerardo Poggiali @@ -112,8 +113,8 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'): print ' ' if not name: print ' ' - if globals().has_key('css_url'): - print ' ' % css_url + for css in css_url: + print ' ' % css print '' # Body @@ -129,7 +130,7 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'): print '
' print ' ' + site_name + ': ', if name: - print link_tag('?fullsearch=' + name, text) + ' ' + print link_tag('?fullsearch=' + name, text, 'navlink') + ' ' else: print text + ' ' print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink') @@ -245,7 +246,7 @@ def make_index_key(): return s def page_list(): - return filter(word_re.match, os.listdir(text_dir)) + return filter(word_re.match, os.listdir(data_dir)) def send_footer(name, mod_string=None): if globals().get('debug_cgi', False): @@ -334,23 +335,23 @@ class PageFormatter: """ def __init__(self, raw): self.raw = raw - self.is_em = self.is_b = 0 self.h_level = 0 - self.h_count = 0 - self.list_indents = [] - self.in_pre = False - self.in_table = False - self.tr_cnt = 0 - self.in_var = False + self.in_pre = self.in_table = self.in_tt = self.in_em = self.in_b = False self.in_header = True + self.list_indents = [] + self.tr_cnt = self.h_cnt = 0 - def _emph_repl(self, word): - if len(word) == 3: - self.is_b = not self.is_b - return ['', ''][self.is_b] - else: - self.is_em = not self.is_em - return ['', ''][self.is_em] + def _b_repl(self, word): + self.in_b = not self.in_b + return ['', ''][self.in_b] + + def _em_repl(self, word): + self.in_em = not self.in_em + return ['', ''][self.in_em] + + def _tt_repl(self, word): + self.in_tt = not self.in_tt + return ['', ''][self.in_tt] def _tit_repl(self, word): if self.h_level: @@ -358,10 +359,14 @@ class PageFormatter: self.h_level = 0 else: self.h_level = len(word) - 1 - self.h_count += 1 - result = '* ' % (self.h_level, self.h_count, self.h_count) + self.h_cnt += 1 + #abridged = re.sub('[^a-z_]', '', word.lower().replace(' ', '_')) + result = '¶ ' % (self.h_level, self.h_cnt, self.h_cnt) return result + def _br_repl(self, word): + return '
' + def _rule_repl(self, word): return self._undent() + '\n
\n' % (len(word) - 2) @@ -379,21 +384,25 @@ class PageFormatter: return '%s' % (word, word) def _hurl_repl(self, word): - m = re.compile("\[\[(\S+)([^\]]*)\]\]").match(word) + m = re.compile("\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\]").match(word) name = m.group(1) - descr = m.group(2).strip() or name + descr = m.group(2) or name macro = globals().get('_macro_' + name) if macro: return apply(macro, (name, descr)) elif img_re.match(name): return '%s' % (name, name, descr) - elif url_re.match(name): - return '%s' % (name, descr) - elif name.startswith('/'): - return '%s' % (name, descr) else: - return link_tag(name, descr) + if img_re.match(descr): + descr = '' + + if url_re.match(name): + return '%s' % (name, descr) + elif name.startswith('/'): + return '%s' % (name, descr) + else: + return link_tag(name, descr, 'wikilink') def _email_repl(self, word): return '%s' % (word, word) @@ -427,15 +436,6 @@ class PageFormatter: cl = 'notice' return '' + word + '' - def _var_repl(self, word): - if word == '{{' and not self.in_var: - self.in_var = True - return '' - elif self.in_var: - self.in_var = False - return '' - return '' - def _tr_repl(self, word): out = '' if not self.in_table: @@ -443,16 +443,17 @@ class PageFormatter: self.tr_cnt = 0 out = '

\n' self.tr_cnt += 1 - return out + '' + return out + ['' + return ['', ''][word.strip() == '||='] return '' def _indent_level(self): @@ -494,8 +495,11 @@ class PageFormatter: scan_re = re.compile( r"(?:" # Formatting - + r"(?P'{2,3})" + + r"(?P\*\*|''')" + + r"|(?P//|'')" + + r"|(?P##|``)" + r"|(?P\={2,6})" + + r"|(?P
\\\\)" + r"|(?P^-{3,})" + r"|(?P<(/|)(div|span|iframe)[^<>]*>)" + r"|(?P[<>&])" @@ -504,19 +508,18 @@ class PageFormatter: # Links + r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" - + r"|(?P\[\[\S+[^\]]*\]\])" + + r"|(?P\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\])" + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" + r"|(?P[-\w._+]+\@[\w.-]+)" # Lists, divs, spans - + r"|(?P
  • ^\s+\*)" - + r"|(?P
    (\{\{\{|\s*\}\}\}))"
-            + r"|(?P(\{\{|\}\}))"
+            + r"|(?P
  • ^\s+[\*#] +)"
+            + r"|(?P
    \{\{\{|\s*\}\}\})"
 
             # Tables
-            + r"|(?P
    • ^\s*\|\|\s*)" - + r"|(?P\s*\|\|\s*$)" - + r"|(?P^\s*\|\|(=|)\s*)" + + r"|(?P\s*\|\|(=|)\s*$)" + + r"|(?P
    ' + out = out + '
    ', ''][word.strip() == '||='] - def _tre_repl(self, word): + def _td_repl(self, word): if self.in_table: - return '
    ', ''][word.strip() == '||='] return '' - def _td_repl(self, word): + def _tre_repl(self, word): if self.in_table: - return '' + return ['
    \s*\|\|\s*)" + + r"|(?P
    \s*\|\|(=|)\s*)" + r")") pre_re = re.compile( r"(?:" @@ -559,7 +562,6 @@ class Page: self.page_name = page_name self.msg = '' self.msg_type = 'error' - self.attrs = {} def split_title(self): # look for the end of words and the start of a new word, @@ -567,10 +569,10 @@ class Page: return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) def _text_filename(self): - return path.join(text_dir, self.page_name) + return path.join(data_dir, self.page_name) def _tmp_filename(self): - return path.join(text_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#')) + return path.join(data_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#')) def exists(self): try: @@ -598,8 +600,9 @@ class Page: raise er def get_attrs(self): - if self.attrs: + if self.__dict__.has_key('attrs'): return self.attrs + self.attrs = {} try: file = open(self._text_filename(), 'rt') attr_re = re.compile(r"^#(\S*)(.*)$") @@ -614,11 +617,16 @@ class Page: raise er return self.attrs + def get_attr(self, name, default): + if self.get_attrs().has_key(name): + return self.get_attrs()[name] + else: + return default + def can(self, action, default=True): - attrs = self.get_attrs() try: - # SomeUser:read,write All:read - acl = attrs["acl"] + #acl SomeUser:read,write All:read + acl = self.get_attr("acl", None) for rule in acl.split(): (user,perms) = rule.split(':') if user == remote_user() or user == "All": @@ -641,6 +649,12 @@ class Page: page_name = None if self.can_write(): page_name = self.page_name + + #FIXME: are there security implications? + #css foo.css bar.css + global css_url + css_url = css_url + self.get_attr("css", "").split() + send_title(page_name, self.split_title(), msg=self.msg, msg_type=self.msg_type) if self.can_read(): PageFormatter(self.get_raw_body()).print_html() @@ -670,7 +684,7 @@ class Page: + '

    ') print '
    ' % (script_name(), self.page_name) print '' % (self.page_name) - print """""" % (preview or self.get_raw_body()) + print """""" % (preview or self.get_raw_body()) print """
    @@ -716,7 +730,7 @@ class Page: if post_edit_hook: # FIXME: what's the std way to perform shell quoting in python? cmd = ( post_edit_hook - + " '" + text_dir + '/' + self.page_name + + " '" + data_dir + '/' + self.page_name + "' '" + remote_user() + "' '" + remote_host() + "'" ) @@ -734,7 +748,7 @@ class Page: #TODO: merge into send_raw() def send_verbatim(filename, mime_type='application/octet-stream'): - pathname = path.join(text_dir, filename) + pathname = path.join(data_dir, filename) data = open(pathname, 'rb').read() emit_header(mime_type) sys.stdout.write(data)