X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fplayed.py;h=45716c75d9505c5fcb7e8c6d73ec4feaef298aee;hb=ecd1936695e73ba850d0618828b4a40d7d16c091;hp=db40da43bd077749411ebe7926b2ffcbf90cafb3;hpb=38c4d41b744660463abbb333737e031d9c87243e;p=youtube-dl diff --git a/youtube_dl/extractor/played.py b/youtube_dl/extractor/played.py index db40da43b..45716c75d 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,12 +26,18 @@ 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) + + m_error = re.search( + r'(?s)Reason for deletion:.*?]*>(?P[^<]+)', orig_webpage) + if m_error: + raise ExtractorError(m_error.group('msg'), expected=True) + fields = re.findall( r'type="hidden" name="([^"]+)"\s+value="([^"]+)">', orig_webpage) data = dict(fields)