aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-28 10:55:12 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-28 10:55:27 +0200
commit38c4d41b744660463abbb333737e031d9c87243e (patch)
tree640baed1c7244168c7a097544ff86b54d43333b5
parentf0b8e3607db6bc2e7cdfcf3175e85d9bccb22229 (diff)
downloadyoutube-dl-38c4d41b744660463abbb333737e031d9c87243e.tar.xz
[played] Simplify (#3798)
-rw-r--r--youtube_dl/extractor/played.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/youtube_dl/extractor/played.py b/youtube_dl/extractor/played.py
index a396e62e5..db40da43b 100644
--- a/youtube_dl/extractor/played.py
+++ b/youtube_dl/extractor/played.py
@@ -14,7 +14,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 +27,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 +53,4 @@ class PlayedIE(InfoExtractor):
'id': video_id,
'title': title,
'url': video_url,
- } \ No newline at end of file
+ }