X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=d208bb723fa672890c99155a6791d93d921c29da;hb=3f737b8a960486cd16aaa4acacc83acb24c7d42f;hp=38870c8539c1bb39fc29b61be63878cefe0f635d;hpb=7bda2ec9a7e1a4869a00b0935ef89afa739b8f44;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 38870c8..d208bb7 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,9 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3.0
# -*- coding: utf-8 -*-
#
# Copyright 1999, 2000 Martin Pool
# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008 Bernie Innocenti
+# Copyright 2007, 2008, 2009 Bernie Innocenti
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -33,7 +33,8 @@ 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*([^\]]+)|)(?:\]\]|}})")
+link_re = re.compile(r"(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})")
+ext_re = re.compile(r"\.([^\./]+)$")
title_done = False
@@ -77,35 +78,25 @@ 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())
# 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,74 +104,74 @@ 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() + '?edit=' + 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('
')
+ 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('FrontPage', 'Home', 'navlink')
- 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('?edit=' + 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 ' |
logged in as ' + cgi.escape(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()
@@ -188,7 +179,7 @@ def link_tag(params, text=None, link_class=None, privileged=False):
if text is None:
text = params # default
elif img_re.match(text):
- text = ' '
+ text = ' '
if not link_class:
if is_external_url(params):
@@ -206,6 +197,19 @@ 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
+ url = relative_url(name)
+ if video_re.match(name):
+ return 'Your browser does not support the HTML5 video tag ' % url
+ elif img_re.match(name):
+ return ' ' % (url, url + args, 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 '' \
+ % (url, url, name)
+
# Search ---------------------------------------------------
def handle_fullsearch(needle):
@@ -225,13 +229,13 @@ def handle_fullsearch(needle):
hits.sort()
hits.reverse()
- print "")
print_search_stats(len(hits), len(all_pages))
@@ -241,17 +245,17 @@ def handle_titlesearch(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)
+ print("%d hits out of %d pages searched.
" % (hits, searched))
def handle_raw(pagename):
if not file_re.match(pagename):
@@ -282,9 +286,10 @@ def handle_edit(pagename):
text = form['savetext'].value
pg.send_editor(text)
+# 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):
return sorted(filter(re.match, os.listdir(dirname or data_dir)))
@@ -294,16 +299,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.
@@ -326,9 +331,9 @@ class WikiFormatter:
"__": ["u", False],
"^^": ["sup", False],
",,": ["sub", False],
- "''": ["em", False], # OBSOLETE
- "'''": ["b", False], # OBSOLETE
- "``": ["tt", False], # OBSOLETE
+ "''": ["em", False], # LEGACY
+ "'''": ["b", False], # LEGACY
+ "``": ["tt", False], # LEGACY
}
def _b_repl(self, word):
@@ -358,13 +363,13 @@ class WikiFormatter:
argv = [name]
if m.group(2):
argv.extend(m.group(2).split('|'))
- argv = map(str.strip, argv)
+ argv = list(map(str.strip, argv))
macro = globals().get('_macro_' + name)
if not macro:
try:
- execfile("macros/" + name + ".py", globals())
- except IOError, err:
+ exec(open("macros/" + name + ".py").read(), globals())
+ except IOError as err:
if err.errno == errno.ENOENT: pass
macro = globals().get('_macro_' + name)
if macro:
@@ -379,16 +384,8 @@ class WikiFormatter:
m = link_re.match(word)
return link_tag(m.group(1), m.group(2))
- def _url_repl(self, word):
- return link_tag(word)
-
- def _word_repl(self, word):
- return link_tag(word)
-
def _inl_repl(self, word):
- m = link_re.match(word)
- name = relative_url(m.group(1))
- descr = m.group(2)
+ (name, descr) = link_re.match(word).groups()
if descr:
argv = descr.split('|')
@@ -398,25 +395,20 @@ class WikiFormatter:
args = '?' + '&'.join(argv)
# The "extthumb" nonsense works around a limitation of the HTML block model
- return '%s
' \
- % (name, name + args, descr, descr)
- elif video_re.match(name):
- return 'Your browser does not support the HTML5 video tag ' % name
+ return '' \
+ + link_inline(name, descr, args) \
+ + '
' + descr + '
'
else:
- return ' ' % (name, name)
-
- def _img_repl(self, word):
- return self._inl_repl('{{' + word + '}}')
-
- def _email_repl(self, word):
- return '%s ' % (word, word)
+ return link_inline(name, name)
def _html_repl(self, word):
+ if not self.in_html and word.startswith(''
return word; # Pass through
def _ent_repl(self, s):
@@ -426,6 +418,21 @@ class WikiFormatter:
'<': '<',
'>': '>'}[s]
+ def _img_repl(self, word): # LEGACY
+ return self._inl_repl('{{' + word + '}}')
+
+ def _word_repl(self, word): # LEGACY
+ if self.in_html: return word # pass through
+ return link_tag(word)
+
+ def _url_repl(self, word): # LEGACY
+ if self.in_html: return word # pass through
+ return link_tag(word)
+
+ def _email_repl(self, word): # LEGACY
+ if self.in_html: return word # pass through
+ return '
%s ' % (word, word)
+
def _li_repl(self, match):
if self.in_li:
return '
'
@@ -492,14 +499,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
@@ -544,9 +551,8 @@ 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()):
+ for self.line in eol_re.split(str(self.raw.expandtabs(), 'utf-8')):
# Skip pragmas
if self.in_header:
if self.line.startswith('#'):
@@ -554,23 +560,23 @@ 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)
+ print(self._indent_to(len(indent.group(0))), end=' ')
+ 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):
@@ -586,23 +592,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 = '//[[?edit=%s|Describe %s]]//' % (self.page_name, self.page_name)
+ return default
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
@@ -628,17 +636,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):
@@ -687,7 +695,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
@@ -703,16 +711,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 '