Separate images from subdirs in directory listing

[geekigeeki.git] / geekigeeki.py

diff --git a/geekigeeki.py b/geekigeeki.py
index b8e4a7b31e5735cbc15f0e850dcf228f98274e0d..a5ba6a2d388565ae9ac3f5dff29ca48f8126fb50 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -120,7 +120,7 @@ def send_guru(msg_text, msg_type):
     print(cgi.escape(msg_text))
     if msg_type == 'error':
         print '\n           Guru Meditation #DEADBEEF.ABADC0DE'
-    print('</pre><script language="JavaScript" type="text/javascript" src="%s" defer="defer"></script>' \
+    print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
         % relative_url('sys/GuruMeditation.js'))
 
 def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
@@ -385,7 +385,6 @@ class WikiFormatter:
             ",,":  ["sub", False],
             "''":  ["em",  False], # LEGACY
             "'''": ["b",   False], # LEGACY
-            "``":  ["tt",  False], # LEGACY
         }
 
     def _b_repl(self, word):
@@ -549,7 +548,7 @@ class WikiFormatter:
 
         scan_re = re.compile(r"""(?:
             # Styles and formatting ("--" must cling to a word to disambiguate it from the dash)
-              (?P<b>     \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` )
+              (?P<b>     \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' )
             | (?P<tit>   \={2,6})
             | (?P<br>    \\\\)
             | (?P<rule>  ^-{3,})
@@ -611,8 +610,8 @@ class WikiFormatter:
                     print('</p><p>')
                 else:
                     indent = indent_re.match(self.line)
-                    #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
                     print(self._indent_to(len(indent.group(1)), indent.group(2)))
+                    # Stand back! Here we apply the monster regex that does all the parsing
                     print(re.sub(scan_re, self.replace, self.line))
 
         if self.in_pre: print('</pre>')
@@ -622,7 +621,7 @@ class WikiFormatter:
 
 class Page:
     def __init__(self, page_name):
-        self.page_name = page_name
+        self.page_name = page_name.rstrip('/');
         self.msg_text = ''
         self.msg_type = 'error'
 
@@ -665,19 +664,20 @@ class Page:
         out = '== '
         pathname = ''
         for dirname in self.page_name.strip('/').split('/'):
-            pathname = (pathname + '/' + dirname) if pathname else dirname
+            pathname = (pathname and pathname + '/' ) + dirname
             out += '[[' + pathname + '|' + dirname + ']]/'
         out += ' ==\n'
+        images_out = '\n'
  
         for filename in page_list(self._filename(), file_re):
             if image_re.match(filename):
                 maxwidth = config_get('image_maxwidth', '400')
                 if maxwidth:
                     maxwidth = ' | maxwidth=' + str(maxwidth)
-                out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
+                images_out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
             else:
                 out += ' * [[' + self.page_name + '/' + filename + ']]\n'
-        return out
+        return out + images_out
 
     def pragmas(self):
         if not '_pragmas' in self.__dict__: