X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fyam.py;h=9d851bae3b779d8ce434742d6f5ef70d3f423936;hb=3f19b9b7c111ef0f12b880d8676a346280cc3ef4;hp=511c8b67c0cfb3b32e05156b83fc2f30dad08064;hpb=7105440cecf82aff295df4f32575f6c8b64b3c2d;p=youtube-dl
diff --git a/youtube_dl/extractor/yam.py b/youtube_dl/extractor/yam.py
index 511c8b67c..9d851bae3 100644
--- a/youtube_dl/extractor/yam.py
+++ b/youtube_dl/extractor/yam.py
@@ -1,10 +1,16 @@
# coding: utf-8
from __future__ import unicode_literals
+import re
+
from .common import InfoExtractor
from ..compat import compat_urlparse
-from ..utils import month_by_abbreviation
-import re
+from ..utils import (
+ float_or_none,
+ month_by_abbreviation,
+ ExtractorError,
+ get_element_by_attribute,
+)
class YamIE(InfoExtractor):
@@ -18,28 +24,62 @@ class YamIE(InfoExtractor):
'id': '2283921',
'ext': 'mp3',
'title': 'ç¼ç¾ - è¶è 京è¯ç
é²ä¸»é¡æ²',
+ 'description': 'ç¼ç¾ - è¶è 京è¯ç
é²ä¸»é¡æ²',
'uploader_id': 'princekt',
'upload_date': '20080807',
'duration': 313.0,
}
}, {
# An external video hosted on YouTube
- 'url': 'http://mymedia.yam.com/m/3598173',
- 'md5': '0238ceec479c654e8c2f1223755bf3e9',
+ 'url': 'http://mymedia.yam.com/m/3599430',
+ 'md5': '03127cf10d8f35d120a9e8e52e3b17c6',
'info_dict': {
- 'id': 'pJ2Deys283c',
+ 'id': 'CNpEoQlrIgA',
'ext': 'mp4',
- 'upload_date': '20150202',
+ 'upload_date': '20150306',
'uploader': 'æ°è社大ç伽社',
- 'description': 'md5:f5cc72f0baf259a70fb731654b0d2eff',
+ 'description': 'md5:11e2e405311633ace874f2e6226c8b17',
'uploader_id': '2323agoy',
- 'title': 'å¤å©çæ¾æ¹ç£KTV-æ½å®é¦',
+ 'title': '20090412é½æå±±äºååª-1',
+ },
+ 'skip': 'Video does not exist',
+ }, {
+ 'url': 'http://mymedia.yam.com/m/3598173',
+ 'info_dict': {
+ 'id': '3598173',
+ 'ext': 'mp4',
+ },
+ 'skip': 'cause Yam system error',
+ }, {
+ 'url': 'http://mymedia.yam.com/m/3599437',
+ 'info_dict': {
+ 'id': '3599437',
+ '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):
- media_id = self._match_id(url)
- page = self._download_webpage(url, media_id)
+ video_id = self._match_id(url)
+ page = self._download_webpage(url, video_id)
+
+ # Check for errors
+ system_msg = self._html_search_regex(
+ r'系統è¨æ¯(?:
|\n|\r)*([^<>]+)
', page, 'system message',
+ default=None)
+ if system_msg:
+ raise ExtractorError(system_msg, expected=True)
# Is it hosted externally on YouTube?
youtube_url = self._html_search_regex(
@@ -48,23 +88,35 @@ class YamIE(InfoExtractor):
if youtube_url:
return self.url_result(youtube_url, 'Youtube')
+ title = self._html_search_regex(
+ r'