X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=01027ee23b69b7da0a60f32c2925ab4f04dcfb1c;hp=f549d0ff2359b47596abd228e480303ebd1b764f;hb=4d8eca8c234926b3770f3fc4d150128ad18cea87;hpb=ad86c58bf14eadd2ed5a05a2fb9f563c04dcc91b diff --git a/geekigeeki.py b/geekigeeki.py index f549d0f..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 @@ -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('
' \ @@ -227,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 '%s' % (url, url + url_args(kvargs), descr) elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page @@ -236,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): @@ -325,7 +331,7 @@ 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) + '

' @@ -334,14 +340,14 @@ def page_list(dirname=None, search_re=None): if search_re is None: # FIXME: WikiWord is too restrictive now! 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 config_get('data_dir', 'data')))) + 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): @@ -409,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: @@ -430,10 +436,10 @@ class WikiFormatter: # This double div nonsense works around a limitation of the HTML block model return '
' \ + '
' \ - + link_inline(name, descr, kvargs) \ + + link_inline_glob(name, descr, kvargs) \ + '
' + descr + '
' else: - return link_inline(name, None, kvargs) + return link_inline_glob(name, None, kvargs) def _html_repl(self, word): if not self.in_html and word.startswith('Editing ' + self.page_name - + ' for ' + cgi.escape(remote_user()) - + ' from ' + cgi.escape(get_hostname(remote_host())) - + '

')) - print('
' % relative_url(self.page_name)) - print('') - print('
' % (self.page_name)) - print('' \ - % cgi.escape(preview or self.get_raw_body(default=''))) - print(' ' % filename) - print(""" -
- - - - -
-
- - """) - print("

" + 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("
") WikiFormatter(preview).print_html() @@ -823,7 +808,7 @@ class Page: import subprocess cmd = [ config_get('post_edit_hook'), - os.path.join(config_get('data_dir', 'data'), self.page_name), remote_user(), + self.page_name, remote_user(), remote_host(), changelog ] child = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) output = child.stdout.read() @@ -838,6 +823,7 @@ class Page: try: exec(open("geekigeeki.conf.py").read()) + os.chdir(config_get('data_dir', 'data')) form = cgi.FieldStorage() action = form.getvalue('a', 'get') handler = globals().get('handle_' + action)