X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=263c4829187a28dd11e3fd3cd0eff068eabedaf1;hb=488a02407fffcc35f0ec91dbe6a44eb13730df91;hp=5b26b553da7b344af20ce8d416693d95449f80de;hpb=ebf4ddefb5f1eaf744c3919ad337b2ff43ff5e2c;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 5b26b55..263c482 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -146,7 +146,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal editable = name and writable and config_get('privileged_url') is not None if editable: print(' ' \ - % (privileged_path() + '?a=edit&q=' + name)) + % relative_url('?a=edit&q=' + name, privileged=True)) history = config_get('history_url') if history is not None: @@ -157,7 +157,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal # Body if editable: - print('') + print('') else: print('') @@ -237,10 +237,13 @@ def link_inline(name, descr=None, kvargs={}): % (url, url, name) def link_inline_glob(pattern, descr=None, kvargs={}): - s = '' - for name in glob.glob(pattern): - s += link_inline(name, descr, kvargs) - return s + if not url_re.match(pattern) and bool(set(pattern) & set('?*[')): + s = '' + for name in glob.glob(pattern): + s += link_inline(name, descr, kvargs) + return s + else: + return link_inline(pattern, descr, kvargs) # Search --------------------------------------------------- @@ -370,7 +373,7 @@ class WikiFormatter: self.h_level = 0 self.in_pre = self.in_html = self.in_table = self.in_li = False self.in_header = True - self.list_indents = [] + self.list_indents = [] # a list of pairs (indent_level, list_type) to track nested lists self.tr_cnt = 0 self.styles = { #wiki html enabled? @@ -408,7 +411,7 @@ class WikiFormatter: return '
' def _rule_repl(self, word): - return self._undent() + '\n

\n' % (len(word) - 2) + return '\n

\n' % (len(word) - 2) def _macro_repl(self, word): try: @@ -515,31 +518,26 @@ class WikiFormatter: return '' def _indent_level(self): - return len(self.list_indents) and self.list_indents[-1] + return len(self.list_indents) and self.list_indents[-1][0] - def _indent_to(self, new_level): + def _indent_to(self, new_level, list_type=''): if self._indent_level() == new_level: return '' s = '

' while self._indent_level() > new_level: - del(self.list_indents[-1]) if self.in_li: s += '' self.in_li = False # FIXME - s += '\n' + s += '\n' + del(self.list_indents[-1]) + + list_type = ('ul', 'ol')[list_type == '#'] while self._indent_level() < new_level: - self.list_indents.append(new_level) - s += '

' return s - def _undent(self): - res = '

' * len(self.list_indents) - res += '

' - self.list_indents = [] - return res - def replace(self, match): for rule, hit in list(match.groupdict().items()): if hit: @@ -591,7 +589,7 @@ class WikiFormatter: | (?P[<>&])" )""", re.VERBOSE) blank_re = re.compile(r"^\s*$") - indent_re = re.compile(r"^\s*") + indent_re = re.compile(r"^(\s*)(\*|\#|)") tr_re = re.compile(r"^\s*\|\|") eol_re = re.compile(r"\r?\n") # For each line, we scan through looking for magic strings, outputting verbatim any intervening text @@ -615,12 +613,12 @@ class WikiFormatter: else: indent = indent_re.match(self.line) #3.0: print(self._indent_to(len(indent.group(0))), end=' ') - print(self._indent_to(len(indent.group(0)))) + print(self._indent_to(len(indent.group(1)), indent.group(2))) print(re.sub(scan_re, self.replace, self.line)) if self.in_pre: print('') if self.in_table: print('

') - print(self._undent()) + print(self._indent_to(0)) print('

') class Page: @@ -696,7 +694,7 @@ class Page: #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" except IOError, err: if err.errno != errno.ENOENT and err.errno != errno.EISDIR: - raise er + raise err return self._pragmas def pragma(self, name, default):