X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fplayed.py;h=645a1e06dc8f3678b30d4e41b38ea13396c7a3e0;hb=3ae165aa10e6747173adbcce8da0e2c8d30eed33;hp=a396e62e50d64c977b96d796da6d22f006f0316f;hpb=f0b8e3607db6bc2e7cdfcf3175e85d9bccb22229;p=youtube-dl

diff --git a/youtube_dl/extractor/played.py b/youtube_dl/extractor/played.py
index a396e62e5..645a1e06d 100644
--- a/youtube_dl/extractor/played.py
+++ b/youtube_dl/extractor/played.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 import re
-import time
 import os.path
 
 from .common import InfoExtractor
@@ -14,7 +13,7 @@ from ..utils import (
 
 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',
@@ -27,15 +26,14 @@ class PlayedIE(InfoExtractor):
     }
 
     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)
+        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)
+        self._sleep(2, video_id)
 
         post = compat_urllib_parse.urlencode(data)
         headers = {
@@ -54,4 +52,4 @@ class PlayedIE(InfoExtractor):
             'id': video_id,
             'title': title,
             'url': video_url,
-        }
\ No newline at end of file
+        }