%s: %s

' + print('

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

' - try: - sendfile(sys.stdout, open('gurumeditation.js', 'rb')) - except IOError, err: - pass + print '\n Guru Meditation #DEADBEEF.ABADC0DE' + print('

\n' % self.h_level @@ -360,57 +409,46 @@ class WikiFormatter: return self._undent() + '\n

' \ - + link_inline(name, descr, args) \ + args, kvargs = parse_args(word) + name = args.pop(0) + if len(args): + descr = args.pop(0) + # This double div nonsense works around a limitation of the HTML block model + return '

' \ + + '

' \ + + link_inline_glob(name, descr, kvargs) \ + '

' + descr + '

' else: - return link_inline(name, name) + return link_inline_glob(name, None, kvargs) def _html_repl(self, word): + if not self.in_html and word.startswith('

' + print('

') scan_re = re.compile(r"""(?: - # Styles and formatting - (?P \*\*|'''|//|''|\#\#|``|__|\^\^|,,) + # Styles and formatting ("--" must cling to a word to disambiguate it from the dash) + (?P \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` ) | (?P \={2,6}) | (?P
\\\\) | (?P ^-{3,}) | (?P \b( FIXME | TODO | DONE )\b ) + | (?P --) # Links | (?P \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>) | (?P \[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]) # Inline HTML - | (?P <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b ) + | (?P <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b ) | (?P ( /\s*> | ) ) | (?P [<>&] ) # Auto links (LEGACY) - | (?P \b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)) + | (?P \b[a-zA-Z0-9_/-]+\.(""" + image_ext + "|" + video_ext + r""")) | (?P \b(?:[A-Z][a-z]+){2,}\b) | (?P (http|https|ftp|mailto)\:[^\s'\"]+\S) | (?P [-\w._+]+\@[\w.-]+) - # Lists, divs, spans + # Lists, divs, spans and inline objects | (?P

^\s+[\*\#]\s+) | (?P
\{\{\{|\s*\}\}\}) | (?P \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\}) @@ -553,9 +592,9 @@ class WikiFormatter: indent_re = re.compile(r"^\s*") tr_re = re.compile(r"^\s*\|\|") eol_re = re.compile(r"\r?\n") - # For each line, we scan through looking for magic strings, outputting verbatim any intervening text - for self.line in eol_re.split(self.raw.expandtabs()): + #3.0: for self.line in eol_re.split(str(self.raw.expandtabs(), 'utf-8')): + for self.line in eol_re.split(str(self.raw.expandtabs())): # Skip pragmas if self.in_header: if self.line.startswith('#'): @@ -563,23 +602,24 @@ class WikiFormatter: self.in_header = False if self.in_pre: - print re.sub(pre_re, self.replace, self.line) + print(re.sub(pre_re, self.replace, self.line)) else: if self.in_table and not tr_re.match(self.line): self.in_table = False - print '
' + print('
') if blank_re.match(self.line): - print '
' + print('
') else: indent = indent_re.match(self.line) - print self._indent_to(len(indent.group(0))) , - print re.sub(scan_re, self.replace, self.line) + #3.0: print(self._indent_to(len(indent.group(0))), end=' ') + print(self._indent_to(len(indent.group(0)))) + print(re.sub(scan_re, self.replace, self.line)) - if self.in_pre: print '
' - if self.in_table: print '
' - print self._undent() - print '

' + if self.in_pre: print('') + if self.in_table: print('
') + print(self._undent()) + print('

') class Page: def __init__(self, page_name): @@ -592,10 +632,10 @@ class Page: return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) def _filename(self): - return os.path.join(data_dir, self.page_name) + return self.page_name def _tmp_filename(self): - return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#')) + return self.page_name + '.tmp' + str(os.getpid()) + '#' def exists(self): try: @@ -606,12 +646,14 @@ class Page: return False raise err - def get_raw_body(self): + def get_raw_body(self, default=None): try: return open(self._filename(), 'rb').read() except IOError, err: if err.errno == errno.ENOENT: - return '' # just doesn't exist, use default + if default is None: + default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name) + return default if err.errno == errno.EISDIR: return self.format_dir() raise err @@ -619,16 +661,17 @@ class Page: def format_dir(self): out = '== ' pathname = '' - for dirname in self.page_name.split('/'): + for dirname in self.page_name.strip('/').split('/'): pathname = (pathname + '/' + dirname) if pathname else dirname out += '[[' + pathname + '|' + dirname + ']]/' out += ' ==\n' for filename in page_list(self._filename(), file_re): - if img_re.match(filename): - if image_maxwidth: - maxwidth_arg = '|maxwidth=' + str(image_maxwidth) - out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n' + if image_re.match(filename): + maxwidth = config_get(image_maxwidth, '') + if maxwidth: + maxwidth = ' | maxwidth=' + str(maxwidth) + out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n' else: out += ' * [[' + self.page_name + '/' + filename + ']]\n' return out @@ -637,17 +680,17 @@ class Page: if not '_pragmas' in self.__dict__: self._pragmas = {} try: - f = open(self._filename(), 'rt') + file = open(self._filename(), 'rt') attr_re = re.compile(r"^#(\S*)(.*)$") - for line in f: + for line in file: m = attr_re.match(line) if not m: break self._pragmas[m.group(1)] = m.group(2).strip() - #print "bernie: _pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" + #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" except IOError, err: if err.errno != errno.ENOENT and err.errno != errno.EISDIR: - raise err + raise er return self._pragmas def pragma(self, name, default): @@ -674,9 +717,9 @@ class Page: def can_read(self): return self.can("read", True) - def send_naked(self): + def send_naked(self, kvargs=None): if self.can_read(): - WikiFormatter(self.get_raw_body()).print_html() + WikiFormatter(self.get_raw_body(), kvargs).print_html() else: send_guru("Read access denied by ACLs", "notice") @@ -700,7 +743,7 @@ class Page: if err.errno != errno.ENOENT: raise err return None - return strftime(datetime_fmt, modtime) + return strftime(config_get(datetime_fmt, '%a %d %b %Y %I:%M %p'), modtime) def send_editor(self, preview=None): send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) @@ -708,38 +751,18 @@ class Page: send_guru("Write access denied by ACLs", "error") return - filename = '' - if 'file' in form: - filename = form['file'].value - - print ('
Editing ' + self.page_name - + ' for ' + cgi.escape(remote_user()) - + ' from ' + cgi.escape(get_hostname(remote_host())) - + '
') - print '
' % relative_url(self.page_name) - print '' % (self.page_name) - print '
' % (self.page_name) - print '%s' % cgi.escape(preview or self.get_raw_body()) - print 'Or Upload a file: ' % filename - print """ -
- - - - -
-
- - """ - print "
" + link_tag('EditingTips') + "
" + if preview is None: + preview = self.get_raw_body(default='') + + link_inline("sys/EditPage", kvargs = { + 'EDIT_BODY': cgi.escape(preview), + #'EDIT_PREVIEW': WikiFormatter(preview).print_html(), + }) + if preview: - print "
" + print("
") WikiFormatter(preview).print_html() - print "
" + print("
") send_footer() def send_raw(self, mimetype='text/plain', args=[]): @@ -756,7 +779,7 @@ class Page: else: body = self.get_raw_body() emit_header(mimetype) - print body + print(body) def _write_file(self, data): tmp_filename = self._tmp_filename() @@ -768,6 +791,9 @@ class Page: os.remove(name) except OSError, err: if err.errno != errno.ENOENT: raise err + path = os.path.split(name)[0] + if not os.path.exists(path): + os.makedirs(path) os.rename(tmp_filename, name) def save(self, newdata, changelog): @@ -778,44 +804,34 @@ class Page: self._write_file(newdata) rc = 0 - if post_edit_hook: + if config_get('post_edit_hook'): import subprocess - cmd = [ post_edit_hook, data_dir + '/' + self.page_name, remote_user(), remote_host(), changelog] + cmd = [ + config_get('post_edit_hook'), + self.page_name, remote_user(), + remote_host(), changelog ] child = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) output = child.stdout.read() rc = child.wait() if rc: - self.msg_text += "Post-editing hook returned %d.\n" % rc - self.msg_text += 'Command was: ' + ' '.join(cmd) + '\n' + self.msg_text += "Post-editing hook returned %d. Command was:\n'%s'\n" % (rc, "' '".join(cmd)) if output: self.msg_text += 'Output follows:\n' + output else: self.msg_text = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' -def main(): - for cmd in form: - handler = globals().get('handle_' + cmd) - if handler: - handler(form[cmd].value) - break - else: - query = query_string() - if file_re.match(query): - # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension! - from mimetypes import MimeTypes - mimetype, encoding = MimeTypes().guess_type(query) - if mimetype: - Page(query).send_raw(mimetype=mimetype, args=form) - else: - Page(query).format() - else: - send_httperror("403 Forbidden", query) - try: - execfile("geekigeeki.conf.py") + exec(open("geekigeeki.conf.py").read()) + os.chdir(config_get('data_dir', 'data')) form = cgi.FieldStorage() - main() + action = form.getvalue('a', 'get') + handler = globals().get('handle_' + action) + if handler: + handler(query_string(), form) + else: + send_httperror("403 Forbidden", query_string()) + except Exception: import traceback msg_text = traceback.format_exc()