X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=geekigeeki.py;h=01027ee23b69b7da0a60f32c2925ab4f04dcfb1c;hb=4d8eca8c234926b3770f3fc4d150128ad18cea87;hp=5a401abde033bc06cd504fdb61c4e00fc41676e2;hpb=74c6b88a6aee836a0aef40e5631130ecf9495bf3;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 5a401ab..01027ee 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -24,7 +24,7 @@ from time import clock
start_time = clock()
title_done = False
-import cgi, sys, os, re, errno, stat
+import cgi, sys, os, re, errno, stat, glob
image_ext = 'png|gif|jpg|jpeg|bmp|ico'
video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
@@ -36,6 +36,9 @@ url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S")
ext_re = re.compile(r"\.([^\./]+)$")
# CGI stuff ---------------------------------------------------------
+def config_get(key, default=None):
+ return globals().get(key, default)
+
def script_name():
return os.environ.get('SCRIPT_NAME', '')
@@ -47,7 +50,7 @@ def query_string():
return os.environ.get('QUERY_STRING', '') or 'FrontPage'
def privileged_path():
- return privileged_url or script_name()
+ return config_get('privileged_url') or script_name()
def remote_user():
user = os.environ.get('REMOTE_USER', '')
@@ -83,18 +86,18 @@ def permalink(s):
def humanlink(s):
return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' '))
-# Split arg lists like "blah| blah blah| width=100 | align = center",
+# Split arg lists like "blah|blah blah| width=100 | align = center",
# return a list containing anonymous arguments and a map containing the named arguments
def parse_args(s):
args = []
- kwargs = {}
+ kvargs = {}
for arg in s.strip('<[{}]>').split('|'):
m = re.match('\s*(\w+)\s*=\s*(.+)\s*', arg)
if m is not None:
- kwargs[m.group(1)] = m.group(2)
+ kvargs[m.group(1)] = m.group(2)
else:
args.append(arg.strip())
- return (args, kwargs)
+ return (args, kvargs)
def url_args(kvargs):
argv = []
@@ -113,7 +116,7 @@ def send_guru(msg_text, msg_type):
print('
')
- 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:
@@ -209,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
@@ -223,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
+ 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):
@@ -321,33 +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()
- #FIXME link_inline("sys/footer")
- 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.
@@ -355,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
@@ -402,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
@@ -426,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('
')
@@ -622,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:
@@ -658,9 +668,10 @@ class Page:
for filename in page_list(self._filename(), file_re):
if image_re.match(filename):
- if image_maxwidth:
- maxwidth_arg = ' | maxwidth=' + str(image_maxwidth)
- out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\n'
+ 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
@@ -706,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")
@@ -732,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)
@@ -740,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('
-
- """)
- 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()
@@ -814,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()
@@ -830,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)