projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add inline SVG images
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 341978e44a9fccd7be38ff4d10ff8727d7424644..9c97fe6eda952fd1ffcf660762726138fdbd9dc6 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-20,9
+20,9
@@
title_done = False
import cgi, sys, os, re, errno, stat, glob
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_\.\-/ ]*)$")
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('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
% relative_url('sys/GuruMeditation.js'))
print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
% relative_url('sys/GuruMeditation.js'))
-def send_httperror(status="40
3
Not Found", query="", trace=False):
+def send_httperror(status="40
4
Not Found", query="", trace=False):
print("Status: %s" % status)
msg_text = "%s: on query '%s'" % (status, query)
if trace:
print("Status: %s" % status)
msg_text = "%s: on query '%s'" % (status, query)
if trace:
@@
-306,13
+306,13
@@
class WikiFormatter:
return '—'
def _tit_repl(self, word):
return '—'
def _tit_repl(self, word):
+ link = permalink(self.line)
if self.h_level:
if self.h_level:
- result = '<
/h%d><p>\n' % self.h_level
+ result = '<
a class="heading" href="#%s">¶</a></h%d><p>\n' % (link, self.h_level)
self.h_level = 0
else:
self.h_level = len(word) - 1
self.h_level = 0
else:
self.h_level = len(word) - 1
- link = permalink(self.line)
- result = '\n</p><h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
+ result = '\n</p><h%d id="%s">' % (self.h_level, link)
return result
def _br_repl(self, word):
return result
def _br_repl(self, word):
@@
-586,7
+586,7
@@
class Page:
out += '[[' + pathname + '|' + dirname + ']]/'
out += ' ==\n'
images_out = '\n'
out += '[[' + pathname + '|' + dirname + ']]/'
out += ' ==\n'
images_out = '\n'
-
+
for filename in page_list(self._filename(), file_re):
if image_re.match(filename):
maxwidth = config_get('image_maxwidth', '400')
for filename in page_list(self._filename(), file_re):
if image_re.match(filename):
maxwidth = config_get('image_maxwidth', '400')
@@
-646,7
+646,7
@@
class Page:
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))
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(' <meta charset="
utf
-8">')
if not name:
print(' <meta name="robots" content="noindex,nofollow" />')
if not name:
print(' <meta name="robots" content="noindex,nofollow" />')
@@
-662,10
+662,9
@@
class Page:
print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
% relative_url(name + '?a=edit', privileged=True))
print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
% relative_url(name + '?a=edit', privileged=True))
- history = config_get('history_url')
- if history is not None:
- print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
- % relative_url(history + '?a=rss'))
+ if name:
+ print(' <link rel="alternate" type="application/atom+xml" title="Atom feed" href="%s" />' \
+ % relative_url(name + '?a=atom'))
print('</head>')
print('</head>')
@@
-689,6
+688,7
@@
class Page:
else:
print(' <b>' + text + '</b> ')
print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
else:
print(' <b>' + text + '</b> ')
print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
+ history = config_get('history_url')
if history:
print(' | <a href="' + relative_url(history) + '" class="navlink">Recent Changes</a>')
if name:
if history:
print(' | <a href="' + relative_url(history) + '" class="navlink">Recent Changes</a>')
if name:
@@
-781,7
+781,8
@@
class Page:
if 'maxwidth' in args:
import subprocess
sys.stdout.flush()
if 'maxwidth' in args:
import subprocess
sys.stdout.flush()
- subprocess.check_call(['gm', 'convert', self._filename(),
+ subprocess.check_call(['convert', self._filename(),
+ '-auto-orient', '-orient', 'TopLeft',
'-scale', args['maxwidth'].value + ' >', '-'])
else:
body = self.get_raw_body()
'-scale', args['maxwidth'].value + ' >', '-'])
else:
body = self.get_raw_body()