X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=57992d288b93eb1774a2a82ce051dba49cfea5ab;hb=10a9870db7d40c7375470061274902fc9f38f3a6;hp=ec64ca9f42d41eebedeaf7e7f385b77429be360a;hpb=2d4c364b47b01894842b7ae21535ea00cf420722;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index ec64ca9..57992d2 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -__version__ = '$Revision: 1.63+gerry+bernie $'[11:-2]; +__version__ = '$Revision: 1.63+gerry+bernie $'[11:-2] import cgi, sys, string, os, re, errno, time, stat from os import path, environ @@ -43,7 +43,10 @@ def privileged_path(): return privileged_url or script_name() def remote_user(): - return environ.get('REMOTE_USER', 'AnonymousCoward') + user = environ.get('REMOTE_USER', '') + if user is None or user == '' or user == 'anonymous': + user = 'AnonymousCoward' + return user def remote_host(): return environ.get('REMOTE_ADDR', '') @@ -53,7 +56,7 @@ def get_hostname(addr): from socket import gethostbyaddr return gethostbyaddr(addr)[0] + ' (' + addr + ')' except: - return addr; + return addr # Formatting stuff -------------------------------------------------- @@ -62,7 +65,7 @@ def emit_header(type="text/html"): print def send_guru(msg, msg_type): - if msg is None or len(msg) == 0: return + if msg is None or msg == '': return print '
'
     if msg_type == 'error':
         print '    Software Failure.  Press left mouse button to continue.\n'
@@ -104,7 +107,7 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
 
 """
     print "%s: %s" % (site_name, text)
-    print ' '
+    print ' '
     if not name:
         print ' '
     if css_url:
@@ -117,10 +120,11 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
     else:
         print ''
 
+    title_done = True
     send_guru(msg, msg_type)
 
     # Navbar
-    print '
'
+    print '
'
     print '  ' + site_name + ': ',
     if name:
         print link_tag('?fullsearch=' + name, text) + ' '
@@ -128,10 +132,10 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
         print text + ' '
     print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
     print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
-    print ' | Recent Changes'
+    print ' | Recent Changes'
 
     if name:
-        print ' | Page History'
+        print ' | Page History'
         print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
         if privileged_url is not None:
             print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', authentication=True)
@@ -140,11 +144,9 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
 
     user = remote_user()
     if user != 'AnonymousCoward':
-        print ' | logged in as ' + cgi.escape(user) + ''
-
-    print '
'
+        print ' | '
 
-    title_done = True
+    print '
'
 
 def link_tag(params, text=None, ss_class=None, authentication=False):
     if text is None:
@@ -253,9 +255,10 @@ def send_footer(name, mod_string=None):
         cgi.print_arguments()
         cgi.print_form(cgi.FieldStorage())
         cgi.print_environ()
-    print '
'
+    print ''
 
 
@@ -335,14 +338,16 @@ class PageFormatter:
         self.is_em = self.is_b = 0
         self.h_level = 0
         self.list_indents = []
-        self.in_pre = 0
-        self.in_var = 0
+        self.in_pre = False
+        self.in_table = False
+        self.tr_cnt = 0
+        self.in_var = False
         self.in_header = True
 
     def _emph_repl(self, word):
         if len(word) == 3:
             self.is_b = not self.is_b
-            return ['', ''][self.is_b]
+            return ['', ''][self.is_b]
         else:
             self.is_em = not self.is_em
             return ['', ''][self.is_em]
@@ -354,7 +359,7 @@ class PageFormatter:
         else:
             self.h_level = len(word) - 1
             result = "" % self.h_level
-        return result;
+        return result
 
     def _rule_repl(self, word):
         s = self._undent()
@@ -405,23 +410,50 @@ class PageFormatter:
 
     def _pre_repl(self, word):
         if word == '{{{' and not self.in_pre:
-            self.in_pre = 1
+            self.in_pre = True
             return '
'
         elif self.in_pre:
-            self.in_pre = 0
+            self.in_pre = False
             return '
'
-        else:
-            return ''
+        return ''
+
+    def _hi_repl(self, word):
+        if word == 'FIXME':
+            cl = 'error'
+        elif word == 'DONE':
+            cl = 'success'
+        elif word == 'TODO':
+            cl = 'notice'
+        return '' + word + ''
 
     def _var_repl(self, word):
         if word == '{{' and not self.in_var:
-            self.in_var = 1
+            self.in_var = True
             return ''
         elif self.in_var:
-            self.in_var = 0
+            self.in_var = False
             return ''
-        else:
-            return ''
+        return ''
+
+    def _tr_repl(self, word):
+        out = ''
+        if not self.in_table:
+            self.in_table = True
+            self.tr_cnt = 0
+            out = '
\n'
+        self.tr_cnt += 1
+        return out + ''
+        return ''
+
+    def _td_repl(self, word):
+        if self.in_table:
+            return '^\s*\|\|\s*)"
+            + r"|(?P\s*\|\|\s*$)"
+            + r"|(?P
'
+
+    def _tre_repl(self, word):
+        if self.in_table:
+            return '
'
+        return ''
+
     def _macro_repl(self, word):
         macro_name = word[2:-2]
         # TODO: Somehow get the default value into the search field
@@ -462,29 +494,44 @@ class PageFormatter:
 
         # For each line, we scan through looking for magic
         # strings, outputting verbatim any intervening text
+        # TODO: highlight search words (look at referer)
         scan_re = re.compile(
             r"(?:"
+            # Formatting
             + r"(?P'{2,3})"
             + r"|(?P\={2,6})"
+            + r"|(?P^-{3,})"
             + r"|(?P[<>&])"
+            + r"|(?P\b(FIXME|TODO|DONE)\b)"
+
+            # Links
             + r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
             + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)"
-            + r"|(?P^-{3,})"
             + r"|(?P\[\[\S+\s+.+\]\])"
             + r"|(?P(http|ftp|nntp|news|mailto)\:[^\s'\"]+\S)"
             + r"|(?P[-\w._+]+\@[\w.-]+)"
+
+            # Lists, divs, spans
             + r"|(?P
  • ^\s+\*)"
             + r"|(?P
    (\{\{\{|\s*\}\}\}))"
             + r"|(?P(\{\{|\}\}))"
+
+            # Tables
+            + r"|(?P
    • \s*\|\|\s*)"
+
+            # Macros
             + r"|(?P\[\[(TitleSearch|FullSearch|WordIndex|TitleIndex)\]\])"
             + r")")
         pre_re = re.compile(
             r"(?:"
             + r"(?P
    \s*\}\}\})"
             + r")")
-        blank_re = re.compile("^\s*$")
-        indent_re = re.compile("^\s*")
-        eol_re = re.compile(r'\r?\n')
+        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):
             # Skip ACLs
@@ -492,17 +539,23 @@ class PageFormatter:
                 if line.startswith('#'):
                    continue
                 self.in_header = False
+
             if self.in_pre:
                 print re.sub(pre_re, self.replace, line)
             else:
-                # XXX: Should we check these conditions in this order?
+                if self.in_table and not tr_re.match(line):
+                    self.in_table = False
+                    print '
    '
+
                 if blank_re.match(line):
                     print '
    '
-                    continue
-                indent = indent_re.match(line)
-                print self._indent_to(len(indent.group(0)))
-                print re.sub(scan_re, self.replace, line)
+                else:
+                    indent = indent_re.match(line)
+                    print self._indent_to(len(indent.group(0)))
+                    print re.sub(scan_re, self.replace, line)
+
         if self.in_pre: print '
    ' + if self.in_table: print '

    ' print self._undent() print "

    " @@ -685,6 +738,7 @@ try: 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?