[aparat] Fix extraction
This commit is contained in:
		@@ -2,6 +2,7 @@ version <unreleased>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
Extractors
 | 
					Extractors
 | 
				
			||||||
* [kuwo:singer] Fix extraction
 | 
					* [kuwo:singer] Fix extraction
 | 
				
			||||||
 | 
					* [aparat] Fix extraction
 | 
				
			||||||
 | 
					
 | 
				
			||||||
version 2016.08.07
 | 
					version 2016.08.07
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,8 +1,6 @@
 | 
				
			|||||||
# coding: utf-8
 | 
					# coding: utf-8
 | 
				
			||||||
from __future__ import unicode_literals
 | 
					from __future__ import unicode_literals
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import re
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
from .common import InfoExtractor
 | 
					from .common import InfoExtractor
 | 
				
			||||||
from ..utils import (
 | 
					from ..utils import (
 | 
				
			||||||
    ExtractorError,
 | 
					    ExtractorError,
 | 
				
			||||||
@@ -15,7 +13,7 @@ class AparatIE(InfoExtractor):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    _TEST = {
 | 
					    _TEST = {
 | 
				
			||||||
        'url': 'http://www.aparat.com/v/wP8On',
 | 
					        'url': 'http://www.aparat.com/v/wP8On',
 | 
				
			||||||
        'md5': '6714e0af7e0d875c5a39c4dc4ab46ad1',
 | 
					        'md5': '131aca2e14fe7c4dcb3c4877ba300c89',
 | 
				
			||||||
        'info_dict': {
 | 
					        'info_dict': {
 | 
				
			||||||
            'id': 'wP8On',
 | 
					            'id': 'wP8On',
 | 
				
			||||||
            'ext': 'mp4',
 | 
					            'ext': 'mp4',
 | 
				
			||||||
@@ -31,13 +29,13 @@ class AparatIE(InfoExtractor):
 | 
				
			|||||||
        # Note: There is an easier-to-parse configuration at
 | 
					        # Note: There is an easier-to-parse configuration at
 | 
				
			||||||
        # http://www.aparat.com/video/video/config/videohash/%video_id
 | 
					        # http://www.aparat.com/video/video/config/videohash/%video_id
 | 
				
			||||||
        # but the URL in there does not work
 | 
					        # but the URL in there does not work
 | 
				
			||||||
        embed_url = ('http://www.aparat.com/video/video/embed/videohash/' +
 | 
					        embed_url = 'http://www.aparat.com/video/video/embed/vt/frame/showvideo/yes/videohash/' + video_id
 | 
				
			||||||
                     video_id + '/vt/frame')
 | 
					 | 
				
			||||||
        webpage = self._download_webpage(embed_url, video_id)
 | 
					        webpage = self._download_webpage(embed_url, video_id)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        video_urls = [video_url.replace('\\/', '/') for video_url in re.findall(
 | 
					        file_list = self._parse_json(self._search_regex(
 | 
				
			||||||
            r'(?:fileList\[[0-9]+\]\s*=|"file"\s*:)\s*"([^"]+)"', webpage)]
 | 
					            r'fileList\s*=\s*JSON\.parse\(\'([^\']+)\'\)', webpage, 'file list'), video_id)
 | 
				
			||||||
        for i, video_url in enumerate(video_urls):
 | 
					        for i, item in enumerate(file_list[0]):
 | 
				
			||||||
 | 
					            video_url = item['file']
 | 
				
			||||||
            req = HEADRequest(video_url)
 | 
					            req = HEADRequest(video_url)
 | 
				
			||||||
            res = self._request_webpage(
 | 
					            res = self._request_webpage(
 | 
				
			||||||
                req, video_id, note='Testing video URL %d' % i, errnote=False)
 | 
					                req, video_id, note='Testing video URL %d' % i, errnote=False)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user