X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=79960d45422760c24f867238426ee76b8a905af4;hp=2dbf03b82674125d32d0ddedbdcb9e58224c2cf7;hb=HEAD;hpb=a4def29f92f1c5743da5d7bf86b4214579bf385d
diff --git a/geekigeeki.py b/geekigeeki.py
index 2dbf03b..79960d4 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright (C) 1999, 2000 Martin Pool
# Copyright (C) 2002 Gerardo Poggiali
-# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie Innocenti
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -20,9 +20,9 @@ title_done = False
import cgi, sys, os, re, errno, stat, glob
-image_ext = 'png|gif|jpg|jpeg|bmp|ico'
-video_ext = "ogg|ogv|oga|webm" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
-image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")$", re.IGNORECASE)
+image_ext = 'png|gif|jpg|jpeg|svg|bmp|ico'
+video_ext = 'avi|webm|mkv|ogv'
+image_re = re.compile(r".*\.(" + image_ext + ")$", re.IGNORECASE)
video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
# FIXME: we accept stuff like foo/../bar and we shouldn't
file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$")
@@ -126,7 +126,7 @@ def send_guru(msg_text, msg_type):
print('' \
% relative_url('sys/GuruMeditation.js'))
-def send_httperror(status="403 Not Found", query="", trace=False):
+def send_httperror(status="404 Not Found", query="", trace=False):
print("Status: %s" % status)
msg_text = "%s: on query '%s'" % (status, query)
if trace:
@@ -152,9 +152,9 @@ def link_tag(dest, text=None, privileged=False, **kvargs):
text = config_get('nonexist_pfx', '') + text
link_class = 'nonexistent'
- # Prevent crawlers from following links potentially added by spammers or to generated pages
+ # Prevent crawlers from following links potentially added by spammers and to autogenerated pages
nofollow = ''
- if link_class == 'external' or link_class == 'navlink':
+ if link_class in ('external', 'navlink', 'nonexistent'):
nofollow = 'rel="nofollow" '
return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text)
@@ -163,7 +163,10 @@ def link_inline(name, descr=None, kvargs={}):
if not descr: descr = humanlink(name)
url = relative_url(name)
if video_re.match(name):
- return '' % url
+ args = ''
+ if 'maxwidth' in kvargs:
+ args += 'width=' + kvargs['maxwidth']
+ return '' % (url, args)
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
@@ -306,13 +309,13 @@ class WikiFormatter:
return '—'
def _tit_repl(self, word):
+ link = permalink(self.line)
if self.h_level:
- result = '\n' % self.h_level
+ result = '¶
\n' % (link, self.h_level)
self.h_level = 0
else:
self.h_level = len(word) - 1
- link = permalink(self.line)
- result = '\n
¶ ' % (self.h_level, link, link)
+ result = '\n
' % (self.h_level, link)
return result
def _br_repl(self, word):
@@ -494,8 +497,6 @@ class WikiFormatter:
| (?P ^\s*\|\|(=|)\s*)
| (?P \s*\|\|(=|)\s*$)
| (?P \s*\|\|(=|)\s*)
-
- # TODO: highlight search words (look at referrer)
)""", re.VERBOSE)
pre_re = re.compile("""(?:
(?P\s*\}\}\})
@@ -570,14 +571,12 @@ class Page:
return True
return False
- def get_raw_body(self, default=None):
+ def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
except IOError, err:
if err.errno == errno.ENOENT:
- if default is None:
- default = '//[[%s?a=edit|Describe %s]]//' % (self.page_name, self.page_name)
- return default
+ return ''
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
@@ -590,9 +589,9 @@ class Page:
out += '[[' + pathname + '|' + dirname + ']]/'
out += ' ==\n'
images_out = '\n'
-
+
for filename in page_list(self._filename(), file_re):
- if image_re.match(filename):
+ if image_re.match(filename) or video_re.match(filename):
maxwidth = config_get('image_maxwidth', '400')
if maxwidth:
maxwidth = ' | maxwidth=' + str(maxwidth)
@@ -650,7 +649,8 @@ class Page:
emit_header(name and self._mtime())
print('\n')
print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' ')
+ print(' ')
+ print(' ')
if not name:
print(' ')
@@ -666,10 +666,9 @@ class Page:
print(' ' \
% relative_url(name + '?a=edit', privileged=True))
- history = config_get('history_url')
- if history is not None:
- print(' ' \
- % relative_url(history + '?a=rss'))
+ if name:
+ print(' ' \
+ % relative_url(name + '?a=atom'))
print('')
@@ -693,6 +692,7 @@ class Page:
else:
print(' ' + text + ' ')
print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
+ history = config_get('history_url')
if history:
print(' | Recent Changes')
if name:
@@ -722,13 +722,16 @@ class Page:
link_inline(footer, kvargs = {
'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
})
- print(" |