X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=0607006331db081e90b43ceab3430f6bac4726d3;hb=666cc43781cace3f5a662a6403bee97c46a5c3a7;hp=ca59dcc8a150d690b92ca4c1f43ff68b25e15666;hpb=4b7dd02a651033602a4e092a981a973dd20573e7;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index ca59dcc..0607006 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -233,11 +233,11 @@ def handle_edit(pagename): pg.save(form['file'].file.read()) else: pg.save(form['savetext'].value.replace('\r\n', '\n')) - pg.send_page() + pg.format() elif 'cancel' in form: pg.msg_text = 'Editing canceled' pg.msg_type = 'notice' - pg.send_page() + pg.format() else: # preview or edit text = None if 'preview' in form: @@ -264,61 +264,6 @@ def send_footer(name, mod_string=None): print '

last modified %s

' % mod_string print '' -# Macros ------------------------------------------------------------ -def _macro_HttpGet(argv): - if argv[1] in form: - return form[argv[1]].value - elif len(argv) > 2: - return argv[2] # default value - return '' - -def _macro_WordIndex(argv): - s = make_index_key() - pages = list(page_list()) - map = {} - word_re = re.compile('[A-Z][a-z]+') - for name in pages: - for word in word_re.findall(name): - try: - map[word].append(name) - except KeyError: - map[word] = [name] - - all_words = map.keys() - all_words.sort() - last_letter = None - # set title - for word in all_words: - letter = word[0].lower() - if letter != last_letter: - s = s + ';

%s

' % (letter, letter) - last_letter = letter - - s = s + '%s' - return s - -def _macro_TitleIndex(argv): - s = make_index_key() - pages = list(page_list()) - pages.sort() - current_letter = None - for name in pages: - letter = name[0].lower() - if letter != current_letter: - s += '

%s

' % (letter, letter) - current_letter = letter - else: - s += '
' - s += Page(name).link_to() - return s - class PageFormatter: """Object that turns Wiki markup into HTML. @@ -388,6 +333,9 @@ class PageFormatter: argv = map(str.strip, argv) macro = globals().get('_macro_' + name) + if not macro: + execfile("macros/" + name + ".py", globals()) + macro = globals().get('_macro_' + name) if macro: return macro(argv) else: @@ -515,7 +463,7 @@ class PageFormatter: + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" # Inline HTML - + r"|(?P<(/|)(div|span|iframe|form|input))" + + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" + r"|(?P[<>&])" # Auto links @@ -653,7 +601,13 @@ class Page: def can_read(self): return self.can("read", True) - def send_page(self): + def send_naked(self): + if self.can_read(): + PageFormatter(self.get_raw_body()).print_html() + else: + send_guru("Read access denied by ACLs", "notice") + + def format(self): page_name = None if self.can_write(): page_name = self.page_name @@ -663,10 +617,7 @@ class Page: 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) - if self.can_read(): - PageFormatter(self.get_raw_body()).print_html() - else: - send_guru("Read access denied by ACLs", "notice") + self.send_naked() send_footer(page_name, self._last_modified()) def _last_modified(self): @@ -778,7 +729,7 @@ 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)