From b71dbc57c43e4bd8742e9f19c68e8b9728810ce8 Mon Sep 17 00:00:00 2001
From: "Sergey M." <dstftw@gmail.com>
Date: Fri, 14 Feb 2014 22:26:13 +0700
Subject: [PATCH 1/5] [vesti] Fix player regex (Closes #2382)
---
youtube_dl/extractor/vesti.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/vesti.py b/youtube_dl/extractor/vesti.py
index 7773cec14..f51d4dcfa 100644
--- a/youtube_dl/extractor/vesti.py
+++ b/youtube_dl/extractor/vesti.py
@@ -87,8 +87,7 @@ class VestiIE(InfoExtractor):
video_id = mobj.group('id')
else:
mobj = re.search(
- r'<div.+?id="current-video-holder".*?>\s*<iframe src="http://player\.rutv\.ru/iframe/(?P<type>[^/]+)/id/(?P<id>\d+)[^"]*"',
- page)
+ r'<iframe.+?src="http://player\.rutv\.ru/iframe/(?P<type>[^/]+)/id/(?P<id>\d+)[^"]*".*?></iframe>', page)
if not mobj:
raise ExtractorError('No media found')
From 463b33461637b0f2c98772228dd9d7eae171b560 Mon Sep 17 00:00:00 2001
From: "Sergey M." <dstftw@gmail.com>
Date: Fri, 14 Feb 2014 23:12:15 +0700
Subject: [PATCH 2/5] [ndr] Replace 404 test
---
youtube_dl/extractor/ndr.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py
index 811ef5201..0650f9564 100644
--- a/youtube_dl/extractor/ndr.py
+++ b/youtube_dl/extractor/ndr.py
@@ -26,15 +26,15 @@ class NDRIE(InfoExtractor):
},
},
{
- 'url': 'http://www.ndr.de/903/audio191719.html',
- 'md5': '41ed601768534dd18a9ae34d84798129',
+ 'url': 'http://www.ndr.de/info/audio51535.html',
+ 'md5': 'bb3cd38e24fbcc866d13b50ca59307b8',
'note': 'Audio file',
'info_dict': {
- 'id': '191719',
+ 'id': '51535',
'ext': 'mp3',
- 'title': '"Es war schockierend"',
- 'description': 'md5:ed7ff8364793545021a6355b97e95f10',
- 'duration': 112,
+ 'title': 'La Valette entgeht der Hinrichtung',
+ 'description': 'md5:22f9541913a40fe50091d5cdd7c9f536',
+ 'duration': 884,
}
}
]
From 3165dc4d9f8cf637c544802bbbb519d7b3578f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Sat, 15 Feb 2014 13:04:31 +0100
Subject: [PATCH 3/5] [france2.fr:generation-quoi] Skip test
The videos seem to not be available outside France
---
youtube_dl/extractor/francetv.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index ae342341c..51eb97b2f 100644
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -184,6 +184,7 @@ class GenerationQuoiIE(InfoExtractor):
# It uses Dailymotion
'skip_download': True,
},
+ 'skip': 'Only available from France',
}
def _real_extract(self, url):
From e68abba91099eddee5e84bac6b6228a3b6fb1a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Sat, 15 Feb 2014 13:12:41 +0100
Subject: [PATCH 4/5] [sohu] Skip test
Only available from China
---
youtube_dl/extractor/sohu.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/youtube_dl/extractor/sohu.py b/youtube_dl/extractor/sohu.py
index 2b9bf0cb7..bebcafb62 100644
--- a/youtube_dl/extractor/sohu.py
+++ b/youtube_dl/extractor/sohu.py
@@ -17,6 +17,7 @@ class SohuIE(InfoExtractor):
u'info_dict': {
u'title': u'MV：Far East Movement《The Illest》',
},
+ u'skip': u'Only available from China',
}
def _real_extract(self, url):
From 99043c2ea5a670587b005a9cae33cd138a515290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferrandiz@gmail.com>
Date: Sat, 15 Feb 2014 13:17:31 +0100
Subject: [PATCH 5/5] Replace test for dailymotion users
---
test/test_playlists.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/test_playlists.py b/test/test_playlists.py
index e0eb05460..1de9e8ec1 100644
--- a/test/test_playlists.py
+++ b/test/test_playlists.py
@@ -55,10 +55,10 @@ class TestPlaylists(unittest.TestCase):
def test_dailymotion_user(self):
dl = FakeYDL()
ie = DailymotionUserIE(dl)
- result = ie.extract('http://www.dailymotion.com/user/generation-quoi/')
+ result = ie.extract('https://www.dailymotion.com/user/nqtv')
self.assertIsPlaylist(result)
- self.assertEqual(result['title'], 'Génération Quoi')
- self.assertTrue(len(result['entries']) >= 26)
+ self.assertEqual(result['title'], 'Rémi Gaillard')
+ self.assertTrue(len(result['entries']) >= 100)
def test_vimeo_channel(self):
dl = FakeYDL()