X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=afaebefc6a4321560a861d04f174c7d8661a304b;hb=3cebb905becc61868f9431c2cf8939d1f1cd198e;hp=b52d3522c88d0b5b11a5e6c46463b70a1f92ca52;hpb=84d4dd63eb79f68bec2e6172a9c701575b502243;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index b52d352..afaebef 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -27,10 +27,11 @@ title_done = False
 import cgi, sys, os, re, errno, stat
 
 # FIXME: we accept stuff like foo/../bar and we shouldn't
-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$")
+file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)")
+video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
+img_re = re.compile(r".*\.(png|gif|jpg|jpeg|bmp|ico|" +  video_ext + ")", re.IGNORECASE)
+video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE)
+url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S")
 ext_re = re.compile(r"\.([^\./]+)$")
 
 # CGI stuff ---------------------------------------------------------
@@ -79,7 +80,7 @@ def permalink(s):
     return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
 
 def humanlink(s):
-    return re.search('([^:/\.]+)(?:\.[^/:]+|)$', s).group(1).replace('_', ' ')
+    return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' '))
 
 # Split arg lists like "blah| blah blah| width=100 | align = center",
 # return a list containing anonymous arguments and a map containing the named arguments
@@ -87,10 +88,10 @@ def parse_args(s):
     args = []
     kwargs = {} 
     for arg in s.strip('<[{}]>').split('|'):
-        try:
-            key, val = arg.split('=', 1)
-            kwargs[key.strip()] = val.strip()
-        except ValueError:
+        m = re.match('\s*(\w+)\s*=\s*(.+)\s*', arg)
+        if m is not None:
+            kwargs[m.group(1)] = m.group(2)
+        else:
             args.append(arg.strip())
     return (args, kwargs)
 
@@ -173,7 +174,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
             print(' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>')
 
     if name:
-        print(' | ' + link_tag('?raw=' + name, 'Raw Text', cssclass='navlink'))
+        print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
         if privileged_url is not None:
             if writable:
                 print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True))
@@ -324,7 +325,7 @@ def make_index_key():
     links = ['<a href="#%s">%s</a>' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
     return '<p style="text-align: center">' + ' | '.join(links) + '</p>'
 
-def page_list(dirname = None, re = None):
+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$")
@@ -623,7 +624,7 @@ class Page:
         try:
             os.stat(self._filename())
             return True
-        except OSError as err:
+        except OSError, err:
             if err.errno == errno.ENOENT:
                 return False
             raise err
@@ -631,7 +632,7 @@ class Page:
     def get_raw_body(self, default=None):
         try:
             return open(self._filename(), 'rb').read()
-        except IOError as err:
+        except IOError, err:
             if err.errno == errno.ENOENT:
                 if default is None:
                     default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name)
@@ -669,7 +670,7 @@ class Page:
                         break
                     self._pragmas[m.group(1)] = m.group(2).strip()
                     #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
-            except IOError as err:
+            except IOError, err:
                 if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
                     raise er
         return self._pragmas
@@ -720,7 +721,7 @@ class Page:
         try:
             from time import localtime, strftime
             modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
-        except OSError as err:
+        except OSError, err:
             if err.errno != errno.ENOENT:
                 raise err
             return None
@@ -741,7 +742,7 @@ class Page:
             + ' from ' + cgi.escape(get_hostname(remote_host()))
             + '</b></p>'))
         print('<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name))
-        print('<input type="hidden" name="edit" value="%s">' % (self.page_name))
+        print('<input type="hidden" name="a" value="edit" /><input type="hidden" name="q" value="' + self.page_name + '" />')
         print('<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name))
         print('<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' \
             % cgi.escape(preview or self.get_raw_body(default='')))
@@ -791,7 +792,7 @@ class Page:
             # Bad Bill!  POSIX rename ought to replace. :-(
             try:
                 os.remove(name)
-            except OSError as err:
+            except OSError, err:
                 if err.errno != errno.ENOENT: raise err
         os.rename(tmp_filename, name)