%s: %s

' if msg_type == 'error': print ' Software Failure. Press left mouse button to continue.\n' - print msg + print msg_text if msg_type == 'error': print ' Guru Meditation #DEADBEEF.ABADC0DE' print '

' + 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"(?:" + r"(?P \s\}\}\})" + + r"\|(?P[<>&])" + r")") blank_re = re.compile(r"^\s$") indent_re = re.compile(r"^\s") tr_re = re.compile(r"^\s\\|\\|") eol_re = re.compile(r"\r?\n") - raw = string.expandtabs(self.raw) - for line in eol_re.split(raw): + for self.line in eol_re.split(self.raw.expandtabs()): # Skip ACLs if self.in_header: - if line.startswith('#'): - continue + if self.line.startswith('#'): + continue self.in_header = False if self.in_pre: - print re.sub(pre_re, self.replace, line) + print re.sub(pre_re, self.replace, self.line) else: - if self.in_table and not tr_re.match(line): + if self.in_table and not tr_re.match(self.line): self.in_table = False print '

' + 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"(?:" + r"(?P

\s*\}\}\})"
+            + r"|(?P[<>&])"
             + r")")
         blank_re = re.compile(r"^\s*$")
         indent_re = re.compile(r"^\s*")
         tr_re = re.compile(r"^\s*\|\|")
         eol_re = re.compile(r"\r?\n")
-        raw = string.expandtabs(self.raw)
-        for line in eol_re.split(raw):
+        for self.line in eol_re.split(self.raw.expandtabs()):
             # Skip ACLs
             if self.in_header:
-                if line.startswith('#'):
-                   continue
+                if self.line.startswith('#'):
+                    continue
                 self.in_header = False
 
             if self.in_pre:
-                print re.sub(pre_re, self.replace, line)
+                print re.sub(pre_re, self.replace, self.line)
             else:
-                if self.in_table and not tr_re.match(line):
+                if self.in_table and not tr_re.match(self.line):
                     self.in_table = False
                     print '

Editing ' + self.page_name + ' for ' + cgi.escape(remote_user()) + ' from ' + cgi.escape(get_hostname(remote_host())) + '

' % (script_name(), self.page_name) - print '' % (self.page_name) - print """""" % (preview or self.get_raw_body()) + print '

' % relative_url(self.page_name) + print '' % (self.page_name) + print '' % (preview or self.get_raw_body()) + print 'Or upload a file: ' % file print """
@@ -683,89 +697,62 @@ class Page: print "

" send_footer(self.page_name) - def send_raw(self): - if not self.can_read(): - send_title(None, msg='Read access denied by ACLs', msg_type='notice') - return - emit_header("text/plain") - print self.get_raw_body() + def send_raw(self, mimetype='text/plain'): + if self.can_read(): + body = self.get_raw_body() + emit_header(mimetype) + print body + else: + send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') - def _write_file(self, text): + def _write_file(self, data): tmp_filename = self._tmp_filename() - open(tmp_filename, 'wt').write(text.replace('\r\n', '\n')) - text = self._text_filename() + open(tmp_filename, 'wb').write(data) + name = self._text_filename() if os.name == 'nt': # Bad Bill! POSIX rename ought to replace. :-( try: - os.remove(text) + os.remove(name) except OSError, er: - if er.errno <> errno.ENOENT: raise er - os.rename(tmp_filename, text) + if er.errno != errno.ENOENT: raise er + os.rename(tmp_filename, name) - def save_text(self, newtext): + def save(self, newdata): if not self.can_write(): - self.msg = 'Write access denied by ACLs' + self.msg_text = 'Write access denied by ACLs' self.msg_type = 'error' return - self._write_file(newtext) + self._write_file(newdata) rc = 0 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() + "'" ) out = os.popen(cmd) - msg = out.read() + output = out.read() rc = out.close() if rc: - self.msg += "Post-editing hook returned %d.\n" % rc - self.msg += 'Command was: ' + cmd + '\n' - if msg: - self.msg += 'Output follows:\n' + msg + self.msg_text += "Post-editing hook returned %d.\n" % rc + self.msg_text += 'Command was: ' + cmd + '\n' + if output: + self.msg_text += 'Output follows:\n' + output else: - self.msg = 'Thank you for your contribution. Your attention to detail is appreciated.' + self.msg_text = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' -def send_verbatim(filename, mime_type='application/octet-stream'): - pathname = path.join(text_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() - handlers = { 'fullsearch': do_fullsearch, - 'titlesearch': do_titlesearch, - 'edit': do_edit, - 'raw': do_raw, - 'savepage': do_savepage } - - for cmd in handlers.keys(): - if form.has_key(cmd): - apply(handlers[cmd], (form[cmd].value,)) + for cmd in form: + handler = globals().get('handle_' + cmd) + if handler: + handler(form[cmd].value) break else: path_info = environ.get('PATH_INFO', '') @@ -777,21 +764,22 @@ try: if file_re.match(query): if word_re.match(query): Page(query).send_page() - elif img_re.match(query): - #FIXME: use correct mime type - send_verbatim(query, 'image/jpeg') else: - send_verbatim(query) + from mimetypes import MimeTypes + type, encoding = MimeTypes().guess_type(query) + type = type or 'text/plain' + Page(query).send_raw(mimetype=type) else: - # TODO: return 404? - send_title(None, msg='Can\'t work out query: ' + query) -except: + print "Status: 404 Not Found" + send_title(None, msg_text='Can\'t work out query: ' + query) + send_footer(None) +except Exception: import traceback - msg=traceback.format_exc() + msg_text = traceback.format_exc() if title_done: - send_guru(msg, "error") + send_guru(msg_text, "error") else: - send_title(None, msg=msg) + send_title(None, msg_text=msg_text) send_footer(None) sys.stdout.flush()