X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fyam.py;h=9d851bae3b779d8ce434742d6f5ef70d3f423936;hb=2fece970b80022574a6b54c936820897cfd10d70;hp=19ad74d04f32f0a9819af61b01254e4af8a849a5;hpb=602814adab97d605d1fe84d6439c33325dba15c7;p=youtube-dl diff --git a/youtube_dl/extractor/yam.py b/youtube_dl/extractor/yam.py index 19ad74d04..9d851bae3 100644 --- a/youtube_dl/extractor/yam.py +++ b/youtube_dl/extractor/yam.py @@ -9,6 +9,7 @@ from ..utils import ( float_or_none, month_by_abbreviation, ExtractorError, + get_element_by_attribute, ) @@ -23,6 +24,7 @@ class YamIE(InfoExtractor): 'id': '2283921', 'ext': 'mp3', 'title': 'ç¼ç¾ - è¶è 京è¯ç é²ä¸»é¡æ²', + 'description': 'ç¼ç¾ - è¶è 京è¯ç é²ä¸»é¡æ²', 'uploader_id': 'princekt', 'upload_date': '20080807', 'duration': 313.0, @@ -39,7 +41,8 @@ class YamIE(InfoExtractor): 'description': 'md5:11e2e405311633ace874f2e6226c8b17', 'uploader_id': '2323agoy', 'title': '20090412é½æå±±äºååª-1', - } + }, + 'skip': 'Video does not exist', }, { 'url': 'http://mymedia.yam.com/m/3598173', 'info_dict': { @@ -54,6 +57,17 @@ class YamIE(InfoExtractor): 'ext': 'mp4', }, 'skip': 'invalid YouTube URL', + }, { + 'url': 'http://mymedia.yam.com/m/2373534', + 'md5': '7ff74b91b7a817269d83796f8c5890b1', + 'info_dict': { + 'id': '2373534', + 'ext': 'mp3', + 'title': 'æä¿å&è¡åå¦-å°é 窩', + 'description': 'md5:904003395a0fcce6cfb25028ff468420', + 'upload_date': '20080928', + 'uploader_id': 'onliner2', + } }] def _real_extract(self, url): @@ -74,15 +88,19 @@ class YamIE(InfoExtractor): if youtube_url: return self.url_result(youtube_url, 'Youtube') + title = self._html_search_regex( + r'