X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=341bbad351166596fcad2701f2e2138f869232bc;hb=bf72fca16d5042ff86328d5687810b6b5177bfcb;hp=854c715dc50d834529bc76f164c34c1cc83323cd;hpb=8bfb01a3223d8ab205a28968703831fc17fba04a;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 854c715..341bbad 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -31,8 +31,9 @@ from os import path, environ word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") # FIXME: we accept stuff like foo/../bar and we shouldn't file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$") -img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg)$", re.IGNORECASE) +img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico)$", re.IGNORECASE) url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$") +link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})") title_done = False @@ -109,7 +110,7 @@ def send_guru(msg_text, msg_type): } """ -def send_title(name, text="Limbo", msg_text=None, msg_type='error'): +def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): global title_done if title_done: return @@ -126,10 +127,21 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'): print ' ' for css in css_url: print ' ' % relative_url(css) + if icon_url: + print ' ' % relative_url(icon_url) + + if name and writable and privileged_url is not None: + print ' ' \ + % (privileged_path() + '?edit=' + name) + + if history_url is not None: + print ' ' \ + % (history_url + '?a=rss') + print '' # Body - if name and privileged_url is not None: + if name and writable and privileged_url is not None: print '
' else: print '' @@ -143,7 +155,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'): print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' else: print ' ' + text + ' ' - print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink') + print ' | ' + link_tag('FrontPage', 'Home', 'navlink') print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') if 'history_url' in globals(): print ' | Recent Changes' @@ -153,7 +165,11 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'): if name: print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') if privileged_url is not None: - print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True) + if writable: + print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True) + else: + print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True) + else: print ' | Immutable Page' @@ -342,19 +358,36 @@ class WikiFormatter: return '<<' + '|'.join(argv) + '>>' def _hurl_repl(self, word): - m = re.compile("\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word) + m = link_re.match(word) + name = m.group(1) + if m.group(2) is None: + descr = name + elif img_re.match(m.group(2)): + descr = '' + else: + descr = m.group(2) + + return link_tag(name, descr, 'wikilink') + + def _inl_repl(self, word): + m = link_re.match(word) name = m.group(1) descr = m.group(2) or name + name = relative_url(name) + argv = descr.split('|') + descr = argv.pop(0) - if img_re.match(name): - name = relative_url(name) - # The "extthumb" nonsense works around a limitation of the HTML block model - return '' % (name, name, descr, descr) + if argv: + args = '?' + '&'.join(argv) else: - if img_re.match(descr): - descr = '' + args = '' - return link_tag(name, descr, 'wikilink') + if descr: + # The "extthumb" nonsense works around a limitation of the HTML block model + return '' \ + % (name, name + args, descr, descr) + else: + return '' % (name, name + args) def _email_repl(self, word): return '%s' % (word, word) @@ -466,16 +499,16 @@ class WikiFormatter: + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" + r"|(?P\{\{\{|\s*\}\}\})" - + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO + + r"|(?P \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" # Tables + r"|(?P ^\s*\|\|(=|)\s*)" @@ -560,10 +593,18 @@ class Page: raise er def format_dir(self): - out = '' + out = '== ' + path = '' + for dir in self.page_name.split('/'): + path = (path + '/' + dir) if path else dir + out += '[[' + path + '|' + dir + ']]/' + out += ' ==\n' + for file in page_list(self._filename(), file_re): if img_re.match(file): - out += ' * {{' + self.page_name + '/' + file + '}}\n' + if image_maxwidth: + maxwidth_arg = '|maxwidth=' + str(image_maxwidth) + out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\n' else: out += ' * [[' + self.page_name + '/' + file + ']]\n' return out @@ -616,17 +657,14 @@ class Page: send_guru("Read access denied by ACLs", "notice") def format(self): - page_name = None - if self.can_write(): - page_name = self.page_name - #css foo.css bar.css global css_url css_url = self.get_attr("css", "").split() + css_url - send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) + send_title(self.page_name, self.split_title(), + msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write()) self.send_naked() - send_footer(page_name, self._last_modified()) + send_footer(self.page_name, self._last_modified()) def _last_modified(self): try: @@ -679,6 +717,16 @@ class Page: else: send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') + def send_image(self, mimetype, args=[]): + if 'maxwidth' in args: + import subprocess + emit_header(mimetype) + sys.stdout.flush() + subprocess.check_call(['gm', 'convert', self._filename(), + '-scale', args['maxwidth'].value + ' >', '-']) + else: + self.send_raw(mimetype) + def _write_file(self, data): tmp_filename = self._tmp_filename() open(tmp_filename, 'wb').write(data) @@ -741,8 +789,15 @@ try: else: from mimetypes import MimeTypes type, encoding = MimeTypes().guess_type(query) - type = type or 'text/plain' - Page(query).send_raw(mimetype=type) + #type = type or 'text/plain' + #Page(query).send_raw(mimetype=type) + if type: + if type.startswith('image/'): + Page(query).send_image(mimetype=type,args=form) + else: + Page(query).send_raw(mimetype=type) + else: + Page(query).format() else: print "Status: 404 Not Found" send_title(None, msg_text='Can\'t work out query: ' + query)