%s: %s

') - print link_tag('FrontPage', site_icon or 'Home', cssclass='navlink') + print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink') if name: print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') else: print(' ' + text + ' ') print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) - if 'history_url' in globals(): - print(' | Recent Changes') + if history: + print(' | Recent Changes') if name: - print(' | Page History') + print(' | Page History') if name: print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) - if privileged_url is not None: + if config_get('privileged_url') is not None: if writable: print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) else: @@ -198,7 +203,7 @@ def send_httperror(status="403 Not Found", query=""): def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: text = humanlink(dest) - elif img_re.match(text): + elif image_re.match(text): text = '

' link_class = kvargs.get('class', kvargs.get('cssclass', None)) @@ -208,7 +213,7 @@ def link_tag(dest, text=None, privileged=False, **kvargs): elif file_re.match(dest) and Page(dest).exists(): link_class = 'wikilink' else: - text = nonexist_pfx + text + text = config_get('nonexist_pfx', '') + text link_class = 'nonexistent' # Prevent crawlers from following links potentially added by spammers or to generated pages @@ -222,15 +227,21 @@ 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 + 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) +def link_inline_glob(pattern, descr=None, kvargs={}): + s = '' + for name in glob.glob(pattern): + s += link_inline(name, descr, kvargs) + return s + # Search --------------------------------------------------- def print_search_stats(hits, searched): @@ -320,32 +331,30 @@ def handle_get(pagename, form): else: send_httperror("403 Forbidden", pagename) -# Used by macros/WordIndex and macros/TitleIndex +# Used by sys/macros/WordIndex and sys/macros/TitleIndex def make_index_key(): links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '

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

' -def page_list(dirname=None, re=None): - if re is None: +def page_list(dirname=None, search_re=None): + if search_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))) + search_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") + return sorted(filter(search_re.match, os.listdir(dirname or '.'))) def send_footer(mod_string=None): - if globals().get('debug_cgi', False): + if config_get('debug_cgi', False): 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. @@ -353,8 +362,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 @@ -366,6 +376,7 @@ class WikiFormatter: "**": ["b", False], "##": ["tt", False], "__": ["u", False], + "--": ["del", False], "^^": ["sup", False], ",,": ["sub", False], "''": ["em", False], # LEGACY @@ -378,6 +389,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 @@ -396,14 +410,16 @@ class WikiFormatter: def _macro_repl(self, word): try: - args, kwargs = parse_args(word) + 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/" + name + ".py").read(), globals()) - macro = globals().get('_macro_' + name) - return macro(*args, **kwargs) - except Exception: - msg = cgi.escape(word) + exec(open("sys/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 @@ -420,10 +436,10 @@ class WikiFormatter: # This double div nonsense works around a limitation of the HTML block model return '

' \ + '

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

' + descr + '

' else: - return link_inline(name, None, kvargs) + return link_inline_glob(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*([^\]]+)|)\}\}) @@ -615,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('/','_') + '.' + str(os.getpid()) + '#')) + return self.page_name + '.tmp' + str(os.getpid()) + '#' def exists(self): try: @@ -635,7 +652,7 @@ class Page: except IOError, err: if err.errno == errno.ENOENT: if default is None: - default = '//[[%s|Describe %s|action=edit]]//' % (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() @@ -644,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 + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\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 @@ -699,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") @@ -725,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) @@ -733,35 +751,14 @@ 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(default=''))) - 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("
") WikiFormatter(preview).print_html() @@ -794,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): @@ -804,9 +804,12 @@ 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() @@ -820,6 +823,7 @@ class Page: try: exec(open("geekigeeki.conf.py").read()) + os.chdir(config_get('data_dir', 'data')) form = cgi.FieldStorage() action = form.getvalue('a', 'get') handler = globals().get('handle_' + action)