From 31cbdaafd4bf941b234c0e52413b1354f2f29e94 Mon Sep 17 00:00:00 2001
From: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date: Sun, 21 Feb 2010 00:13:34 +0100
Subject: [PATCH] Properly support simple titles in the newest InfoExtractors
---
youtube-dl | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/youtube-dl b/youtube-dl
index fe8a591606..9e15a6c695 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1034,6 +1034,7 @@ class GoogleIE(InfoExtractor):
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
# Google Video doesn't show uploader nicknames?
video_uploader = 'NA'
@@ -1045,7 +1046,7 @@ class GoogleIE(InfoExtractor):
'url': video_url.decode('utf-8'),
'uploader': video_uploader.decode('utf-8'),
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
})
except UnavailableFormatError:
@@ -1111,6 +1112,7 @@ class PhotobucketIE(InfoExtractor):
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
video_uploader = mobj.group(2).decode('utf-8')
@@ -1121,7 +1123,7 @@ class PhotobucketIE(InfoExtractor):
'url': video_url.decode('utf-8'),
'uploader': video_uploader,
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
})
except UnavailableFormatError:
@@ -1199,6 +1201,7 @@ class GenericIE(InfoExtractor):
return
video_title = mobj.group(1).decode('utf-8')
video_title = sanitize_title(video_title)
+ simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
# video uploader is domain name
mobj = re.match(r'(?:https?://)?([^/]*)/.*', url)
@@ -1214,7 +1217,7 @@ class GenericIE(InfoExtractor):
'url': video_url.decode('utf-8'),
'uploader': video_uploader,
'title': video_title,
- 'stitle': video_title,
+ 'stitle': simple_title,
'ext': video_extension.decode('utf-8'),
})
except UnavailableFormatError: