X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=8de46ab91cbf4d2b14e4ce25753a0848545c311c;hb=fbc4d6639e75dd726fdcadc1129ae0900468e9d2;hp=b2e2895f4562af32fed2ea813c805e09d1ac07cb;hpb=ae518e2c1f2e6cb7a519d44127deb2e4d255df72;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index b2e2895..8de46ab 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright 1999, 2000 Martin Pool
last modified %s
' % mod_string print '' -class PageFormatter: +class WikiFormatter: """Object that turns Wiki markup into HTML. All formatting commands can be parsed one line at a time, though @@ -342,19 +358,35 @@ class PageFormatter: 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) + descr = m.group(2) + if descr is None: + descr = name + elif img_re.match(m.group(2)): + descr = '' + + 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) @@ -463,19 +495,19 @@ class PageFormatter: + r"|(?P\{\{\{|\s*\}\}\})" - + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO + + r"|(?P \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" # Tables + r"|(?P ^\s*\|\|(=|)\s*)" @@ -527,7 +559,7 @@ class Page: # look for the end of words and the start of a new word and insert a space there return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) - def _text_filename(self): + def _filename(self): return path.join(data_dir, self.page_name) def _tmp_filename(self): @@ -535,7 +567,7 @@ class Page: def exists(self): try: - os.stat(self._text_filename()) + os.stat(self._filename()) return True except OSError, er: if er.errno == errno.ENOENT: @@ -551,20 +583,36 @@ class Page: def get_raw_body(self): try: - return open(self._text_filename(), 'rb').read() + return open(self._filename(), 'rb').read() except IOError, er: if er.errno == errno.ENOENT: return '' # just doesn't exist, use default if er.errno == errno.EISDIR: - return 'DIR' + return self.format_dir() raise er + def format_dir(self): + 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): + 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 def get_attrs(self): if 'attrs' in self.__dict__: return self.attrs self.attrs = {} try: - file = open(self._text_filename(), 'rt') + file = open(self._filename(), 'rt') attr_re = re.compile(r"^#(\S*)(.*)$") for line in file: m = attr_re.match(line) @@ -573,7 +621,7 @@ class Page: self.attrs[m.group(1)] = m.group(2).strip() #print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "
\n" except IOError, er: - if er.errno != errno.ENOENT: + if er.errno != errno.ENOENT and er.errno != errno.EISDIR: raise er return self.attrs @@ -603,27 +651,26 @@ class Page: def send_naked(self): if self.can_read(): - PageFormatter(self.get_raw_body()).print_html() + WikiFormatter(self.get_raw_body()).print_html() else: send_guru("Read access denied by ACLs", "notice") - def send_page(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 + def format(self): + #css foo.css + value = self.get_attr("css", None) + if value: + global link_urls + link_urls += { "stylesheet": value } - 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: from time import localtime, strftime - modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME]) + modtime = localtime(os.stat(self._filename())[stat.ST_MTIME]) except OSError, er: if er.errno != errno.ENOENT: raise er @@ -659,7 +706,7 @@ class Page: print "" + Page('EditingTips').link_to() + "
" if preview: print "" - PageFormatter(preview).print_html() + WikiFormatter(preview).print_html() print "" send_footer(self.page_name) @@ -671,10 +718,20 @@ 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) - name = self._text_filename() + name = self._filename() if os.name == 'nt': # Bad Bill! POSIX rename ought to replace. :-( try: @@ -729,12 +786,19 @@ try: if file_re.match(query): if word_re.match(query): - Page(query).send_page() + Page(query).format() 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)