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
-file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)$")
+file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$")
url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S$")
ext_re = re.compile(r"\.([^\./]+)$")
print(cgi.escape(msg_text))
if msg_type == 'error':
print '\n Guru Meditation #DEADBEEF.ABADC0DE'
- print('</pre><script language="JavaScript" type="text/javascript" src="%s" defer="defer"></script>' \
+ print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
% relative_url('sys/GuruMeditation.js'))
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
| (?P<glyph> --)
# Links
- | (?P<macro> \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)
- | (?P<hurl> \[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])
+ | (?P<macro> \<\<[^\>]+\>\>)
+ | (?P<hurl> \[\[[^\]]+\]\])
# Inline HTML
| (?P<html> <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
# Lists, divs, spans and inline objects
| (?P<li> ^\s+[\*\#]\s+)
| (?P<pre> \{\{\{|\s*\}\}\})
- | (?P<inl> \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})
+ | (?P<inl> \{\{[^\}]+\}\})
# Tables
| (?P<tr> ^\s*\|\|(=|)\s*)
print('</p><p>')
else:
indent = indent_re.match(self.line)
- #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
print(self._indent_to(len(indent.group(1)), indent.group(2)))
+ # Stand back! Here we apply the monster regex that does all the parsing
print(re.sub(scan_re, self.replace, self.line))
if self.in_pre: print('</pre>')
class Page:
def __init__(self, page_name):
- self.page_name = page_name
+ self.page_name = page_name.rstrip('/');
self.msg_text = ''
self.msg_type = 'error'
out = '== '
pathname = ''
for dirname in self.page_name.strip('/').split('/'):
- pathname = (pathname + '/' + dirname) if pathname else dirname
+ pathname = (pathname and pathname + '/' ) + dirname
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')
if maxwidth:
maxwidth = ' | maxwidth=' + str(maxwidth)
- out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
+ images_out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
else:
out += ' * [[' + self.page_name + '/' + filename + ']]\n'
- return out
+ return out + images_out
def pragmas(self):
if not '_pragmas' in self.__dict__: