Forbid forward slash in win32 file names (fixes issue #147)

[youtube-dl.git] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 514f71aa643883a333694b561adae42118162db2..ea4b3fded85fb0529d38e75e2ef500da20b28b15 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -99,7 +99,7 @@ def sanitize_open(filename, open_mode):
                return (stream, filename)
        except (IOError, OSError), err:
                # In case of error, try to remove win32 forbidden chars
-               filename = re.sub(ur'[<>:"\|\?\*]', u'#', filename)
+               filename = re.sub(ur'[/<>:"\|\?\*]', u'#', filename)
 
                # An exception here should be caught in the caller
                stream = open(filename, open_mode)
@@ -691,6 +691,8 @@ class YoutubeIE(InfoExtractor):
                '18': 'mp4',
                '22': 'mp4',
                '37': 'mp4',
+               '43': 'webm',
+               '45': 'webm',
        }
 
        @staticmethod
@@ -1985,7 +1987,7 @@ if __name__ == '__main__':
                # Parse command line
                parser = optparse.OptionParser(
                        usage='Usage: %prog [options] url...',
-                       version='2010.04.04',
+                       version='2010.06.06',
                        conflict_handler='resolve',
                )