X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=8de46ab91cbf4d2b14e4ce25753a0848545c311c;hb=fbc4d6639e75dd726fdcadc1129ae0900468e9d2;hp=d7e1a5a9e0d28a466e8f40b5704df5d4ea77148f;hpb=ff74de7a49cc2bfa936503a4b37fc5c8a650a5fc;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index d7e1a5a..8de46ab 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -31,7 +31,7 @@ from os import path, environ word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") # 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)$", re.IGNORECASE) +img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico)$", re.IGNORECASE) url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$") link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})") @@ -110,7 +110,7 @@ def send_guru(msg_text, msg_type): } """ -def send_title(name, text="Limbo", msg_text=None, msg_type='error'): +def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): global title_done if title_done: return @@ -125,12 +125,23 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'): print ' ' if not name: print ' ' - for css in css_url: - print ' ' % relative_url(css) + + for link in link_urls: + rel, href = link + print ' ' % (rel, relative_url(href)) + + if name and writable and privileged_url is not None: + print ' ' \ + % (privileged_path() + '?edit=' + name) + + if history_url is not None: + print ' ' \ + % relative_url(history_url + '?a=rss') + print '' # Body - if name and privileged_url is not None: + if name and writable and privileged_url is not None: print '' else: print '' @@ -144,17 +155,21 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'): print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' else: print ' ' + text + ' ' - print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink') + print ' | ' + link_tag('FrontPage', 'Home', 'navlink') print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') if 'history_url' in globals(): - print ' | Recent Changes' + print ' | Recent Changes' if name: - print ' | Page History' + print ' | Page History' if name: print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') if privileged_url is not None: - print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True) + if writable: + print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True) + else: + print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True) + else: print ' | Immutable Page' @@ -345,12 +360,11 @@ class WikiFormatter: def _hurl_repl(self, word): m = link_re.match(word) name = m.group(1) - if m.group(2) is None: + descr = m.group(2) + if descr is None: descr = name elif img_re.match(m.group(2)): descr = '

' - else: - descr = m.group(2) return link_tag(name, descr, 'wikilink') @@ -484,16 +498,16 @@ class WikiFormatter: + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" + r"|(?P[<>&])" - # Auto links - + r"|(?P\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY - + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY - + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY - + r"|(?P[-\w._+]+\@[\w.-]+)" # LEGACY + # Auto links (LEGACY) + + r"|(?P\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico))" + + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" + + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" + + r"|(?P[-\w._+]+\@[\w.-]+)" # Lists, divs, spans + r"|(?P

^\s+[\*#] +)" + r"|(?P

\{\{\{|\s*\}\}\})"
-            + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO
+            + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
 
             # Tables
             + r"|(?P^\s*\|\|(=|)\s*)"
@@ -607,7 +621,7 @@ class Page:
                 self.attrs[m.group(1)] = m.group(2).strip()
                 #print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "
\n"
         except IOError, er:
-            if er.errno != errno.ENOENT:
+            if er.errno != errno.ENOENT and er.errno != errno.EISDIR:
                 raise er
         return self.attrs
 
@@ -642,17 +656,16 @@ class Page:
             send_guru("Read access denied by ACLs", "notice")
 
     def format(self):
-        page_name = None
-        if self.can_write():
-            page_name = self.page_name
-
-        #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)
+        #css foo.css
+        value = self.get_attr("css", None)
+        if value:
+            global link_urls
+            link_urls += { "stylesheet": value }
+
+        send_title(self.page_name, self.split_title(),
+            msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write())
         self.send_naked()
-        send_footer(page_name, self._last_modified())
+        send_footer(self.page_name, self._last_modified())
 
     def _last_modified(self):
         try: