X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube-dl;h=f57343ea80f17cfa7523f4be91a5fc5f57c02278;hb=583c714fdebdc8d0c3234aba2343803057d99e38;hp=5efc55e6dd498f49b7b4638a243ae55255b870b9;hpb=f94b636c3ec6410570e5d384e66d651a89de6abe;p=youtube-dl.git

diff --git a/youtube-dl b/youtube-dl
index 5efc55e6d..f57343ea8 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -309,7 +309,7 @@ class FileDownloader(object):
 		# Do nothing else if in simulate mode
 		if self.params.get('simulate', False):
 			try:
-				info_dict['url'] = self.verify_url(info_dict['url'])
+				info_dict['url'] = self.verify_url(info_dict['url'].encode('utf-8')).decode('utf-8')
 			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
 				raise UnavailableFormatError
 
@@ -327,7 +327,7 @@ class FileDownloader(object):
 			filename = self.params['outtmpl'] % template_dict
 		except (ValueError, KeyError), err:
 			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
-		if self.params['nooverwrites'] and os.path.exists(filename):
+		if self.params.get('nooverwrites', False) and os.path.exists(filename):
 			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
 			return
 
@@ -338,7 +338,7 @@ class FileDownloader(object):
 			return
 
 		try:
-			success = self._do_download(filename, info_dict['url'])
+			success = self._do_download(filename, info_dict['url'].encode('utf-8'))
 		except (OSError, IOError), err:
 			raise UnavailableFormatError
 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@@ -402,7 +402,7 @@ class FileDownloader(object):
 			resume_len = os.path.getsize(filename)
 		else:
 			resume_len = 0
-		if self.params['continuedl'] and resume_len != 0:
+		if self.params.get('continuedl', False) and resume_len != 0:
 			self.report_resuming_byte(resume_len)
 			request.add_header('Range','bytes=%d-' % resume_len)
 
@@ -719,7 +719,7 @@ class YoutubeIE(InfoExtractor):
 			video_uploader = urllib.unquote(mobj.group(1))
 
 			# title
-			mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
+			mobj = re.search(r'(?m)&title=([^&]*)(?:&|$)', video_info_webpage)
 			if mobj is None:
 				self._downloader.trouble(u'ERROR: unable to extract video title')
 				return