X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=12b6b7cdaec57d05e14baadd381c17a6431029bb;hb=75836706224e9f6b8ede6c59deea646e31672924;hp=a0345ee950f0c0fc750e874717dc9d5e34ddbad6;hpb=727c1cfdb0040ca5d95efb81c975d36d1f568c0b;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index a0345ee..12b6b7c 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -2,7 +2,7 @@ # # Copyright 1999, 2000 Martin Pool # Copyright 2002 Gerardo Poggiali -# Copyright 2007 Bernardo Innocenti +# Copyright 2007 Bernardo Innocenti # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -__version__ = '$Id$'[4:-2] +__version__ = '$Id$'[4:12] -import cgi, sys, string, os, re, errno, time, stat +from time import clock +start_time = clock() + +import cgi, sys, string, os, re, errno, stat from os import path, environ # Regular expression defining a WikiWord @@ -100,15 +103,16 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'): # Head emit_header() - print """ - -""" + print '' + print '' + + site_name = globals().get('site_name', 'Unconfigured Site') print "%s: %s" % (site_name, text) print ' ' if not name: print ' ' - if css_url: + if globals().has_key('css_url'): print ' ' % css_url print '' @@ -125,15 +129,17 @@ 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') print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') - print ' | Recent Changes' + if globals().has_key('history_url'): + print ' | Recent Changes' + if name: + print ' | Page History' if name: - print ' | Page History' print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') if privileged_url is not None: print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', authentication=True) @@ -184,13 +190,12 @@ def do_fullsearch(needle): for (count, page_name) in hits: print '

  • ' + Page(page_name).link_to() print ' . . . . ' + `count` - print ['match', 'matches'][count <> 1] + print ['match', 'matches'][count != 1] print '

    • ' print "" print_search_stats(len(hits), len(all_pages)) - def do_titlesearch(needle): # TODO: check needle is legal -- but probably we can just accept any RE send_title(None, "Title search for \"" + needle + '"') @@ -206,10 +211,10 @@ def do_titlesearch(needle): print_search_stats(len(hits), len(all_pages)) - def print_search_stats(hits, searched): print "

    %d hits out of %d pages searched.

    " % (hits, searched) +#TODO: merge into do_savepage() def do_edit(pagename): Page(pagename).send_editor() @@ -239,26 +244,23 @@ def make_index_key(): s = s + '

    ' 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 debug_cgi: + if globals().get('debug_cgi', False): cgi.print_arguments() cgi.print_form(cgi.FieldStorage()) cgi.print_environ() global __version__ print '' - # ---------------------------------------------------------- # Macros def _macro_TitleSearch(*vargs): @@ -292,7 +294,7 @@ def _macro_WordIndex(*vargs): # set title for word in all_words: letter = string.lower(word[0]) - if letter <> last_letter: + if letter != last_letter: s = s + ';

    %s

    ' % (letter, letter) last_letter = letter @@ -314,7 +316,7 @@ def _macro_TitleIndex(*vargs): current_letter = None for name in pages: letter = string.lower(name[0]) - if letter <> current_letter: + if letter != current_letter: s = s + '

    %s

    ' % (letter, letter) current_letter = letter else: @@ -332,23 +334,19 @@ 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_var = 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 _tit_repl(self, word): if self.h_level: @@ -356,10 +354,13 @@ 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 + 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) @@ -377,9 +378,9 @@ 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: @@ -391,7 +392,7 @@ class PageFormatter: elif name.startswith('/'): return '%s' % (name, descr) else: - return link_tag(name, descr) + return link_tag(name, descr, 'wikilink') def _email_repl(self, word): return '%s' % (word, word) @@ -441,16 +442,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): @@ -492,8 +494,10 @@ class PageFormatter: scan_re = re.compile( r"(?:" # Formatting - + r"(?P'{2,3})" + + r"(?P\*\*|''')" + + r"|(?P//|'')" + r"|(?P\={2,6})" + + r"|(?P
    \\\\)" + r"|(?P^-{3,})" + r"|(?P<(/|)(div|span|iframe)[^<>]*>)" + r"|(?P[<>&])" @@ -502,19 +506,19 @@ 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*\}\}\})"
+            + r"|(?P\{\{|\}\})"
 
             # 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"(?:" @@ -565,18 +569,18 @@ 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: os.stat(self._text_filename()) - return 1 + return True except OSError, er: if er.errno == errno.ENOENT: - return 0 + return False else: raise er @@ -592,10 +596,8 @@ class Page: return open(self._text_filename(), 'rt').read() except IOError, er: if er.errno == errno.ENOENT: - # just doesn't exist, use default - return 'Describe %s here.' % self.page_name - else: - raise er + return '' # just doesn't exist, use default + raise er def get_attrs(self): if self.attrs: @@ -649,10 +651,13 @@ class Page: send_footer(page_name, self._last_modified()) def _last_modified(self): - if not self.exists(): + try: + from time import localtime, strftime + modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME]) + except OSError, er: + if er.errno != errno.ENOENT: + raise er return None - from time import localtime, strftime - modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME]) return strftime(datetime_fmt, modtime) def send_editor(self, preview=None): @@ -699,7 +704,7 @@ class Page: try: os.remove(text) except OSError, er: - if er.errno <> errno.ENOENT: raise er + if er.errno != errno.ENOENT: raise er os.rename(tmp_filename, text) def save_text(self, newtext): @@ -713,7 +718,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() + "'" ) @@ -729,31 +734,16 @@ class Page: self.msg = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' +#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) # Main --------------------------------------------------------------- try: - # Configuration values - site_name = 'Codewiz' - - # set to None for read-only sites, leave empty ('') to allow anonymous edits - # otherwise, set to a URL that requires authentication - privileged_url = 'https://www.codewiz.org/~bernie/wiki' - - data_dir = '/home/bernie/public_html/wiki' - text_dir = path.join(data_dir, 'text') - css_url = '../wikidata/geekigeeki.css' # optional stylesheet link - history_url = '../wikigit/wiki.git' - post_edit_hook = './post_edit_hook.sh' - datetime_fmt = '%a %d %b %Y %I:%M %p' - allow_edit = True # Is it possible to edit pages? - show_hosts = True # show hostnames? - nonexist_pfx = '' # prefix before nonexistent link (usually '?') - debug_cgi = False # Set to True for CGI var dump + execfile("geekigeeki.conf.py") form = cgi.FieldStorage() @@ -783,7 +773,7 @@ try: else: send_verbatim(query) else: - # TODO: return 404? + print "Status: 404 Not Found" send_title(None, msg='Can\'t work out query: ' + query) except: import traceback