X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=d208bb723fa672890c99155a6791d93d921c29da;hb=3f737b8a960486cd16aaa4acacc83acb24c7d42f;hp=f3ce1dcb3268d452e29c997c5a698040a15b58cf;hpb=b36435d29f2dcaf6d3a2d19d21ca8b3c2c62c44d;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index f3ce1dc..d208bb7 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3.0 # -*- coding: utf-8 -*- # # Copyright 1999, 2000 Martin Pool @@ -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 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('?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 ' | ' + print(' | ') - 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 = '' + text + '' if not link_class: if is_external_url(params): @@ -208,10 +199,16 @@ def link_tag(params, text=None, link_class=None, privileged=False): def link_inline(name, descr=None, args=''): if not descr: descr = name + url = relative_url(name) if video_re.match(name): - return '' % name + return '' % url + elif img_re.match(name): + return '%s' % (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 '%s' % (name, name + args, descr) + return '' \ + % (url, url, name) # Search --------------------------------------------------- @@ -232,13 +229,13 @@ def handle_fullsearch(needle): hits.sort() hits.reverse() - print "") print_search_stats(len(hits), len(all_pages)) @@ -248,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): @@ -289,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))) @@ -301,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. @@ -365,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: @@ -387,9 +385,7 @@ class WikiFormatter: return link_tag(m.group(1), m.group(2)) 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('|') @@ -406,11 +402,13 @@ class WikiFormatter: return link_inline(name, name) def _html_repl(self, word): + if not self.in_html and word.startswith('

' + print('

') scan_re = re.compile(r"""(?: # Styles and formatting @@ -553,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('#'): @@ -563,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): @@ -595,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 @@ -637,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): @@ -696,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 @@ -712,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 '
' % relative_url(self.page_name) - print '' % (self.page_name) - print '
' % (self.page_name) - print '' % cgi.escape(preview or self.get_raw_body()) - print ' ' % filename - print """ + + '

')) + print('
' % relative_url(self.page_name)) + print('' % (self.page_name)) + print('
' % (self.page_name)) + print('' \ + % cgi.escape(preview or self.get_raw_body(default=''))) + print(' ' % filename) + print("""
@@ -734,23 +734,19 @@ class Page: document.editform.savetext.focus() //--> - """ - print "

" + link_tag('EditingTips') + "

" + """) + print("

" + link_tag('EditingTips') + "

") if preview: - print "
" + print("
") WikiFormatter(preview).print_html() - print "
" + print("
") send_footer() - def send_raw(self, mimetype='text/plain'): - if self.can_read(): - body = self.get_raw_body() - emit_header(mimetype) - print body - else: + def send_raw(self, mimetype='text/plain', args=[]): + if not self.can_read(): send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') + return - def send_image(self, mimetype, args=[]): if 'maxwidth' in args: import subprocess emit_header(mimetype) @@ -758,7 +754,9 @@ class Page: subprocess.check_call(['gm', 'convert', self._filename(), '-scale', args['maxwidth'].value + ' >', '-']) else: - self.send_raw(mimetype) + body = self.get_raw_body() + emit_header(mimetype) + print(body) def _write_file(self, data): tmp_filename = self._tmp_filename() @@ -768,7 +766,7 @@ class Page: # Bad Bill! POSIX rename ought to replace. :-( try: os.remove(name) - except OSError, err: + except OSError as err: if err.errno != errno.ENOENT: raise err os.rename(tmp_filename, name) @@ -781,19 +779,13 @@ class Page: self._write_file(newdata) rc = 0 if post_edit_hook: - # FIXME: what's the std way to perform shell quoting in python? - cmd = ( post_edit_hook - + " '" + data_dir + '/' + self.page_name - + "' '" + remote_user() - + "' '" + remote_host() - + "' '" + changelog + "'" - ) - out = os.popen(cmd) - output = out.read() - rc = out.close() + import subprocess + cmd = [ post_edit_hook, data_dir + '/' + 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() if rc: - self.msg_text += "Post-editing hook returned %d.\n" % rc - self.msg_text += 'Command was: ' + cmd + '\n' + self.msg_text += "Post-editing hook returned %d. Command was:\n'%s'\n" % (rc, "' '".join(cmd)) if output: self.msg_text += 'Output follows:\n' + output else: @@ -809,23 +801,18 @@ def main(): else: query = query_string() if file_re.match(query): - if word_re.match(query): - Page(query).format() + # 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: - from mimetypes import MimeTypes - mimetype, encoding = MimeTypes().guess_type(query) - if mimetype: - if mimetype.startswith('image/'): - Page(query).send_image(mimetype=mimetype, args=form) - else: - Page(query).send_raw(mimetype=mimetype) - else: - Page(query).format() + Page(query).format() else: send_httperror("403 Forbidden", query) try: - execfile("geekigeeki.conf.py") + exec(open("geekigeeki.conf.py").read()) form = cgi.FieldStorage() main() except Exception: