projects
/
geekigeeki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
694a348
)
Add inline SVG images
author
Bernie Innocenti
<codewiz@google.com>
Sun, 15 Jul 2018 16:45:38 +0000
(
01:45
+0900)
committer
Bernie Innocenti
<codewiz@google.com>
Sun, 15 Jul 2018 16:45:38 +0000
(
01:45
+0900)
geekigeeki.py
patch
|
blob
|
history
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 6262c4a6e7393694590234624da7f5167a2fd57f..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'
+image_ext = 'png|gif|jpg|jpeg|
svg|
bmp|ico'
video_ext = 'avi|webm|mkv|ogv'
video_ext = 'avi|webm|mkv|ogv'
-image_re = re.compile(r".*\.(" + image_ext + "
|" + video_ext + "
)$", re.IGNORECASE)
+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_\.\-/ ]*)$")
@@
-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')