]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[daum] Fix extraction (Closes #7949)
authorSergey M․ <dstftw@gmail.com>
Tue, 22 Dec 2015 20:54:32 +0000 (02:54 +0600)
committerSergey M․ <dstftw@gmail.com>
Tue, 22 Dec 2015 20:54:32 +0000 (02:54 +0600)
youtube_dl/extractor/daum.py

index 934da765ee700712721281a85dd955c28405001e..e3fc639b079fa12068084d17ba0a6c3dc56b8039 100644 (file)
@@ -37,9 +37,11 @@ class DaumIE(InfoExtractor):
         video_id = mobj.group('id')
         canonical_url = 'http://tvpot.daum.net/v/%s' % video_id
         webpage = self._download_webpage(canonical_url, video_id)
+        og_url = self._og_search_url(webpage, default=None) or self._search_regex(
+            r'<link[^>]+rel=(["\'])canonical\1[^>]+href=(["\'])(?P<url>.+?)\2',
+            webpage, 'canonical url', group='url')
         full_id = self._search_regex(
-            r'src=["\']http://videofarm\.daum\.net/controller/video/viewer/Video\.html\?.*?vid=(.+?)[&"\']',
-            webpage, 'full id')
+            r'tvpot\.daum\.net/v/([^/]+)', og_url, 'full id')
         query = compat_urllib_parse.urlencode({'vid': full_id})
         info = self._download_xml(
             'http://tvpot.daum.net/clip/ClipInfoXml.do?' + query, video_id,