X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=7bd4b2aaca5f002524ed3dec1a085b8fe76e1f4f;hb=2b06c33d19a961061f822377adb057f411ccb067;hp=b21e63b054bb33641e180e10504395f27f2ddadd;hpb=7031008c98f9dfe0ea592529fe17be88ba9c48d7;p=youtube-dl

diff --git a/youtube-dl b/youtube-dl
index b21e63b05..7bd4b2aac 100755
--- 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
@@ -927,17 +929,18 @@ class YoutubeIE(InfoExtractor):
 				})
 
 				if all_formats:
+					quality_index += 1
 					if quality_index == len(self._available_formats):
 						# None left to get
 						return
 					else:
-						quality_index += 1
 						format_param = self._available_formats[quality_index]
 						continue
 				return
 
 			except UnavailableFormatError, err:
 				if best_quality or all_formats:
+					quality_index += 1
 					if quality_index == len(self._available_formats):
 						# I don't ever expect this to happen
 						if not all_formats:
@@ -945,7 +948,6 @@ class YoutubeIE(InfoExtractor):
 						return
 					else:
 						self.report_unavailable_format(video_id, format_param)
-						quality_index += 1
 						format_param = self._available_formats[quality_index]
 						continue
 				else: 
@@ -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',
 		)
 
@@ -1998,22 +2000,22 @@ if __name__ == '__main__':
 		parser.add_option('-i', '--ignore-errors',
 				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
 		parser.add_option('-r', '--rate-limit',
-				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+				dest='ratelimit', metavar='LIMIT', help='download rate limit (e.g. 50k or 44.6m)')
 		parser.add_option('-R', '--retries',
-				dest='retries', metavar='T', help='number of retries (default is 10)', default=10)
+				dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
 
 		authentication = optparse.OptionGroup(parser, 'Authentication Options')
 		authentication.add_option('-u', '--username',
-				dest='username', metavar='UN', help='account username')
+				dest='username', metavar='USERNAME', help='account username')
 		authentication.add_option('-p', '--password',
-				dest='password', metavar='PW', help='account password')
+				dest='password', metavar='PASSWORD', help='account password')
 		authentication.add_option('-n', '--netrc',
 				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
 		parser.add_option_group(authentication)
 
 		video_format = optparse.OptionGroup(parser, 'Video Format Options')
 		video_format.add_option('-f', '--format',
-				action='store', dest='format', metavar='FMT', help='video format code')
+				action='store', dest='format', metavar='FORMAT', help='video format code')
 		video_format.add_option('-b', '--best-quality',
 				action='store_const', dest='format', help='download the best quality video possible', const='0')
 		video_format.add_option('-m', '--mobile-version',
@@ -2047,9 +2049,9 @@ if __name__ == '__main__':
 		filesystem.add_option('-l', '--literal',
 				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
 		filesystem.add_option('-o', '--output',
-				dest='outtmpl', metavar='TPL', help='output filename template')
+				dest='outtmpl', metavar='TEMPLATE', help='output filename template')
 		filesystem.add_option('-a', '--batch-file',
-				dest='batchfile', metavar='F', help='file containing URLs to download (\'-\' for stdin)')
+				dest='batchfile', metavar='FILE', help='file containing URLs to download (\'-\' for stdin)')
 		filesystem.add_option('-w', '--no-overwrites',
 				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
 		filesystem.add_option('-c', '--continue',