' + Page(page_name).link_to() + print '
' + link_tag(page_name) print ' . . . . ' + `count` print ['match', 'matches'][count != 1] print '
- "
for filename in hits:
- print '
' + Page(filename).link_to() + "
"
+ print '' + link_tag(filename) + "
"
print "
%d hits out of %d pages searched.
" % (hits, searched) def handle_raw(pagename): + if not file_re.match(pagename): + send_httperror("403 Forbidden", pagename) + return + Page(pagename).send_raw() def handle_edit(pagename): + if not file_re.match(pagename): + send_httperror("403 Forbidden", pagename) + return + pg = Page(pagename) if 'save' in form: if form['file'].value: - pg.save(form['file'].file.read()) + pg.save(form['file'].file.read(), form['changelog'].value) else: - pg.save(form['savetext'].value.replace('\r\n', '\n')) + pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value) pg.format() elif 'cancel' in form: pg.msg_text = 'Editing canceled' @@ -264,18 +290,21 @@ def make_index_key(): links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz') return '' - print ('
generated in %0.3fs' + - ' by GeekiGeeki' + - ' version %s
') % (clock() - start_time, __version__) + print ''' ++
+
+generated in %0.3fs by GeekiGeeki version %s
+
last modified %s
' % mod_string print '\n' % (len(word) - 2) def _word_repl(self, word): - return Page(word).link_to() + return link_tag(word) def _img_repl(self, word): - path = relative_url(word) - return '
'
@@ -496,7 +527,7 @@ class WikiFormatter:
+ r"|(?P
'
else:
indent = indent_re.match(self.line)
- print self._indent_to(len(indent.group(0)))
+ print self._indent_to(len(indent.group(0))) ,
print re.sub(scan_re, self.replace, self.line)
if self.in_pre: print ''
@@ -561,85 +592,78 @@ class Page:
return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
def _filename(self):
- return path.join(data_dir, self.page_name)
+ return os.path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
+ return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
def exists(self):
try:
os.stat(self._filename())
return True
- except OSError, er:
- if er.errno == errno.ENOENT:
+ except OSError, err:
+ if err.errno == errno.ENOENT:
return False
- raise er
-
- def link_to(self):
- word = self.page_name
- if self.exists():
- return link_tag(word, word, 'wikilink')
- else:
- return link_tag(word, nonexist_pfx + word, 'nonexistent')
+ raise err
def get_raw_body(self):
try:
return open(self._filename(), 'rb').read()
- except IOError, er:
- if er.errno == errno.ENOENT:
+ except IOError, err:
+ if err.errno == errno.ENOENT:
return '' # just doesn't exist, use default
- if er.errno == errno.EISDIR:
+ if err.errno == errno.EISDIR:
return self.format_dir()
- raise er
+ raise err
def format_dir(self):
out = '== '
- path = ''
- for dir in self.page_name.split('/'):
- path = (path + '/' + dir) if path else dir
- out += '[[' + path + '|' + dir + ']]/'
+ pathname = ''
+ for dirname in self.page_name.split('/'):
+ pathname = (pathname + '/' + dirname) if pathname else dirname
+ out += '[[' + pathname + '|' + dirname + ']]/'
out += ' ==\n'
- for file in page_list(self._filename(), file_re):
- if img_re.match(file):
+ for filename in page_list(self._filename(), file_re):
+ if img_re.match(filename):
if image_maxwidth:
maxwidth_arg = '|maxwidth=' + str(image_maxwidth)
- out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\n'
+ out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n'
else:
- out += ' * [[' + self.page_name + '/' + file + ']]\n'
+ out += ' * [[' + self.page_name + '/' + filename + ']]\n'
return out
- def get_attrs(self):
- if 'attrs' in self.__dict__:
- return self.attrs
- self.attrs = {}
- try:
- file = open(self._filename(), 'rt')
- attr_re = re.compile(r"^#(\S*)(.*)$")
- for line in file:
- m = attr_re.match(line)
- if not m:
- break
- 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:
- raise er
- return self.attrs
-
- def get_attr(self, name, default):
- return self.get_attrs().get(name, default)
+
+ def pragmas(self):
+ if not '_pragmas' in self.__dict__:
+ self._pragmas = {}
+ try:
+ f = open(self._filename(), 'rt')
+ attr_re = re.compile(r"^#(\S*)(.*)$")
+ for line in f:
+ m = attr_re.match(line)
+ if not m:
+ break
+ self._pragmas[m.group(1)] = m.group(2).strip()
+ #print "bernie: _pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n"
+ except IOError, err:
+ if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
+ raise err
+ return self._pragmas
+
+ def pragma(self, name, default):
+ return self.pragmas().get(name, default)
def can(self, action, default=True):
acl = None
try:
#acl SomeUser:read,write All:read
- acl = self.get_attr("acl", None)
+ acl = self.pragma("acl", None)
for rule in acl.split():
(user, perms) = rule.split(':')
if user == remote_user() or user == "All":
return action in perms.split(',')
return False
- except Exception, er:
+ except Exception:
if acl:
self.msg_text = 'Illegal acl line: ' + acl
return default
@@ -658,7 +682,7 @@ class Page:
def format(self):
#css foo.css
- value = self.get_attr("css", None)
+ value = self.pragma("css", None)
if value:
global link_urls
link_urls += [ [ "stylesheet", value ] ]
@@ -666,15 +690,15 @@ class Page:
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(self.page_name, self._last_modified())
+ send_footer(self._last_modified())
def _last_modified(self):
try:
from time import localtime, strftime
modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
- except OSError, er:
- if er.errno != errno.ENOENT:
- raise er
+ except OSError, err:
+ if err.errno != errno.ENOENT:
+ raise err
return None
return strftime(datetime_fmt, modtime)
@@ -684,32 +708,39 @@ class Page:
send_guru("Write access denied by ACLs", "error")
return
- file = ''
+ filename = ''
if 'file' in form:
- file = form['file'].value
+ filename = form['file'].value
print ('
Editing ' + self.page_name + ' for ' + cgi.escape(remote_user()) + ' from ' + cgi.escape(get_hostname(remote_host())) + '
') - print ' + + """ + print "" + link_tag('EditingTips') + "
" if preview: print "