X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=368cf8dace07ae045d9580f9616e9370e1b45221;hb=b70950f8de51524453f99b4809c726212a5fa2f3;hp=cc0373621ab6e4c11da560c253d9383cc40a9948;hpb=c0c495043d8f2f4edb5a37b108d7c400e0eb1498;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index cc03736..368cf8d 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -25,15 +25,12 @@ start_time = clock()
import cgi, sys, os, re, errno, stat
-# Regular expression defining a WikiWord
-# (but this definition is also assumed in other places)
-word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
# FIXME: we accept stuff like foo/../bar and we shouldn't
file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$")
img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE)
video_re = re.compile(r"^.*\.(ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE)
url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
-link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})")
+ext_re = re.compile(r"\.([^\./]+)$")
title_done = False
@@ -77,35 +74,49 @@ def relative_url(pathname, privileged=False):
else:
url = script_name()
pathname = url + '/' + pathname
- return pathname
+ return cgi.escape(pathname, quote=True)
def permalink(s):
return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
+def humanlink(s):
+ return re.compile('([^:/\.]+)(?:\.[^/:]+|)$').search(s).group(1).replace('_', ' ')
+
+# 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 = {}
+ for arg in s.strip('<[{}]>').split('|'):
+ try:
+ key, val = arg.split('=', 1)
+ kwargs[key.strip()] = val.strip()
+ except ValueError:
+ args.append(arg.strip())
+ return (args, kwargs)
+
+def url_args(kvargs):
+ argv = []
+ for k, v in kvargs.items():
+ argv.append(k + '=' + v)
+ if argv:
+ return '?' + '&'.join(argv)
+ return ''
+
# Formatting stuff --------------------------------------------------
def emit_header(mime_type="text/html"):
- print "Content-type: " + mime_type + "; charset=utf-8\n"
-
-def sendfile(dest_file, src_file):
- """Efficiently copy file data between file descriptors"""
- while 1:
- data = src_file.read(65536)
- if not data: break
- dest_file.write(data)
+ print("Content-type: " + mime_type + "; charset=utf-8\n")
def send_guru(msg_text, msg_type):
if not msg_text: return
- print '
'
+ 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(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(' ' \
+ % relative_url('sys/GuruMeditation.js'))
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
global title_done
@@ -113,82 +124,82 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
# Head
emit_header()
- print ''
- print ''
+ print('')
+ print('')
- print "%s: %s " % (site_name, text)
- print ' '
+ print("%s: %s " % (site_name, text))
+ print(' ')
if not name:
- print ' '
+ print(' ')
for meta in meta_urls:
http_equiv, content = meta
- print ' ' % (http_equiv, relative_url(content))
+ print(' ' % (http_equiv, relative_url(content)))
for link in link_urls:
rel, href = link
- print ' ' % (rel, relative_url(href))
+ print(' ' % (rel, relative_url(href)))
if name and writable and privileged_url is not None:
- print ' ' \
- % (privileged_path() + '?edit=' + name)
+ print(' ' \
+ % (privileged_path() + '?a=edit&q=' + name))
if history_url is not None:
- print ' ' \
- % relative_url(history_url + '?a=rss')
+ print(' ' \
+ % relative_url(history_url + '?a=rss'))
- print ''
+ print('')
# Body
if name and writable and privileged_url is not None:
- print ''
+ print('')
else:
- print ''
+ print('')
title_done = True
send_guru(msg_text, msg_type)
# Navbar
- print ''
- print link_tag('FrontPage', relative_url(site_icon or 'Home'), 'navlink')
+ print('
')
+ print link_tag('FrontPage', site_icon or 'Home', 'navlink')
if name:
- print '
' + link_tag('?fullsearch=' + name, text, 'navlink') + ' '
+ print('
' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ')
else:
- print '
' + text + ' '
- print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
+ print('
' + text + ' ')
+ print(' | ' + link_tag('FindPage', 'Find Page', 'navlink'))
if 'history_url' in globals():
- print ' |
Recent Changes '
+ print(' |
Recent Changes ')
if name:
- print ' |
Page History '
+ print(' |
Page History ')
if name:
- print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
+ print(' | ' + link_tag('?raw=' + name, 'Raw Text', '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', 'navlink', privileged=True))
else:
- print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True)
+ print(' | ' + link_tag(name, 'Login', 'navlink', privileged=True))
else:
- print ' |
Immutable Page '
+ print(' |
Immutable Page ')
user = remote_user()
if user != 'AnonymousCoward':
- print ' |
' + link_tag('User/' + user, user) + ' '
+ print(' |
' + link_tag('User/' + user, user) + ' ')
- print '
'
+ print('
')
def send_httperror(status="403 Not Found", query=""):
- print "Status: %s" % status
+ print("Status: %s" % status)
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(params, text=None, link_class=None, privileged=False, **kvargs):
if text is None:
- text = params # default
+ text = humanlink(params)
elif img_re.match(text):
- text = ' '
+ text = ' '
if not link_class:
if is_external_url(params):
@@ -206,17 +217,27 @@ def link_tag(params, text=None, link_class=None, privileged=False):
return '%s ' % (classattr, relative_url(params, 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 'Your browser does not support the HTML5 video tag ' % name
+ return 'Your browser does not support the HTML5 video tag ' % url
+ elif img_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()
else:
- return ' ' % (name, name + args, descr)
+ 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 = []
@@ -232,47 +253,45 @@ def handle_fullsearch(needle):
hits.sort()
hits.reverse()
- print "")
print_search_stats(len(hits), len(all_pages))
-def handle_titlesearch(needle):
+def handle_titlesearch(query, form):
# TODO: check needle is legal -- but probably we can just accept any RE
- send_title(None, "Title search for \"" + needle + '"')
+ needle = form['q'].value
+ send_title(None, 'Title search for "' + needle + '"')
needle_re = re.compile(needle, re.IGNORECASE)
all_pages = page_list()
- hits = filter(needle_re.search, all_pages)
+ hits = list(filter(needle_re.search, all_pages))
- print "")
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)
@@ -289,11 +308,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 = map(lambda ch: '%s ' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
- return '
'+ ' | '.join(links) + ' '
+ 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):
@@ -301,16 +336,16 @@ def send_footer(mod_string=None):
cgi.print_arguments()
cgi.print_form(form)
cgi.print_environ()
- print '''
+ print('''
'
+ print('last modified %s
' % mod_string)
+ print('')
class WikiFormatter:
"""Object that turns Wiki markup into HTML.
@@ -360,57 +395,43 @@ 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 = map(str.strip, argv)
-
- macro = globals().get('_macro_' + name)
- if not macro:
- try:
- execfile("macros/" + name + ".py", globals())
- except IOError, err:
- if err.errno == errno.ENOENT: pass
- macro = globals().get('_macro_' + name)
- if macro:
- return macro(argv)
- else:
- msg = '<<' + '|'.join(argv) + '>>'
+ try:
+ args, kwargs = parse_args(word)
+ 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)
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):
- m = link_re.match(word)
- name = relative_url(m.group(1))
- descr = m.group(2)
-
- if descr:
- argv = descr.split('|')
- descr = argv.pop(0)
- args = ''
- if argv:
- args = '?' + '&'.join(argv)
-
+ args, kvargs = parse_args(word)
+ name = args.pop(0)
+ if len(args):
+ descr = args.pop(0)
# The "extthumb" nonsense works around a limitation of the HTML block model
return '' \
- + link_inline(name, descr, args) \
+ + 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(''
return word; # Pass through
def _ent_repl(self, s):
@@ -501,14 +522,14 @@ class WikiFormatter:
return res
def replace(self, match):
- for rule, hit in match.groupdict().items():
+ for rule, hit in list(match.groupdict().items()):
if hit:
return getattr(self, '_' + rule + '_repl')(hit)
else:
raise "Can't handle match " + repr(match)
def print_html(self):
- print '
'
+ print('
')
scan_re = re.compile(r"""(?:
# Styles and formatting
@@ -553,9 +574,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 +584,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):
@@ -595,23 +617,25 @@ class Page:
return os.path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
+ return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + str(os.getpid()) + '#'))
def exists(self):
try:
os.stat(self._filename())
return True
- except OSError, err:
+ except OSError as err:
if err.errno == errno.ENOENT:
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:
+ except IOError as err:
if err.errno == errno.ENOENT:
- return '' # just doesn't exist, use default
+ if default is None:
+ default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name)
+ return default
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
@@ -628,7 +652,7 @@ class Page:
if img_re.match(filename):
if image_maxwidth:
maxwidth_arg = '|maxwidth=' + str(image_maxwidth)
- out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n'
+ out += '{{' + self.page_name + '/' + filename + '|' + humanlink(filename) + maxwidth_arg + '}}\n'
else:
out += ' * [[' + self.page_name + '/' + filename + ']]\n'
return out
@@ -637,17 +661,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"
- except IOError, err:
+ #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n"
+ except IOError as err:
if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
- raise err
+ raise er
return self._pragmas
def pragma(self, name, default):
@@ -696,7 +720,7 @@ class Page:
try:
from time import localtime, strftime
modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
- except OSError, err:
+ except OSError as err:
if err.errno != errno.ENOENT:
raise err
return None
@@ -712,16 +736,17 @@ class Page:
if 'file' in form:
filename = form['file'].value
- print ('
Editing ' + self.page_name
+ print(('
Editing ' + self.page_name
+ ' for ' + cgi.escape(remote_user())
+ ' from ' + cgi.escape(get_hostname(remote_host()))
- + '
')
- print '