X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fplayed.py;h=2856af96f49cf7928a0dd4fe79ccd287592fb3c1;hb=5c2266df4b9aeb7881ed8c026a038e2a25e43734;hp=a396e62e50d64c977b96d796da6d22f006f0316f;hpb=5aa38e75b27b428b67f9f7083c44051881c98fd8;p=youtube-dl

diff --git a/youtube_dl/extractor/played.py b/youtube_dl/extractor/played.py
index a396e62e5..2856af96f 100644
--- a/youtube_dl/extractor/played.py
+++ b/youtube_dl/extractor/played.py
@@ -2,19 +2,19 @@
 from __future__ import unicode_literals
 
 import re
-import time
 import os.path
 
 from .common import InfoExtractor
+from ..compat import compat_urllib_parse
 from ..utils import (
-    compat_urllib_parse,
-    compat_urllib_request,
+    ExtractorError,
+    sanitized_Request,
 )
 
 
 class PlayedIE(InfoExtractor):
     IE_NAME = 'played.to'
-    _VALID_URL = r'https?://played\.to/(?P<id>[a-zA-Z0-9_-]+)'
+    _VALID_URL = r'https?://(?:www\.)?played\.to/(?P<id>[a-zA-Z0-9_-]+)'
 
     _TEST = {
         'url': 'http://played.to/j2f2sfiiukgt',
@@ -24,24 +24,27 @@ class PlayedIE(InfoExtractor):
             'ext': 'flv',
             'title': 'youtube-dl_test_video.mp4',
         },
+        'skip': 'Removed for copyright infringement.',  # oh wow
     }
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
+        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)
 
-        self.to_screen('%s: Waiting for timeout' % video_id)
-        time.sleep(2)
+        m_error = re.search(
+            r'(?s)Reason for deletion:.*?<b class="err"[^>]*>(?P<msg>[^<]+)</b>', orig_webpage)
+        if m_error:
+            raise ExtractorError(m_error.group('msg'), expected=True)
+
+        data = self._hidden_inputs(orig_webpage)
+
+        self._sleep(2, video_id)
 
         post = compat_urllib_parse.urlencode(data)
         headers = {
             b'Content-Type': b'application/x-www-form-urlencoded',
         }
-        req = compat_urllib_request.Request(url, post, headers)
+        req = sanitized_Request(url, post, headers)
         webpage = self._download_webpage(
             req, video_id, note='Downloading video page ...')
 
@@ -54,4 +57,4 @@ class PlayedIE(InfoExtractor):
             'id': video_id,
             'title': title,
             'url': video_url,
-        }
\ No newline at end of file
+        }