projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move default text handling outside of get_raw_body()
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 788006001301cb9071f6322abb8807787de3f8f2..4a7ffea7e6250f80fe59a09e9053cf11f4128b4e 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-21,7
+21,7
@@
title_done = False
import cgi, sys, os, re, errno, stat, glob
image_ext = 'png|gif|jpg|jpeg|bmp|ico'
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
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)))
# 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):
print('')
def send_guru(msg_text, msg_type):
@@
-230,7
+231,7
@@
def handle_atom(pagename, form):
Page(pagename).send_atom()
def handle_edit(pagename, form):
Page(pagename).send_atom()
def handle_edit(pagename, form):
- pg = Page(
form['q'].valu
e)
+ pg = Page(
pagenam
e)
if 'save' in form:
if form['file'].value:
pg.save(form['file'].file.read(), form['changelog'].value)
if 'save' in form:
if form['file'].value:
pg.save(form['file'].file.read(), form['changelog'].value)
@@
-474,8
+475,8
@@
class WikiFormatter:
| (?P<hurl> \[\[[^\]]+\]\])
# Inline HTML
| (?P<hurl> \[\[[^\]]+\]\])
# Inline HTML
- | (?P<html> <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
- | (?P<htmle> ( /\s*> | </(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
+ | (?P<html> <(br|hr|
small|
div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
+ | (?P<htmle> ( /\s*> | </(br|hr|
small|
div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
| (?P<ent> [<>&] )
# Auto links (LEGACY)
| (?P<ent> [<>&] )
# Auto links (LEGACY)
@@
-493,8
+494,6
@@
class WikiFormatter:
| (?P<tr> ^\s*\|\|(=|)\s*)
| (?P<tre> \s*\|\|(=|)\s*$)
| (?P<td> \s*\|\|(=|)\s*)
| (?P<tr> ^\s*\|\|(=|)\s*)
| (?P<tre> \s*\|\|(=|)\s*$)
| (?P<td> \s*\|\|(=|)\s*)
-
- # TODO: highlight search words (look at referrer)
)""", re.VERBOSE)
pre_re = re.compile("""(?:
(?P<pre>\s*\}\}\})
)""", re.VERBOSE)
pre_re = re.compile("""(?:
(?P<pre>\s*\}\}\})
@@
-569,14
+568,12
@@
class Page:
return True
return False
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:
try:
return open(self._filename(), 'rb').read()
except IOError, err:
if err.errno == errno.ENOENT:
- if default is None:
- default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name)
- return default
+ return ''
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
if err.errno == errno.EISDIR:
return self.format_dir()
raise err
@@
-646,7
+643,7
@@
class Page:
if title_done: return
# HEAD
if title_done: return
# HEAD
- emit_header(self._mtime())
+ emit_header(
name and
self._mtime())
print('<!doctype html>\n<html lang="en">')
print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
print(' <meta charset="UTF-8">')
print('<!doctype html>\n<html lang="en">')
print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
print(' <meta charset="UTF-8">')
@@
-663,7
+660,7
@@
class Page:
editable = name and self.can_write() and is_privileged()
if editable:
print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
editable = name and self.can_write() and is_privileged()
if editable:
print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
- % relative_url(
'?a=edit&q=' + name
, privileged=True))
+ % relative_url(
name + '?a=edit'
, privileged=True))
history = config_get('history_url')
if history is not None:
history = config_get('history_url')
if history is not None:
@@
-674,7
+671,7
@@
class Page:
# BODY
if editable:
# BODY
if editable:
- print('<body ondblclick="location.href=\'' + relative_url(
'?a=edit&q=' + name
, privileged=True) + '\'">')
+ print('<body ondblclick="location.href=\'' + relative_url(
name + '?a=edit'
, privileged=True) + '\'">')
else:
print('<body>')
else:
print('<body>')
@@
-701,13
+698,13
@@
class Page:
print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
if config_get('privileged_url') is not None:
if self.can_write():
print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
if config_get('privileged_url') is not None:
if self.can_write():
- print(' | ' + link_tag(
'?a=edit&q=' + name
, 'Edit', cssclass='navlink', privileged=True))
+ print(' | ' + link_tag(
name + '?a=edit'
, 'Edit', cssclass='navlink', privileged=True))
else:
else:
- print(' | ' + link_tag(name, 'Login', cssclass='
navlink
', privileged=True))
+ print(' | ' + link_tag(name, 'Login', cssclass='
login
', privileged=True))
user = remote_user()
if user != 'AnonymousCoward':
user = remote_user()
if user != 'AnonymousCoward':
- print(' |
<span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>'
)
+ print(' |
' + link_tag('user/' + user, user, cssclass='login')
)
print('<hr /></div></nav>')
print('<hr /></div></nav>')
@@
-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()))
})
link_inline(footer, kvargs = {
'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
})
- print(
"</body></html>"
)
+ print(
'</body></html>'
)
def send_naked(self, kvargs=None):
if self.can_read():
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:
else:
- send_guru(
"Read access denied by ACLs", "notice"
)
+ send_guru(
'Read access denied by ACLs', 'notice'
)
def send(self):
#css foo.css
def send(self):
#css foo.css
@@
-759,7
+759,7
@@
class Page:
return
if preview is None:
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),
link_inline("sys/EditPage", kvargs = {
'EDIT_BODY': cgi.escape(preview),