%s: %s

' if msg_type == 'error': print ' Software Failure. Press left mouse button to continue.\n' - print msg + print msg_text if msg_type == 'error': print ' Guru Meditation #DEADBEEF.ABADC0DE' print '

' + out = out + '
', '	'][word.strip() == '\|\|='] - def _tre_repl(self, word): + def _td_repl(self, word): if self.in_table: - return '
', '	'][word.strip() == '\|\|='] return '' - def _td_repl(self, word): + def _tre_repl(self, word): if self.in_table: - return '	' + return ['
\s\\|\\|\s)" + + r"\|(?P
\s\\|\\|(=\|)\s)" + r")") pre_re = re.compile( r"(?:" + r"(?P \s\}\}\})" + + r"\|(?P[<>&])" + r")") blank_re = re.compile(r"^\s$") indent_re = re.compile(r"^\s") tr_re = re.compile(r"^\s\\|\\|") eol_re = re.compile(r"\r?\n") - raw = string.expandtabs(self.raw) - for line in eol_re.split(raw): + for line in eol_re.split(self.raw.expandtabs()): # Skip ACLs if self.in_header: if line.startswith('#'): - continue + continue self.in_header = False if self.in_pre: @@ -555,30 +550,27 @@ class PageFormatter: class Page: def __init__(self, page_name): self.page_name = page_name - self.msg = '' + self.msg_text = '' self.msg_type = 'error' - self.attrs = {} def split_title(self): - # look for the end of words and the start of a new word, - # and insert a space there + # look for the end of words and the start of a new word and insert a space there return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) def _text_filename(self): - return path.join(text_dir, self.page_name) + return path.join(data_dir, self.page_name) def _tmp_filename(self): - return path.join(text_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#')) + return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#')) def exists(self): try: os.stat(self._text_filename()) - return 1 + return True except OSError, er: if er.errno == errno.ENOENT: - return 0 - else: - raise er + return False + raise er def link_to(self): word = self.page_name @@ -589,17 +581,18 @@ class Page: def get_raw_body(self): try: - return open(self._text_filename(), 'rt').read() + return open(self._text_filename(), 'rb').read() except IOError, er: if er.errno == errno.ENOENT: - # just doesn't exist, use default - return 'Describe %s here.' % self.page_name - else: - raise er + return '' # just doesn't exist, use default + if er.errno == errno.EISDIR: + return 'DIR' + raise er def get_attrs(self): - if self.attrs: + if self.__dict__.has_key('attrs'): return self.attrs + self.attrs = {} try: file = open(self._text_filename(), 'rt') attr_re = re.compile(r"^#(\S)(.)$") @@ -614,18 +607,17 @@ class Page: raise er return self.attrs + def get_attr(self, name, default): + return self.get_attrs().get(name, default) + def can(self, action, default=True): - attrs = self.get_attrs() try: - # SomeUser:read,write All:read - acl = attrs["acl"] + #acl SomeUser:read,write All:read + acl = self.get_attr("acl", None) for rule in acl.split(): - (user,perms) = rule.split(':') + (user, perms) = rule.split(':') if user == remote_user() or user == "All": - if action in perms.split(','): - return True - else: - return False + return action in perms.split(',') return False except Exception, er: pass @@ -641,7 +633,12 @@ class Page: page_name = None if self.can_write(): page_name = self.page_name - send_title(page_name, self.split_title(), msg=self.msg, msg_type=self.msg_type) + + #css foo.css bar.css + global css_url + css_url = self.get_attr("css", "").split() + css_url + + send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) if self.can_read(): PageFormatter(self.get_raw_body()).print_html() else: @@ -649,14 +646,17 @@ class Page: send_footer(page_name, self._last_modified()) def _last_modified(self): - if not self.exists(): + try: + from time import localtime, strftime + modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME]) + except OSError, er: + if er.errno != errno.ENOENT: + raise er return None - from time import localtime, strftime - modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME]) return strftime(datetime_fmt, modtime) def send_editor(self, preview=None): - send_title(None, 'Edit ' + self.split_title(), msg=self.msg, msg_type=self.msg_type) + send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) if not self.can_write(): send_guru("Write access denied by ACLs", "error") return @@ -665,9 +665,9 @@ class Page: + ' for ' + cgi.escape(remote_user()) + ' from ' + cgi.escape(get_hostname(remote_host())) + ' ') - print ' ' % (script_name(), self.page_name) - print '' % (self.page_name) - print """%s""" % (preview or self.get_raw_body()) + print ' ' % relative_url(self.page_name) + print '' % (self.page_name) + print """%s""" % (preview or self.get_raw_body()) print """ @@ -683,12 +683,13 @@ class Page: print " " send_footer(self.page_name) - def send_raw(self): - if not self.can_read(): - send_title(None, msg='Read access denied by ACLs', msg_type='notice') - return - emit_header("text/plain") - print self.get_raw_body() + def send_raw(self, mimetype='text/plain'): + if self.can_read(): + body = self.get_raw_body() + emit_header(mimetype) + print body + else: + send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') def _write_file(self, text): tmp_filename = self._tmp_filename() @@ -699,12 +700,12 @@ class Page: try: os.remove(text) except OSError, er: - if er.errno <> errno.ENOENT: raise er + if er.errno != errno.ENOENT: raise er os.rename(tmp_filename, text) def save_text(self, newtext): if not self.can_write(): - self.msg = 'Write access denied by ACLs' + self.msg_text = 'Write access denied by ACLs' self.msg_type = 'error' return @@ -713,55 +714,32 @@ class Page: if post_edit_hook: # FIXME: what's the std way to perform shell quoting in python? cmd = ( post_edit_hook - + " '" + text_dir + '/' + self.page_name + + " '" + data_dir + '/' + self.page_name + "' '" + remote_user() + "' '" + remote_host() + "'" ) out = os.popen(cmd) - msg = out.read() + output = out.read() rc = out.close() if rc: - self.msg += "Post-editing hook returned %d.\n" % rc - self.msg += 'Command was: ' + cmd + '\n' - if msg: - self.msg += 'Output follows:\n' + msg + self.msg_text += "Post-editing hook returned %d.\n" % rc + self.msg_text += 'Command was: ' + cmd + '\n' + if output: + self.msg_text += 'Output follows:\n' + output else: - self.msg = 'Thank you for your contribution. Your attention to detail is appreciated.' + self.msg_text = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' -def send_verbatim(filename, mime_type='application/octet-stream'): - pathname = path.join(text_dir, filename) - data = open(pathname, 'rb').read() - emit_header(mime_type) - sys.stdout.write(data) - # Main --------------------------------------------------------------- try: - # Configuration values - site_name = 'Codewiz' - - # set to None for read-only sites, leave empty ('') to allow anonymous edits - # otherwise, set to a URL that requires authentication - privileged_url = 'https://www.codewiz.org/~bernie/wiki' - - data_dir = '/home/bernie/public_html/wiki' - text_dir = path.join(data_dir, 'text') - css_url = '../wikidata/geekigeeki.css' # optional stylesheet link - history_url = '../wikigit/wiki.git' - post_edit_hook = './post_edit_hook.sh' - datetime_fmt = '%a %d %b %Y %I:%M %p' - allow_edit = True # Is it possible to edit pages? - show_hosts = True # show hostnames? - nonexist_pfx = '' # prefix before nonexistent link (usually '?') - debug_cgi = False # Set to True for CGI var dump - + execfile("geekigeeki.conf.py") form = cgi.FieldStorage() - - handlers = { 'fullsearch': do_fullsearch, - 'titlesearch': do_titlesearch, - 'edit': do_edit, - 'raw': do_raw, - 'savepage': do_savepage } + handlers = { + 'fullsearch': do_fullsearch, + 'titlesearch': do_titlesearch, + 'edit': do_edit, + 'raw': do_raw, + } for cmd in handlers.keys(): if form.has_key(cmd): @@ -779,19 +757,19 @@ try: Page(query).send_page() elif img_re.match(query): #FIXME: use correct mime type - send_verbatim(query, 'image/jpeg') + Page(query).send_raw(mimetype='image/jpeg') else: - send_verbatim(query) + Page(query).send_raw(mimetype='application/octet-stream') else: - # TODO: return 404? - send_title(None, msg='Can\'t work out query: ' + query) -except: + print "Status: 404 Not Found" + send_title(None, msg_text='Can\'t work out query: ' + query) +except Exception: import traceback - msg=traceback.format_exc() + msg_text = traceback.format_exc() if title_done: - send_guru(msg, "error") + send_guru(msg_text, "error") else: - send_title(None, msg=msg) + send_title(None, msg_text=msg_text) send_footer(None) sys.stdout.flush()

' + out = out + '

', '

'][word.strip() == '||='] - def _tre_repl(self, word): + def _td_repl(self, word): if self.in_table: - return '

', '

'][word.strip() == '||='] return '' - def _td_repl(self, word): + def _tre_repl(self, word): if self.in_table: - return '

' + return ['

\s*\|\|\s*)" + + r"|(?P

\s*\|\|(=|)\s*)" + r")") pre_re = re.compile( r"(?:" + r"(?P

\s*\}\}\})"
+            + r"|(?P[<>&])"
             + r")")
         blank_re = re.compile(r"^\s*$")
         indent_re = re.compile(r"^\s*")
         tr_re = re.compile(r"^\s*\|\|")
         eol_re = re.compile(r"\r?\n")
-        raw = string.expandtabs(self.raw)
-        for line in eol_re.split(raw):
+        for line in eol_re.split(self.raw.expandtabs()):
             # Skip ACLs
             if self.in_header:
                 if line.startswith('#'):
-                   continue
+                    continue
                 self.in_header = False
 
             if self.in_pre:
@@ -555,30 +550,27 @@ class PageFormatter:
 class Page:
     def __init__(self, page_name):
         self.page_name = page_name
-        self.msg = ''
+        self.msg_text = ''
         self.msg_type = 'error'
-        self.attrs = {}
 
     def split_title(self):
-        # look for the end of words and the start of a new word,
-        # and insert a space there
+        # look for the end of words and the start of a new word and insert a space there
         return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
 
     def _text_filename(self):
-        return path.join(text_dir, self.page_name)
+        return path.join(data_dir, self.page_name)
 
     def _tmp_filename(self):
-        return path.join(text_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#'))
+        return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
 
     def exists(self):
         try:
             os.stat(self._text_filename())
-            return 1
+            return True
         except OSError, er:
             if er.errno == errno.ENOENT:
-                return 0
-            else:
-                raise er
+                return False
+            raise er
 
     def link_to(self):
         word = self.page_name
@@ -589,17 +581,18 @@ class Page:
 
     def get_raw_body(self):
         try:
-            return open(self._text_filename(), 'rt').read()
+            return open(self._text_filename(), 'rb').read()
         except IOError, er:
             if er.errno == errno.ENOENT:
-                # just doesn't exist, use default
-                return 'Describe %s here.' % self.page_name
-            else:
-                raise er
+                return '' # just doesn't exist, use default
+            if er.errno == errno.EISDIR:
+                return 'DIR'
+            raise er
 
     def get_attrs(self):
-        if self.attrs:
+        if self.__dict__.has_key('attrs'):
             return self.attrs
+        self.attrs = {}
         try:
             file = open(self._text_filename(), 'rt')
             attr_re = re.compile(r"^#(\S*)(.*)$")
@@ -614,18 +607,17 @@ class Page:
                 raise er
         return self.attrs
 
+    def get_attr(self, name, default):
+        return self.get_attrs().get(name, default)
+
     def can(self, action, default=True):
-        attrs = self.get_attrs()
         try:
-            # SomeUser:read,write All:read
-            acl = attrs["acl"]
+            #acl SomeUser:read,write All:read
+            acl = self.get_attr("acl", None)
             for rule in acl.split():
-                (user,perms) = rule.split(':')
+                (user, perms) = rule.split(':')
                 if user == remote_user() or user == "All":
-                    if action in perms.split(','):
-                        return True
-                    else:
-                        return False
+                    return action in perms.split(',')
             return False
         except Exception, er:
             pass
@@ -641,7 +633,12 @@ class Page:
         page_name = None
         if self.can_write():
             page_name = self.page_name
-        send_title(page_name, self.split_title(), msg=self.msg, msg_type=self.msg_type)
+
+        #css foo.css bar.css
+        global css_url
+        css_url = self.get_attr("css", "").split() + css_url
+
+        send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
         if self.can_read():
             PageFormatter(self.get_raw_body()).print_html()
         else:
@@ -649,14 +646,17 @@ class Page:
         send_footer(page_name, self._last_modified())
 
     def _last_modified(self):
-        if not self.exists():
+        try:
+            from time import localtime, strftime
+            modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+        except OSError, er:
+            if er.errno != errno.ENOENT:
+                raise er
             return None
-        from time import localtime, strftime
-        modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
         return strftime(datetime_fmt, modtime)
 
     def send_editor(self, preview=None):
-        send_title(None, 'Edit ' + self.split_title(), msg=self.msg, msg_type=self.msg_type)
+        send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
         if not self.can_write():
             send_guru("Write access denied by ACLs", "error")
             return
@@ -665,9 +665,9 @@ class Page:
             + ' for ' + cgi.escape(remote_user())
             + ' from ' + cgi.escape(get_hostname(remote_host()))
             + '')
-        print '' % (script_name(), self.page_name)
-        print '' % (self.page_name)
-        print """%s""" % (preview or self.get_raw_body())
+        print '' % relative_url(self.page_name)
+        print '' % (self.page_name)
+        print """%s""" % (preview or self.get_raw_body())
         print """
             

             
@@ -683,12 +683,13 @@ class Page:
             print ""
         send_footer(self.page_name)
 
-    def send_raw(self):
-        if not self.can_read():
-            send_title(None, msg='Read access denied by ACLs', msg_type='notice')
-            return
-        emit_header("text/plain")
-        print self.get_raw_body()
+    def send_raw(self, mimetype='text/plain'):
+        if self.can_read():
+            body = self.get_raw_body()
+            emit_header(mimetype)
+            print body
+        else:
+            send_title(None, msg_text='Read access denied by ACLs', msg_type='notice')
 
     def _write_file(self, text):
         tmp_filename = self._tmp_filename()
@@ -699,12 +700,12 @@ class Page:
             try:
                 os.remove(text)
             except OSError, er:
-                if er.errno <> errno.ENOENT: raise er
+                if er.errno != errno.ENOENT: raise er
         os.rename(tmp_filename, text)
 
     def save_text(self, newtext):
         if not self.can_write():
-            self.msg = 'Write access denied by ACLs'
+            self.msg_text = 'Write access denied by ACLs'
             self.msg_type = 'error'
             return
 
@@ -713,55 +714,32 @@ class Page:
         if post_edit_hook:
             # FIXME: what's the std way to perform shell quoting in python?
             cmd = ( post_edit_hook
-                + " '" + text_dir + '/' + self.page_name
+                + " '" + data_dir + '/' + self.page_name
                 + "' '" + remote_user()
                 + "' '" + remote_host() + "'"
             )
             out = os.popen(cmd)
-            msg = out.read()
+            output = out.read()
             rc = out.close()
         if rc:
-            self.msg += "Post-editing hook returned %d.\n" % rc
-            self.msg += 'Command was: ' + cmd + '\n'
-            if msg:
-                self.msg += 'Output follows:\n' + msg
+            self.msg_text += "Post-editing hook returned %d.\n" % rc
+            self.msg_text += 'Command was: ' + cmd + '\n'
+            if output:
+                self.msg_text += 'Output follows:\n' + output
         else:
-            self.msg = 'Thank you for your contribution.  Your attention to detail is appreciated.'
+            self.msg_text = 'Thank you for your contribution.  Your attention to detail is appreciated.'
             self.msg_type = 'success'
 
-def send_verbatim(filename, mime_type='application/octet-stream'):
-    pathname = path.join(text_dir, filename)
-    data = open(pathname, 'rb').read()
-    emit_header(mime_type)
-    sys.stdout.write(data)
-
 # Main ---------------------------------------------------------------
 try:
-    # Configuration values
-    site_name = 'Codewiz'
-
-    # set to None for read-only sites, leave empty ('') to allow anonymous edits
-    # otherwise, set to a URL that requires authentication
-    privileged_url = 'https://www.codewiz.org/~bernie/wiki'
-
-    data_dir = '/home/bernie/public_html/wiki'
-    text_dir = path.join(data_dir, 'text')
-    css_url = '../wikidata/geekigeeki.css'  # optional stylesheet link
-    history_url = '../wikigit/wiki.git'
-    post_edit_hook = './post_edit_hook.sh'
-    datetime_fmt = '%a %d %b %Y %I:%M %p'
-    allow_edit = True                       # Is it possible to edit pages?
-    show_hosts = True                       # show hostnames?
-    nonexist_pfx = ''                       # prefix before nonexistent link (usually '?')
-    debug_cgi = False                       # Set to True for CGI var dump
-
+    execfile("geekigeeki.conf.py")
     form = cgi.FieldStorage()
-
-    handlers = { 'fullsearch':  do_fullsearch,
-                 'titlesearch': do_titlesearch,
-                 'edit':        do_edit,
-                 'raw':         do_raw,
-                 'savepage':    do_savepage }
+    handlers = {
+        'fullsearch':  do_fullsearch,
+        'titlesearch': do_titlesearch,
+        'edit':        do_edit,
+        'raw':         do_raw,
+    }
 
     for cmd in handlers.keys():
         if form.has_key(cmd):
@@ -779,19 +757,19 @@ try:
                 Page(query).send_page()
             elif img_re.match(query):
                 #FIXME: use correct mime type
-                send_verbatim(query, 'image/jpeg')
+                Page(query).send_raw(mimetype='image/jpeg')
             else:
-                send_verbatim(query)
+                Page(query).send_raw(mimetype='application/octet-stream')
         else:
-            # TODO: return 404?
-            send_title(None, msg='Can\'t work out query: ' + query)
-except:
+            print "Status: 404 Not Found"
+            send_title(None, msg_text='Can\'t work out query: ' + query)
+except Exception:
     import traceback
-    msg=traceback.format_exc()
+    msg_text = traceback.format_exc()
     if title_done:
-        send_guru(msg, "error")
+        send_guru(msg_text, "error")
     else:
-        send_title(None, msg=msg)
+        send_title(None, msg_text=msg_text)
     send_footer(None)
 
 sys.stdout.flush()