[daum.net] Fixes #8331
This commit is contained in:
		@@ -2,6 +2,8 @@
 | 
			
		||||
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
import re
 | 
			
		||||
 | 
			
		||||
from .common import InfoExtractor
 | 
			
		||||
from ..compat import compat_urllib_parse
 | 
			
		||||
from ..utils import (
 | 
			
		||||
@@ -28,6 +30,15 @@ class DaumIE(InfoExtractor):
 | 
			
		||||
            'comment_count': int,
 | 
			
		||||
        },
 | 
			
		||||
    }, {
 | 
			
		||||
        'url': 'http://m.tvpot.daum.net/v/65139429',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': '65139429',
 | 
			
		||||
            'ext': 'mp4',
 | 
			
		||||
            'title': 'md5:a100d65d09cec246d8aa9bde7de45aed',
 | 
			
		||||
            'description': 'md5:79794514261164ff27e36a21ad229fc5',
 | 
			
		||||
            'upload_date': '20150604',
 | 
			
		||||
            'duration': 154
 | 
			
		||||
        },    }, {
 | 
			
		||||
        'url': 'http://tvpot.daum.net/v/07dXWRka62Y%24',
 | 
			
		||||
        'only_matching': True,
 | 
			
		||||
    }]
 | 
			
		||||
@@ -42,6 +53,10 @@ class DaumIE(InfoExtractor):
 | 
			
		||||
            'http://videofarm.daum.net/controller/api/closed/v1_2/IntegratedMovieData.json?' + query,
 | 
			
		||||
            video_id, 'Downloading video formats info')
 | 
			
		||||
 | 
			
		||||
        # For urls like http://m.tvpot.daum.net/v/65139429, where the video_id is really a clipid
 | 
			
		||||
        if not movie_data.get('output_list', {}).get('output_list') and re.match(r'^\d+$', video_id):
 | 
			
		||||
            return self.url_result('http://tvpot.daum.net/clip/ClipView.do?clipid=%s' % video_id)
 | 
			
		||||
 | 
			
		||||
        formats = []
 | 
			
		||||
        for format_el in movie_data['output_list']['output_list']:
 | 
			
		||||
            profile = format_el['profile']
 | 
			
		||||
@@ -76,7 +91,7 @@ class DaumIE(InfoExtractor):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DaumClipIE(InfoExtractor):
 | 
			
		||||
    _VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/(?:clip/ClipView.do|mypot/View.do)\?.*?clipid=(?P<id>\d+)'
 | 
			
		||||
    _VALID_URL = r'https?://(?:m\.)?tvpot\.daum\.net/(?:clip/ClipView.(?:do|tv)|mypot/View.do)\?.*?clipid=(?P<id>\d+)'
 | 
			
		||||
    IE_NAME = 'daum.net:clip'
 | 
			
		||||
 | 
			
		||||
    _TESTS = [{
 | 
			
		||||
@@ -90,6 +105,9 @@ class DaumClipIE(InfoExtractor):
 | 
			
		||||
            'duration': 3868,
 | 
			
		||||
            'view_count': int,
 | 
			
		||||
        },
 | 
			
		||||
    }, {
 | 
			
		||||
        'url': 'http://m.tvpot.daum.net/clip/ClipView.tv?clipid=54999425',
 | 
			
		||||
        'only_matching': True,
 | 
			
		||||
    }]
 | 
			
		||||
 | 
			
		||||
    def _real_extract(self, url):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user