depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-22 10:11:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse source
This commit is contained in:
Philipp Hagemeister 2013-10-15 12:05:24 +02:00
commit 10eaae48ff
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/test_write_annotations.py
View file

@ -17,7 +17,6 @@ import xml.etree.ElementTree
import youtube_dl.YoutubeDL import youtube_dl.YoutubeDL
import youtube_dl.extractor import youtube_dl.extractor
from youtube_dl.utils import True
class YoutubeDL(youtube_dl.YoutubeDL): class YoutubeDL(youtube_dl.YoutubeDL):

2
test/test_youtube_lists.py
View file

@ -106,7 +106,7 @@ class TestYoutubeLists(unittest.TestCase):
dl = FakeYDL() dl = FakeYDL()
ie = YoutubeShowIE(dl) ie = YoutubeShowIE(dl)
result = ie.extract('http://www.youtube.com/show/airdisasters') result = ie.extract('http://www.youtube.com/show/airdisasters')
self.assertTrue(len(result) >= 4) self.assertTrue(len(result) >= 3)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

2
youtube_dl/extractor/sztvhu.py
View file

@ -25,7 +25,7 @@ class SztvHuIE(InfoExtractor):
video_file = self._search_regex( video_file = self._search_regex(
r'file: "...:(.*?)",', webpage, 'video file') r'file: "...:(.*?)",', webpage, 'video file')
title = self._html_search_regex( title = self._html_search_regex(
r'<meta name="title" content="([^"]*) - [^-]*"', r'<meta name="title" content="([^"]*?) - [^-]*? - [^-]*?"',
webpage, 'video title') webpage, 'video title')
description = self._html_search_regex( description = self._html_search_regex(
r'<meta name="description" content="([^"]*)"/>', r'<meta name="description" content="([^"]*)"/>',

3
youtube_dl/extractor/websurg.py
View file

@ -18,7 +18,8 @@ class WeBSurgIE(InfoExtractor):
u'file': u'vd01en4012.mp4', u'file': u'vd01en4012.mp4',
u'params': { u'params': {
u'skip_download': True, u'skip_download': True,
} },
u'skip': u'Requires login information',
} }
_LOGIN_URL = 'http://www.websurg.com/inc/login/login_div.ajax.php?login=1' _LOGIN_URL = 'http://www.websurg.com/inc/login/login_div.ajax.php?login=1'