projects
/
geekigeeki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c40ff6
)
Anchor all file extension regexes to end of string
author
Bernie Innocenti
<bernie@codewiz.org>
Thu, 19 Nov 2009 19:53:55 +0000
(14:53 -0500)
committer
Bernie Innocenti
<bernie@codewiz.org>
Thu, 19 Nov 2009 19:53:55 +0000
(14:53 -0500)
geekigeeki.py
patch
|
blob
|
history
diff --git
a/geekigeeki.py
b/geekigeeki.py
index b6e802c8277f9e67be9e118c0a3eaef9cdc25fc7..e7d7f7d69e63c915c3c3526b5acdcf1307f20733 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-22,11
+22,11
@@
import cgi, sys, os, re, errno, stat, glob
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_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)
+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
# FIXME: we accept stuff like foo/../bar and we shouldn't
-file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)")
-url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S")
+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 ---------------------------------------------------------
ext_re = re.compile(r"\.([^\./]+)$")
# CGI stuff ---------------------------------------------------------