X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=3eb4c1a32ee7d4de3bcc2008856bc8caeaaa89ba;hb=f717244ea693c7882948b4758836e530169a6c11;hp=cc0373621ab6e4c11da560c253d9383cc40a9948;hpb=c0c495043d8f2f4edb5a37b108d7c400e0eb1498;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index cc03736..3eb4c1a 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -33,7 +33,8 @@ file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$") img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE) video_re = re.compile(r"^.*\.(ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE) url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$") -link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})") +link_re = re.compile(r"(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})") +ext_re = re.compile(r"\.([^\./]+)$") title_done = False @@ -86,13 +87,6 @@ def permalink(s): def emit_header(mime_type="text/html"): print "Content-type: " + mime_type + "; charset=utf-8\n" -def sendfile(dest_file, src_file): - """Efficiently copy file data between file descriptors""" - while 1: - data = src_file.read(65536) - if not data: break - dest_file.write(data) - def send_guru(msg_text, msg_type): if not msg_text: return print '
' @@ -100,12 +94,10 @@ def send_guru(msg_text, msg_type): print ' Software Failure. Press left mouse button to continue.\n' print msg_text if msg_type == 'error': - print '\n Guru Meditation #DEADBEEF.ABADC0DE' + print '\n Guru Meditation #DEADBEEF.ABADC0DE' print '' - try: - sendfile(sys.stdout, open('gurumeditation.js', 'rb')) - except IOError, err: - pass + print '' \ + % relative_url('sys/GuruMeditation.js') def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): global title_done @@ -208,10 +200,16 @@ def link_tag(params, text=None, link_class=None, privileged=False): def link_inline(name, descr=None, args=''): if not descr: descr = name + url = relative_url(name) if video_re.match(name): - return '' % name + return '' % url + elif img_re.match(name): + return '' % (url, url + args, descr) + elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page + return Page(name).send_naked() else: - return '' % (name, name + args, descr) + return '' \ + % (url, url, name) # Search --------------------------------------------------- @@ -289,9 +287,10 @@ def handle_edit(pagename): text = form['savetext'].value pg.send_editor(text) +# Used by macros/WordIndex and macros/TitleIndex def make_index_key(): links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz') - return '
'+ ' | '.join(links) + '
' def page_list(dirname = None, re = word_re): return sorted(filter(re.match, os.listdir(dirname or data_dir))) @@ -387,9 +386,7 @@ class WikiFormatter: return link_tag(m.group(1), m.group(2)) def _inl_repl(self, word): - m = link_re.match(word) - name = relative_url(m.group(1)) - descr = m.group(2) + (name, descr) = link_re.match(word).groups() if descr: argv = descr.split('|') @@ -606,12 +603,14 @@ class Page: return False raise err - def get_raw_body(self): + def get_raw_body(self, default=None): try: return open(self._filename(), 'rb').read() except IOError, err: if err.errno == errno.ENOENT: - return '' # just doesn't exist, use default + if default is None: + default = '//[[?edit=%s|Describe %s]]//' % (self.page_name, self.page_name) + return default if err.errno == errno.EISDIR: return self.format_dir() raise err @@ -719,7 +718,8 @@ class Page: print '