X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=explode.py;h=60eb198c0a0407cc6a622f73c24249b5777d7035;hb=a61fbacdfcb7a76fe425fada61f49fc85751e47a;hp=3b3585e5be3ccb1c35ff340b2e778fefbad60a5b;hpb=389c23a3b50bf6d50ce832b87a66f624e32d43f8;p=ardour-manual

diff --git a/explode.py b/explode.py
index 3b3585e..60eb198 100755
--- a/explode.py
+++ b/explode.py
@@ -12,6 +12,7 @@ import re
 import shutil
 
 lineCount = 0
+cleanString = re.compile(r'[^a-zA-Z0-9 \._-]+')
 
 
 #
@@ -19,10 +20,14 @@ lineCount = 0
 # replaced with dashes.
 #
 def MakeFilename(s):
-	# Cleans up the file name, removing all non ASCII or .-_ chars
-	fn = re.sub(r'[^.\-_a-zA-Z0-9 ]', '', s)
-	fn = fn.lower()
-	fn = fn.replace(' ', '-')
+	global cleanString
+	# Clean up the file name, removing all non letter/number or " .-_" chars.
+	# Also, convert to lower case and replace all spaces with dashes.
+	fn = cleanString.sub('', s).lower().replace(' ', '-')
+	# Double dashes can creep in from the above replacement, so we check for
+	# that here.
+	fn = fn.replace('--', '-')
+
 	return fn