X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=d3ce2203bdb6ef379d4fdcec2ebf6e83494e5a0c;hb=8a6eee8a2bd33f522824afba25feac7c3ac74db3;hp=678754e3a9633d29fc779eeed48eeddb8fa9fa87;hpb=8d7f457924b6c4bde8486d1fd413516082ceedf9;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 678754e..d3ce220 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -__version__ = '$Id$'[4:12] +__version__ = '4.0-' + '$Id$'[4:11] from time import clock start_time = clock() @@ -26,12 +26,14 @@ title_done = False import cgi, sys, os, re, errno, stat +image_ext = 'png|gif|jpg|jpeg|bmp|ico' +video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt +image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")", re.IGNORECASE) +video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE) # 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$") -ext_re = re.compile(r"\.([^\./]+)$") +file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)") +url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S") +ext_re = re.compile(r"\.([^\./]+)$") # CGI stuff --------------------------------------------------------- def script_name(): @@ -79,7 +81,7 @@ def permalink(s): return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip()) def humanlink(s): - return re.sub(r'([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.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 @@ -197,7 +199,7 @@ def send_httperror(status="403 Not Found", query=""): def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: text = humanlink(dest) - elif img_re.match(text): + elif image_re.match(text): text = '' + text + '' link_class = kvargs.get('class', kvargs.get('cssclass', None)) @@ -222,7 +224,7 @@ def link_inline(name, descr=None, kvargs={}): url = relative_url(name) if video_re.match(name): return '' % url - elif img_re.match(name): + elif image_re.match(name): return '%s' % (url, url + url_args(kvargs), descr) elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page return Page(name).send_naked() @@ -324,7 +326,7 @@ def make_index_key(): links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '

' + ' | '.join(links) + '

' -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$") @@ -549,7 +551,7 @@ class WikiFormatter: | (?P [<>&] ) # Auto links (LEGACY) - | (?P \b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)) + | (?P \b[a-zA-Z0-9_/-]+\.(""" + image_ext + "|" + video_ext + r""")) | (?P \b(?:[A-Z][a-z]+){2,}\b) | (?P (http|https|ftp|mailto)\:[^\s'\"]+\S) | (?P [-\w._+]+\@[\w.-]+) @@ -623,7 +625,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,10 +633,10 @@ 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) + default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name) return default if err.errno == errno.EISDIR: return self.format_dir() @@ -649,7 +651,7 @@ class Page: out += ' ==\n' for filename in page_list(self._filename(), file_re): - if img_re.match(filename): + if image_re.match(filename): if image_maxwidth: maxwidth_arg = ' | maxwidth=' + str(image_maxwidth) out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\n' @@ -669,7 +671,7 @@ class Page: break self._pragmas[m.group(1)] = m.group(2).strip() #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\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 +722,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 +743,7 @@ class Page: + ' from ' + cgi.escape(get_hostname(remote_host())) + '

')) print('
' % relative_url(self.page_name)) - print('' % (self.page_name)) + print('') print('
' % (self.page_name)) print('' \ % cgi.escape(preview or self.get_raw_body(default=''))) @@ -791,8 +793,9 @@ 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.makedirs(os.path.split(name)[0]) os.rename(tmp_filename, name) def save(self, newdata, changelog):