X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fplayed.py;h=8a1c296dda8b57611a0e464387be43ab0fc9a370;hb=dac4d5be12693693313c60ca71e4eeb7d88a2806;hp=db40da43bd077749411ebe7926b2ffcbf90cafb3;hpb=38c4d41b744660463abbb333737e031d9c87243e;p=youtube-dl.git diff --git a/youtube_dl/extractor/played.py b/youtube_dl/extractor/played.py index db40da43b..8a1c296dd 100644 --- a/youtube_dl/extractor/played.py +++ b/youtube_dl/extractor/played.py @@ -2,14 +2,16 @@ from __future__ import unicode_literals import re -import time import os.path from .common import InfoExtractor -from ..utils import ( +from ..compat import ( compat_urllib_parse, compat_urllib_request, ) +from ..utils import ( + ExtractorError, +) class PlayedIE(InfoExtractor): @@ -24,15 +26,19 @@ class PlayedIE(InfoExtractor): 'ext': 'flv', 'title': 'youtube-dl_test_video.mp4', }, + 'skip': 'Removed for copyright infringement.', # oh wow } def _real_extract(self, url): video_id = self._match_id(url) - orig_webpage = self._download_webpage(url, video_id) - fields = re.findall( - r'type="hidden" name="([^"]+)"\s+value="([^"]+)">', orig_webpage) - data = dict(fields) + + m_error = re.search( + r'(?s)Reason for deletion:.*?]*>(?P[^<]+)', orig_webpage) + if m_error: + raise ExtractorError(m_error.group('msg'), expected=True) + + data = self._hidden_inputs(orig_webpage) self._sleep(2, video_id)