From b9db2bd04b6007004057410623024c880660bd72 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Mon, 17 Aug 2009 19:29:45 +0200 Subject: [PATCH] Use config_get() to access configuration values --- geekigeeki.py | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/geekigeeki.py b/geekigeeki.py index eb51489..73c45ce 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -36,6 +36,9 @@ url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S") ext_re = re.compile(r"\.([^\./]+)$") # CGI stuff --------------------------------------------------------- +def config_get(key, default=None): + return globals().get(key, default) + def script_name(): return os.environ.get('SCRIPT_NAME', '') @@ -129,16 +132,15 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal print(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">') print('') - print("%s: %s" % (site_name, text)) + print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) print(' ') if not name: print(' ') - for meta in meta_urls: - http_equiv, content = meta + for http_equiv, content in config_get('meta_urls', {}): print(' ' % (http_equiv, relative_url(content))) - for link in link_urls: + for link in config_get('link_urls', {}): rel, href = link print(' ' % (rel, relative_url(href))) @@ -146,9 +148,10 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal print(' ' \ % (privileged_path() + '?a=edit&q=' + name)) - if history_url is not None: + history = config_get('history_url') + if history is not None: print(' ' \ - % relative_url(history_url + '?a=rss')) + % relative_url(history + '?a=rss')) print('') @@ -163,16 +166,16 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal # Navbar print('
') - print link_tag('FrontPage', site_icon or 'Home', cssclass='navlink') + print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink') if name: print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') else: print(' ' + text + ' ') print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) - if 'history_url' in globals(): - print(' | Recent Changes') + if history: + print(' | Recent Changes') if name: - print(' | Page History') + print(' | Page History') if name: print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) @@ -209,7 +212,7 @@ def link_tag(dest, text=None, privileged=False, **kvargs): elif file_re.match(dest) and Page(dest).exists(): link_class = 'wikilink' else: - text = nonexist_pfx + text + text = config_get('nonexist_pfx', '') + text link_class = 'nonexistent' # Prevent crawlers from following links potentially added by spammers or to generated pages @@ -330,10 +333,10 @@ def page_list(dirname=None, re=None): if re is None: # FIXME: WikiWord is too restrictive now! re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") - return sorted(filter(re.match, os.listdir(dirname or data_dir))) + return sorted(filter(re.match, os.listdir(dirname or config_get(data_dir, '')))) def send_footer(mod_string=None): - if globals().get('debug_cgi', False): + if config_get('debug_cgi', False): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() @@ -533,7 +536,7 @@ class WikiFormatter: if hit: return getattr(self, '_' + rule + '_repl')(hit) else: - raise "Can't handle match " + repr(match) + raise Exception("Can't handle match " + repr(match)) def print_html(self): print('

') @@ -622,10 +625,10 @@ class Page: return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) def _filename(self): - return os.path.join(data_dir, self.page_name) + return os.path.join(config_get('data_dir', ''), self.page_name) def _tmp_filename(self): - return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + str(os.getpid()) + '#')) + return os.path.join(config_get('data_dir', ''), ('#' + self.page_name.replace('/','_') + '.' + str(os.getpid()) + '#')) def exists(self): try: @@ -658,8 +661,9 @@ class Page: for filename in page_list(self._filename(), file_re): if image_re.match(filename): - if image_maxwidth: - maxwidth_arg = ' | maxwidth=' + str(image_maxwidth) + maxwidth = config_get(image_maxwidth) + if maxwidth: + maxwidth_arg = ' | maxwidth=' + str(maxwidth) out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\n' else: out += ' * [[' + self.page_name + '/' + filename + ']]\n' @@ -732,7 +736,7 @@ class Page: if err.errno != errno.ENOENT: raise err return None - return strftime(datetime_fmt, modtime) + return strftime(config_get(datetime_fmt, '%a %d %b %Y %I:%M %p'), modtime) def send_editor(self, preview=None): send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) @@ -814,9 +818,12 @@ class Page: self._write_file(newdata) rc = 0 - if post_edit_hook: + if config_get('post_edit_hook'): import subprocess - cmd = [ post_edit_hook, data_dir + '/' + self.page_name, remote_user(), remote_host(), changelog] + cmd = [ + config_get(post_edit_hook), + config_get(data_dir, '') + '/' + self.page_name, remote_user(), + remote_host(), changelog ] child = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) output = child.stdout.read() rc = child.wait() -- 2.25.1