X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=9d443fc6997d5cdf0c39ee774d3c91b3ade82804;hb=151df764ca017e25015fab92838fc00af426179f;hp=147b129fd4c9402ac8512f1bc55259aa1d302987;hpb=d400842f95d61fa17e706ac4afd57414b2d5b962;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 147b129..9d443fc 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
@@ -21,7 +21,7 @@ title_done = False
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
+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)
video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
# FIXME: we accept stuff like foo/../bar and we shouldn't
@@ -110,8 +110,9 @@ def emit_header(mtime=None, mime_type="text/html"):
# Prevent caching when the wiki engine gets updated
mtime = max(mtime, os.stat(__file__).st_mtime)
print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime)))
- if mime_type:
- print("Content-type: " + mime_type + "; charset=utf-8")
+ else:
+ print("Cache-Control: must-revalidate, max-age=0")
+ print("Content-type: " + mime_type + "; charset=utf-8")
print('')
def send_guru(msg_text, msg_type):
@@ -125,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:
@@ -151,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)
@@ -305,13 +306,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):
@@ -474,8 +475,8 @@ class WikiFormatter:
| (?P \[\[[^\]]+\]\])
# Inline HTML
- | (?P <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
- | (?P ( /\s*> | (br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
+ | (?P <(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
+ | (?P ( /\s*> | (br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
| (?P [<>&] )
# Auto links (LEGACY)
@@ -493,8 +494,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*\}\}\})
@@ -569,14 +568,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
@@ -646,7 +643,7 @@ class Page:
if title_done: return
# HEAD
- emit_header(self._mtime())
+ emit_header(name and self._mtime())
print('\n')
print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text))
print(' ')
@@ -721,13 +718,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("")
+ print('')
def send_naked(self, kvargs=None):
if self.can_read():
- WikiFormatter(self.get_raw_body(), kvargs).print_html()
+ body = self.get_raw_body()
+ if not body:
+ body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name)
+ WikiFormatter(body, kvargs).print_html()
else:
- send_guru("Read access denied by ACLs", "notice")
+ send_guru('Read access denied by ACLs', 'notice')
def send(self):
#css foo.css
@@ -759,7 +759,7 @@ class Page:
return
if preview is None:
- preview = self.get_raw_body(default='')
+ preview = self.get_raw_body()
link_inline("sys/EditPage", kvargs = {
'EDIT_BODY': cgi.escape(preview),
|