X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=01027ee23b69b7da0a60f32c2925ab4f04dcfb1c;hp=73c45ce41d3f36a82c5adedacb370a930b1c9e14;hb=4d8eca8c234926b3770f3fc4d150128ad18cea87;hpb=b9db2bd04b6007004057410623024c880660bd72 diff --git a/geekigeeki.py b/geekigeeki.py index 73c45ce..01027ee 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -24,7 +24,7 @@ from time import clock start_time = clock() title_done = False -import cgi, sys, os, re, errno, stat +import cgi, sys, os, re, errno, stat, glob image_ext = 'png|gif|jpg|jpeg|bmp|ico' video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt @@ -50,7 +50,7 @@ def query_string(): return os.environ.get('QUERY_STRING', '') or 'FrontPage' def privileged_path(): - return privileged_url or script_name() + return config_get('privileged_url') or script_name() def remote_user(): user = os.environ.get('REMOTE_USER', '') @@ -116,7 +116,7 @@ def send_guru(msg_text, msg_type): print('
') if msg_type == 'error': print(' Software Failure. Press left mouse button to continue.\n') - print(msg_text) + print(cgi.escape(msg_text)) if msg_type == 'error': print '\n Guru Meditation #DEADBEEF.ABADC0DE' print('' \ @@ -144,7 +144,8 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal rel, href = link print(' ' % (rel, relative_url(href))) - if name and writable and privileged_url is not None: + editable = name and writable and config_get('privileged_url') is not None + if editable: print(' ' \ % (privileged_path() + '?a=edit&q=' + name)) @@ -156,7 +157,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal print('') # Body - if name and writable and privileged_url is not None: + if editable: print('') else: print('') @@ -179,7 +180,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal if name: print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) - if privileged_url is not None: + if config_get('privileged_url') is not None: if writable: print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) else: @@ -226,7 +227,7 @@ def link_inline(name, descr=None, kvargs={}): if not descr: descr = humanlink(name) url = relative_url(name) if video_re.match(name): - return '' % url + return '' % url elif image_re.match(name): return '' % (url, url + url_args(kvargs), descr) elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page @@ -235,6 +236,12 @@ def link_inline(name, descr=None, kvargs={}): return '' \ % (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 + # Search --------------------------------------------------- def print_search_stats(hits, searched): @@ -324,23 +331,23 @@ def handle_get(pagename, form): else: send_httperror("403 Forbidden", pagename) -# Used by macros/WordIndex and macros/TitleIndex +# Used by sys/macros/WordIndex and sys/macros/TitleIndex def make_index_key(): links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '
' + ' | '.join(links) + '
' -def page_list(dirname=None, re=None): - if re is None: +def page_list(dirname=None, search_re=None): + if search_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 config_get(data_dir, '')))) + search_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") + return sorted(filter(search_re.match, os.listdir(dirname or '.'))) def send_footer(mod_string=None): if config_get('debug_cgi', False): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - link_inline("sys/footer", kvargs= { 'LAST_MODIFIED': mod_string }) + link_inline("sys/footer", kvargs = { 'LAST_MODIFIED': mod_string }) print("") def _macro_ELAPSED_TIME(*args, **kvargs): @@ -408,7 +415,7 @@ class WikiFormatter: return self.kvargs[args[0]] macro = globals().get('_macro_' + args[0]) if not macro: - exec(open("macros/" + args[0] + ".py").read(), globals()) + exec(open("sys/macros/" + args[0] + ".py").read(), globals()) macro = globals().get('_macro_' + args[0]) return macro(*args, **kvargs) except Exception, e: @@ -429,10 +436,10 @@ class WikiFormatter: # This double div nonsense works around a limitation of the HTML block model return '" + link_tag('EditingTips') + "
") + if preview is None: + preview = self.get_raw_body(default='') + + link_inline("sys/EditPage", kvargs = { + 'EDIT_BODY': cgi.escape(preview), + #'EDIT_PREVIEW': WikiFormatter(preview).print_html(), + }) + if preview: print("