aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-15 12:05:24 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-15 12:05:24 +0200
commit10eaae48ffe1042d9c5f77fd563832bf795ad647 (patch)
tree44f1dba50c0774b3e1de94b26d21bffeb451deaa /youtube_dl/extractor
parent9d4660cab15f374176f87d3f747a559142e4af9b (diff)
parent9d74e308f7caa7f649809366ebcdb5a7caf560b9 (diff)
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/sztvhu.py2
-rw-r--r--youtube_dl/extractor/websurg.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/sztvhu.py b/youtube_dl/extractor/sztvhu.py
index cd3e203e6..81fa35c4b 100644
--- a/youtube_dl/extractor/sztvhu.py
+++ b/youtube_dl/extractor/sztvhu.py
@@ -25,7 +25,7 @@ class SztvHuIE(InfoExtractor):
video_file = self._search_regex(
r'file: "...:(.*?)",', webpage, 'video file')
title = self._html_search_regex(
- r'<meta name="title" content="([^"]*) - [^-]*"',
+ r'<meta name="title" content="([^"]*?) - [^-]*? - [^-]*?"',
webpage, 'video title')
description = self._html_search_regex(
r'<meta name="description" content="([^"]*)"/>',
diff --git a/youtube_dl/extractor/websurg.py b/youtube_dl/extractor/websurg.py
index 7d335d444..43953bfdd 100644
--- a/youtube_dl/extractor/websurg.py
+++ b/youtube_dl/extractor/websurg.py
@@ -18,7 +18,8 @@ class WeBSurgIE(InfoExtractor):
u'file': u'vd01en4012.mp4',
u'params': {
u'skip_download': True,
- }
+ },
+ u'skip': u'Requires login information',
}
_LOGIN_URL = 'http://www.websurg.com/inc/login/login_div.ajax.php?login=1'