') - print link_tag('FrontPage', site_icon or 'Home', 'navlink') + print link_tag('FrontPage', site_icon or 'Home', cssclass='navlink') if name: - print(' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ') + print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') else: print(' ' + text + ' ') - print(' | ' + link_tag('FindPage', 'Find Page', 'navlink')) + print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) if 'history_url' in globals(): print(' | Recent Changes') if name: print(' | Page History') if name: - print(' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')) + print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) if privileged_url is not None: if writable: - print(' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)) + print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) else: - print(' | ' + link_tag(name, 'Login', 'navlink', privileged=True)) + print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) else: print(' | Immutable Page') @@ -175,45 +196,50 @@ def send_httperror(status="403 Not Found", query=""): send_title(None, msg_text=("%s: on query '%s'" % (status, query))) send_footer() -def link_tag(params, text=None, link_class=None, privileged=False): +def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: - text = params # default - elif img_re.match(text): + text = humanlink(dest) + elif image_re.match(text): text = '

' + link_class = kvargs.get('class', kvargs.get('cssclass', None)) if not link_class: - if is_external_url(params): + if is_external_url(dest): link_class = 'external' - elif file_re.match(params) and Page(params).exists(): + elif file_re.match(dest) and Page(dest).exists(): link_class = 'wikilink' else: - params = nonexist_pfx + params + text = nonexist_pfx + text link_class = 'nonexistent' - classattr = 'class="%s" ' % link_class # Prevent crawlers from following links potentially added by spammers or to generated pages + nofollow = '' if link_class == 'external' or link_class == 'navlink': - classattr += 'rel="nofollow"' + nofollow = 'rel="nofollow" ' - return '%s' % (classattr, relative_url(params, privileged=privileged), text) + return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text) -def link_inline(name, descr=None, args=''): - if not descr: descr = name +def link_inline(name, descr=None, kvargs={}): + if not descr: descr = humanlink(name) url = relative_url(name) if video_re.match(name): - return '

' % url - elif img_re.match(name): - return '

' % (url, url + args, descr) + return '

' % url + elif image_re.match(name): + return '

' % (url, url + url_args(kvargs), descr) elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page - return Page(name).send_naked() + return Page(name).send_naked(kvargs) else: return '' \ % (url, url, name) # Search --------------------------------------------------- -def handle_fullsearch(needle): - send_title(None, 'Full text search for "%s"' % (needle)) +def print_search_stats(hits, searched): + print("

%d hits out of %d pages searched.

" % (hits, searched)) + +def handle_fullsearch(query, form): + needle = form['q'].value + send_title(None, 'Full text search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) hits = [] @@ -239,9 +265,9 @@ def handle_fullsearch(needle): print_search_stats(len(hits), len(all_pages)) -def handle_titlesearch(needle): - # TODO: check needle is legal -- but probably we can just accept any RE - send_title(None, "Title search for \"" + needle + '"') +def handle_titlesearch(query, form): + needle = form['q'].value + send_title(None, 'Title search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) all_pages = page_list() @@ -254,22 +280,19 @@ def handle_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)) - -def handle_raw(pagename): +def handle_raw(pagename, form): if not file_re.match(pagename): send_httperror("403 Forbidden", pagename) return Page(pagename).send_raw() -def handle_edit(pagename): +def handle_edit(pagename, form): if not file_re.match(pagename): send_httperror("403 Forbidden", pagename) return - pg = Page(pagename) + pg = Page(form['q'].value) if 'save' in form: if form['file'].value: pg.save(form['file'].file.read(), form['changelog'].value) @@ -286,12 +309,27 @@ def handle_edit(pagename): text = form['savetext'].value pg.send_editor(text) +def handle_get(pagename, form): + if file_re.match(pagename): + # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension! + from mimetypes import MimeTypes + mimetype, encoding = MimeTypes().guess_type(pagename) + if mimetype: + Page(pagename).send_raw(mimetype=mimetype, args=form) + else: + Page(pagename).format() + else: + send_httperror("403 Forbidden", pagename) + # Used by macros/WordIndex and macros/TitleIndex def make_index_key(): links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '

' + ' | '.join(links) + '

' -def page_list(dirname = None, re = word_re): +def page_list(dirname=None, re=None): + if re is None: + # FIXME: WikiWord is too restrictive now! + re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") return sorted(filter(re.match, os.listdir(dirname or data_dir))) def send_footer(mod_string=None): @@ -299,16 +337,14 @@ def send_footer(mod_string=None): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - print(''' -') + link_inline("sys/footer", kvargs= { 'LAST_MODIFIED': mod_string }) + print("") + +def _macro_ELAPSED_TIME(*args, **kvargs): + return "%03f" % (clock() - start_time) + +def _macro_VERSION(*args, **kvargs): + return __version__ class WikiFormatter: """Object that turns Wiki markup into HTML. @@ -316,8 +352,9 @@ class WikiFormatter: All formatting commands can be parsed one line at a time, though some state is carried over between lines. """ - def __init__(self, raw): + def __init__(self, raw, kvargs=None): self.raw = raw + self.kvargs = kvargs or {} self.h_level = 0 self.in_pre = self.in_html = self.in_table = self.in_li = False self.in_header = True @@ -329,6 +366,7 @@ class WikiFormatter: "**": ["b", False], "##": ["tt", False], "__": ["u", False], + "--": ["del", False], "^^": ["sup", False], ",,": ["sub", False], "''": ["em", False], # LEGACY @@ -341,6 +379,9 @@ class WikiFormatter: style[1] = not style[1] return ['' + def _glyph_repl(self, word): + return '—' + def _tit_repl(self, word): if self.h_level: result = '

\n' % self.h_level @@ -358,48 +399,37 @@ class WikiFormatter: return self._undent() + '\n

\n' % (len(word) - 2) def _macro_repl(self, word): - m = re.compile("\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>").match(word) - name = m.group(1) - argv = [name] - if m.group(2): - argv.extend(m.group(2).split('|')) - argv = list(map(str.strip, argv)) - - macro = globals().get('_macro_' + name) - if not macro: - try: - exec(open("macros/" + name + ".py").read(), globals()) - except IOError as err: - if err.errno == errno.ENOENT: pass - macro = globals().get('_macro_' + name) - if macro: - return macro(argv) - else: - msg = '<<' + '|'.join(argv) + '>>' + try: + args, kvargs = parse_args(word) + if args[0] in self.kvargs: + return self.kvargs[args[0]] + macro = globals().get('_macro_' + args[0]) + if not macro: + exec(open("macros/" + args[0] + ".py").read(), globals()) + macro = globals().get('_macro_' + args[0]) + return macro(*args, **kvargs) + except Exception, e: + msg = cgi.escape(word) + ": " + cgi.escape(e.message) if not self.in_html: msg = '' + msg + '' return msg def _hurl_repl(self, word): - m = link_re.match(word) - return link_tag(m.group(1), m.group(2)) + args, kvargs = parse_args(word) + return link_tag(*args, **kvargs) def _inl_repl(self, word): - (name, descr) = link_re.match(word).groups() - - if descr: - argv = descr.split('|') - descr = argv.pop(0) - args = '' - if argv: - args = '?' + '&'.join(argv) - - # The "extthumb" nonsense works around a limitation of the HTML block model - return '

' \ - + 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(name, descr, kvargs) \ + '

' + descr + '

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

') 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*([^\]]+)|)\}\}) @@ -600,7 +631,7 @@ class Page: try: os.stat(self._filename()) return True - except OSError as err: + except OSError, err: if err.errno == errno.ENOENT: return False raise err @@ -608,10 +639,10 @@ class Page: def get_raw_body(self, default=None): try: return open(self._filename(), 'rb').read() - except IOError as err: + except IOError, err: if err.errno == errno.ENOENT: if default is None: - default = '//[[?edit=%s|Describe %s]]//' % (self.page_name, self.page_name) + default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name) return default if err.errno == errno.EISDIR: return self.format_dir() @@ -620,16 +651,16 @@ 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_re.match(filename): if image_maxwidth: - maxwidth_arg = '|maxwidth=' + str(image_maxwidth) - out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n' + maxwidth_arg = ' | maxwidth=' + str(image_maxwidth) + out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\n' else: out += ' * [[' + self.page_name + '/' + filename + ']]\n' return out @@ -646,7 +677,7 @@ class Page: break self._pragmas[m.group(1)] = m.group(2).strip() #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" - except IOError as err: + except IOError, err: if err.errno != errno.ENOENT and err.errno != errno.EISDIR: raise er return self._pragmas @@ -675,9 +706,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") @@ -697,7 +728,7 @@ class Page: try: from time import localtime, strftime modtime = localtime(os.stat(self._filename())[stat.ST_MTIME]) - except OSError as err: + except OSError, err: if err.errno != errno.ENOENT: raise err return None @@ -718,7 +749,7 @@ class Page: + ' from ' + cgi.escape(get_hostname(remote_host())) + '
')) print('
' % relative_url(self.page_name)) - print('' % (self.page_name)) + print('') print('
' % (self.page_name)) print('%s' \ % cgi.escape(preview or self.get_raw_body(default=''))) @@ -768,8 +799,11 @@ class Page: # Bad Bill! POSIX rename ought to replace. :-( try: os.remove(name) - except OSError as err: + 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): @@ -794,29 +828,16 @@ class Page: 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: exec(open("geekigeeki.conf.py").read()) 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()