X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=geekigeeki.py;h=79960d45422760c24f867238426ee76b8a905af4;hb=HEAD;hp=044c7bfa55600abaebbee95d59a2b307fb1e0bd4;hpb=04449aef0693a2753c56a3ac391dde068e87a790;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 044c7bf..79960d4 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright (C) 1999, 2000 Martin Pool \n' % self.h_level
+ result = '¶ \n' % (link, self.h_level)
self.h_level = 0
else:
self.h_level = len(word) - 1
- link = permalink(self.line)
- result = '\n' % (url, url + url_args(kvargs), descr)
elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
@@ -173,7 +179,7 @@ def link_inline(name, descr=None, kvargs={}):
def link_inline_glob(pattern, descr=None, kvargs={}):
if not url_re.match(pattern) and bool(set(pattern) & set('?*[')):
s = ''
- for name in glob.glob(pattern):
+ for name in sorted(glob.glob(pattern), reverse=bool(int(kvargs.get('reverse', '0'))) ):
s += link_inline(name, descr, kvargs)
return s
else:
@@ -228,7 +234,7 @@ def handle_atom(pagename, form):
Page(pagename).send_atom()
def handle_edit(pagename, form):
- pg = Page(form['q'].value)
+ pg = Page(pagename)
if 'save' in form:
if form['file'].value:
pg.save(form['file'].file.read(), form['changelog'].value)
@@ -303,13 +309,13 @@ class WikiFormatter:
return '—'
def _tit_repl(self, word):
+ link = permalink(self.line)
if self.h_level:
- result = '
\s*\}\}\}) @@ -567,14 +571,12 @@ class Page: return True return False - def get_raw_body(self, default=None): + def get_raw_body(self): try: return open(self._filename(), 'rb').read() except IOError, err: if err.errno == errno.ENOENT: - if default is None: - default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name) - return default + return '' if err.errno == errno.EISDIR: return self.format_dir() raise err @@ -587,9 +589,9 @@ class Page: out += '[[' + pathname + '|' + dirname + ']]/' out += ' ==\n' images_out = '\n' - + for filename in page_list(self._filename(), file_re): - if image_re.match(filename): + if image_re.match(filename) or video_re.match(filename): maxwidth = config_get('image_maxwidth', '400') if maxwidth: maxwidth = ' | maxwidth=' + str(maxwidth) @@ -644,10 +646,11 @@ class Page: if title_done: return # HEAD - emit_header(self._mtime()) + emit_header(name and self._mtime()) print('\n') print("%s: %s " % (config_get('site_name', "Unconfigured Wiki"), text)) - print(' ') + print(' ') + print(' ') if not name: print(' ') @@ -661,18 +664,17 @@ class Page: editable = name and self.can_write() and is_privileged() if editable: print(' ' \ - % relative_url('?a=edit&q=' + name, privileged=True)) + % relative_url(name + '?a=edit', privileged=True)) - history = config_get('history_url') - if history is not None: - print(' ' \ - % relative_url(history + '?a=rss')) + if name: + print(' ' \ + % relative_url(name + '?a=atom')) print('') # BODY if editable: - print('') + print('') else: print('') @@ -690,6 +692,7 @@ class Page: else: print(' ' + text + ' ') print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) + history = config_get('history_url') if history: print(' | Recent Changes') if name: @@ -699,13 +702,13 @@ class Page: print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) if config_get('privileged_url') is not None: if self.can_write(): - print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) + print(' | ' + link_tag(name + '?a=edit', 'Edit', cssclass='navlink', privileged=True)) else: - print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) + print(' | ' + link_tag(name, 'Login', cssclass='login', privileged=True)) user = remote_user() if user != 'AnonymousCoward': - print(' | ' + link_tag('User/' + user, user) + '') + print(' | ' + link_tag('user/' + user, user, cssclass='login')) print('
') @@ -719,13 +722,16 @@ class Page: link_inline(footer, kvargs = { 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime())) }) - print("") + print('') def send_naked(self, kvargs=None): if self.can_read(): - WikiFormatter(self.get_raw_body(), kvargs).print_html() + body = self.get_raw_body() + if not body: + body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name) + WikiFormatter(body, kvargs).print_html() else: - send_guru("Read access denied by ACLs", "notice") + send_guru('Read access denied by ACLs', 'notice') def send(self): #css foo.css @@ -757,7 +763,7 @@ class Page: return if preview is None: - preview = self.get_raw_body(default='') + preview = self.get_raw_body() link_inline("sys/EditPage", kvargs = { 'EDIT_BODY': cgi.escape(preview), @@ -779,7 +785,8 @@ class Page: if 'maxwidth' in args: import subprocess sys.stdout.flush() - subprocess.check_call(['gm', 'convert', self._filename(), + subprocess.check_call(['convert', self._filename(), + '-auto-orient', '-orient', 'TopLeft', '-scale', args['maxwidth'].value + ' >', '-']) else: body = self.get_raw_body()