projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cef27a
)
Add support for https for all extractors as preventive and future-proof measure
author
Sergey M․
<dstftw@gmail.com>
Mon, 21 Mar 2016 15:36:32 +0000
(21:36 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 21 Mar 2016 15:36:32 +0000
(21:36 +0600)
127 files changed:
youtube_dl/extractor/abc.py
patch
|
blob
|
history
youtube_dl/extractor/addanime.py
patch
|
blob
|
history
youtube_dl/extractor/aftonbladet.py
patch
|
blob
|
history
youtube_dl/extractor/aljazeera.py
patch
|
blob
|
history
youtube_dl/extractor/aol.py
patch
|
blob
|
history
youtube_dl/extractor/arte.py
patch
|
blob
|
history
youtube_dl/extractor/azubu.py
patch
|
blob
|
history
youtube_dl/extractor/baidu.py
patch
|
blob
|
history
youtube_dl/extractor/bbc.py
patch
|
blob
|
history
youtube_dl/extractor/behindkink.py
patch
|
blob
|
history
youtube_dl/extractor/bilibili.py
patch
|
blob
|
history
youtube_dl/extractor/bokecc.py
patch
|
blob
|
history
youtube_dl/extractor/bpb.py
patch
|
blob
|
history
youtube_dl/extractor/breakcom.py
patch
|
blob
|
history
youtube_dl/extractor/camdemy.py
patch
|
blob
|
history
youtube_dl/extractor/cbsnews.py
patch
|
blob
|
history
youtube_dl/extractor/cbssports.py
patch
|
blob
|
history
youtube_dl/extractor/cliphunter.py
patch
|
blob
|
history
youtube_dl/extractor/clipsyndicate.py
patch
|
blob
|
history
youtube_dl/extractor/clubic.py
patch
|
blob
|
history
youtube_dl/extractor/comcarcoff.py
patch
|
blob
|
history
youtube_dl/extractor/condenast.py
patch
|
blob
|
history
youtube_dl/extractor/cspan.py
patch
|
blob
|
history
youtube_dl/extractor/ctsnews.py
patch
|
blob
|
history
youtube_dl/extractor/dctp.py
patch
|
blob
|
history
youtube_dl/extractor/defense.py
patch
|
blob
|
history
youtube_dl/extractor/douyutv.py
patch
|
blob
|
history
youtube_dl/extractor/dplay.py
patch
|
blob
|
history
youtube_dl/extractor/dreisat.py
patch
|
blob
|
history
youtube_dl/extractor/dvtv.py
patch
|
blob
|
history
youtube_dl/extractor/echomsk.py
patch
|
blob
|
history
youtube_dl/extractor/exfm.py
patch
|
blob
|
history
youtube_dl/extractor/fc2.py
patch
|
blob
|
history
youtube_dl/extractor/firstpost.py
patch
|
blob
|
history
youtube_dl/extractor/firsttv.py
patch
|
blob
|
history
youtube_dl/extractor/fktv.py
patch
|
blob
|
history
youtube_dl/extractor/footyroom.py
patch
|
blob
|
history
youtube_dl/extractor/foxgay.py
patch
|
blob
|
history
youtube_dl/extractor/franceinter.py
patch
|
blob
|
history
youtube_dl/extractor/freevideo.py
patch
|
blob
|
history
youtube_dl/extractor/gamekings.py
patch
|
blob
|
history
youtube_dl/extractor/gamespot.py
patch
|
blob
|
history
youtube_dl/extractor/gamestar.py
patch
|
blob
|
history
youtube_dl/extractor/gametrailers.py
patch
|
blob
|
history
youtube_dl/extractor/hotnewhiphop.py
patch
|
blob
|
history
youtube_dl/extractor/hypem.py
patch
|
blob
|
history
youtube_dl/extractor/imdb.py
patch
|
blob
|
history
youtube_dl/extractor/iqiyi.py
patch
|
blob
|
history
youtube_dl/extractor/jadorecettepub.py
patch
|
blob
|
history
youtube_dl/extractor/jeuxvideo.py
patch
|
blob
|
history
youtube_dl/extractor/karaoketv.py
patch
|
blob
|
history
youtube_dl/extractor/karrierevideos.py
patch
|
blob
|
history
youtube_dl/extractor/kontrtube.py
patch
|
blob
|
history
youtube_dl/extractor/ku6.py
patch
|
blob
|
history
youtube_dl/extractor/kusi.py
patch
|
blob
|
history
youtube_dl/extractor/kuwo.py
patch
|
blob
|
history
youtube_dl/extractor/leeco.py
patch
|
blob
|
history
youtube_dl/extractor/lifenews.py
patch
|
blob
|
history
youtube_dl/extractor/limelight.py
patch
|
blob
|
history
youtube_dl/extractor/m6.py
patch
|
blob
|
history
youtube_dl/extractor/metacafe.py
patch
|
blob
|
history
youtube_dl/extractor/mit.py
patch
|
blob
|
history
youtube_dl/extractor/mitele.py
patch
|
blob
|
history
youtube_dl/extractor/mooshare.py
patch
|
blob
|
history
youtube_dl/extractor/motherless.py
patch
|
blob
|
history
youtube_dl/extractor/motorsport.py
patch
|
blob
|
history
youtube_dl/extractor/myspass.py
patch
|
blob
|
history
youtube_dl/extractor/myvideo.py
patch
|
blob
|
history
youtube_dl/extractor/myvidster.py
patch
|
blob
|
history
youtube_dl/extractor/nationalgeographic.py
patch
|
blob
|
history
youtube_dl/extractor/nbc.py
patch
|
blob
|
history
youtube_dl/extractor/nextmedia.py
patch
|
blob
|
history
youtube_dl/extractor/noco.py
patch
|
blob
|
history
youtube_dl/extractor/normalboots.py
patch
|
blob
|
history
youtube_dl/extractor/nova.py
patch
|
blob
|
history
youtube_dl/extractor/npr.py
patch
|
blob
|
history
youtube_dl/extractor/ntvru.py
patch
|
blob
|
history
youtube_dl/extractor/orf.py
patch
|
blob
|
history
youtube_dl/extractor/philharmoniedeparis.py
patch
|
blob
|
history
youtube_dl/extractor/photobucket.py
patch
|
blob
|
history
youtube_dl/extractor/pornhd.py
patch
|
blob
|
history
youtube_dl/extractor/pornovoisines.py
patch
|
blob
|
history
youtube_dl/extractor/pyvideo.py
patch
|
blob
|
history
youtube_dl/extractor/qqmusic.py
patch
|
blob
|
history
youtube_dl/extractor/rai.py
patch
|
blob
|
history
youtube_dl/extractor/redtube.py
patch
|
blob
|
history
youtube_dl/extractor/ringtv.py
patch
|
blob
|
history
youtube_dl/extractor/rtve.py
patch
|
blob
|
history
youtube_dl/extractor/ruhd.py
patch
|
blob
|
history
youtube_dl/extractor/rutube.py
patch
|
blob
|
history
youtube_dl/extractor/screenjunkies.py
patch
|
blob
|
history
youtube_dl/extractor/senateisvp.py
patch
|
blob
|
history
youtube_dl/extractor/shared.py
patch
|
blob
|
history
youtube_dl/extractor/sport5.py
patch
|
blob
|
history
youtube_dl/extractor/ssa.py
patch
|
blob
|
history
youtube_dl/extractor/sztvhu.py
patch
|
blob
|
history
youtube_dl/extractor/teamcoco.py
patch
|
blob
|
history
youtube_dl/extractor/tele13.py
patch
|
blob
|
history
youtube_dl/extractor/tf1.py
patch
|
blob
|
history
youtube_dl/extractor/thvideo.py
patch
|
blob
|
history
youtube_dl/extractor/tinypic.py
patch
|
blob
|
history
youtube_dl/extractor/tlc.py
patch
|
blob
|
history
youtube_dl/extractor/toypics.py
patch
|
blob
|
history
youtube_dl/extractor/traileraddict.py
patch
|
blob
|
history
youtube_dl/extractor/trollvids.py
patch
|
blob
|
history
youtube_dl/extractor/tumblr.py
patch
|
blob
|
history
youtube_dl/extractor/tv2.py
patch
|
blob
|
history
youtube_dl/extractor/tvc.py
patch
|
blob
|
history
youtube_dl/extractor/tvplay.py
patch
|
blob
|
history
youtube_dl/extractor/ubu.py
patch
|
blob
|
history
youtube_dl/extractor/unistra.py
patch
|
blob
|
history
youtube_dl/extractor/vbox7.py
patch
|
blob
|
history
youtube_dl/extractor/veoh.py
patch
|
blob
|
history
youtube_dl/extractor/vesti.py
patch
|
blob
|
history
youtube_dl/extractor/vgtv.py
patch
|
blob
|
history
youtube_dl/extractor/videott.py
patch
|
blob
|
history
youtube_dl/extractor/viidea.py
patch
|
blob
|
history
youtube_dl/extractor/vube.py
patch
|
blob
|
history
youtube_dl/extractor/vuclip.py
patch
|
blob
|
history
youtube_dl/extractor/walla.py
patch
|
blob
|
history
youtube_dl/extractor/wat.py
patch
|
blob
|
history
youtube_dl/extractor/wdr.py
patch
|
blob
|
history
youtube_dl/extractor/weiqitv.py
patch
|
blob
|
history
youtube_dl/extractor/wimp.py
patch
|
blob
|
history
youtube_dl/extractor/xbef.py
patch
|
blob
|
history
youtube_dl/extractor/yam.py
patch
|
blob
|
history
youtube_dl/extractor/ynet.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/abc.py
b/youtube_dl/extractor/abc.py
index 6a29e587f007b28cfaf8bd2e714e276ab0b681a1..b584277be92b5a86fb9e0ac5d95870444d441174 100644
(file)
--- a/
youtube_dl/extractor/abc.py
+++ b/
youtube_dl/extractor/abc.py
@@
-12,7
+12,7
@@
from ..utils import (
class ABCIE(InfoExtractor):
IE_NAME = 'abc.net.au'
class ABCIE(InfoExtractor):
IE_NAME = 'abc.net.au'
- _VALID_URL = r'http://www\.abc\.net\.au/news/(?:[^/]+/){1,2}(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://www\.abc\.net\.au/news/(?:[^/]+/){1,2}(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.abc.net.au/news/2014-11-05/australia-to-staff-ebola-treatment-centre-in-sierra-leone/5868334',
_TESTS = [{
'url': 'http://www.abc.net.au/news/2014-11-05/australia-to-staff-ebola-treatment-centre-in-sierra-leone/5868334',
diff --git
a/youtube_dl/extractor/addanime.py
b/youtube_dl/extractor/addanime.py
index e3e6d21137994593d593fbc51313bf38032ce7f8..fb1cc02e11f38ba4961a66e418c1f66af403e853 100644
(file)
--- a/
youtube_dl/extractor/addanime.py
+++ b/
youtube_dl/extractor/addanime.py
@@
-16,7
+16,7
@@
from ..utils import (
class AddAnimeIE(InfoExtractor):
class AddAnimeIE(InfoExtractor):
- _VALID_URL = r'http://(?:\w+\.)?add-anime\.net/(?:watch_video\.php\?(?:.*?)v=|video/)(?P<id>[\w_]+)'
+ _VALID_URL = r'http
s?
://(?:\w+\.)?add-anime\.net/(?:watch_video\.php\?(?:.*?)v=|video/)(?P<id>[\w_]+)'
_TESTS = [{
'url': 'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
'md5': '72954ea10bc979ab5e2eb288b21425a0',
_TESTS = [{
'url': 'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
'md5': '72954ea10bc979ab5e2eb288b21425a0',
diff --git
a/youtube_dl/extractor/aftonbladet.py
b/youtube_dl/extractor/aftonbladet.py
index e0518cf261fbffc4dd23bc4a3800d04eae324139..d548592fe8acbbf2db432db3ed699b80b78e0aa0 100644
(file)
--- a/
youtube_dl/extractor/aftonbladet.py
+++ b/
youtube_dl/extractor/aftonbladet.py
@@
-6,7
+6,7
@@
from ..utils import int_or_none
class AftonbladetIE(InfoExtractor):
class AftonbladetIE(InfoExtractor):
- _VALID_URL = r'http://tv\.aftonbladet\.se/abtv/articles/(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://tv\.aftonbladet\.se/abtv/articles/(?P<id>[0-9]+)'
_TEST = {
'url': 'http://tv.aftonbladet.se/abtv/articles/36015',
'info_dict': {
_TEST = {
'url': 'http://tv.aftonbladet.se/abtv/articles/36015',
'info_dict': {
diff --git
a/youtube_dl/extractor/aljazeera.py
b/youtube_dl/extractor/aljazeera.py
index cddcaa489791eb9393d7832350935f2cab8b7c79..b081695d8400c0e24d36e84bd8445efa084ed8b3 100644
(file)
--- a/
youtube_dl/extractor/aljazeera.py
+++ b/
youtube_dl/extractor/aljazeera.py
@@
-4,7
+4,7
@@
from .common import InfoExtractor
class AlJazeeraIE(InfoExtractor):
class AlJazeeraIE(InfoExtractor):
- _VALID_URL = r'http://www\.aljazeera\.com/programmes/.*?/(?P<id>[^/]+)\.html'
+ _VALID_URL = r'http
s?
://www\.aljazeera\.com/programmes/.*?/(?P<id>[^/]+)\.html'
_TEST = {
'url': 'http://www.aljazeera.com/programmes/the-slum/2014/08/deliverance-201482883754237240.html',
_TEST = {
'url': 'http://www.aljazeera.com/programmes/the-slum/2014/08/deliverance-201482883754237240.html',
diff --git
a/youtube_dl/extractor/aol.py
b/youtube_dl/extractor/aol.py
index b761b2cc4c5d3d4b70766ed56ff5c3529dd39e6b..95a99c6b0d567c52b477a1964d9c055d0b0a6b8a 100644
(file)
--- a/
youtube_dl/extractor/aol.py
+++ b/
youtube_dl/extractor/aol.py
@@
-5,7
+5,7
@@
from .common import InfoExtractor
class AolIE(InfoExtractor):
IE_NAME = 'on.aol.com'
class AolIE(InfoExtractor):
IE_NAME = 'on.aol.com'
- _VALID_URL = r'(?:aol-video:|http://on\.aol\.com/video/.*-)(?P<id>[0-9]+)(?:$|\?)'
+ _VALID_URL = r'(?:aol-video:|http
s?
://on\.aol\.com/video/.*-)(?P<id>[0-9]+)(?:$|\?)'
_TESTS = [{
'url': 'http://on.aol.com/video/u-s--official-warns-of-largest-ever-irs-phone-scam-518167793?icid=OnHomepageC2Wide_MustSee_Img',
_TESTS = [{
'url': 'http://on.aol.com/video/u-s--official-warns-of-largest-ever-irs-phone-scam-518167793?icid=OnHomepageC2Wide_MustSee_Img',
@@
-25,7
+25,7
@@
class AolIE(InfoExtractor):
class AolFeaturesIE(InfoExtractor):
IE_NAME = 'features.aol.com'
class AolFeaturesIE(InfoExtractor):
IE_NAME = 'features.aol.com'
- _VALID_URL = r'http://features\.aol\.com/video/(?P<id>[^/?#]+)'
+ _VALID_URL = r'http
s?
://features\.aol\.com/video/(?P<id>[^/?#]+)'
_TESTS = [{
'url': 'http://features.aol.com/video/behind-secret-second-careers-late-night-talk-show-hosts',
_TESTS = [{
'url': 'http://features.aol.com/video/behind-secret-second-careers-late-night-talk-show-hosts',
diff --git
a/youtube_dl/extractor/arte.py
b/youtube_dl/extractor/arte.py
index 3e119e21b39ba2ab6bc504cf1d19a90008bfbd24..ae0f27dcbe059c0d469eaeca243ef59400ff68d6 100644
(file)
--- a/
youtube_dl/extractor/arte.py
+++ b/
youtube_dl/extractor/arte.py
@@
-23,7
+23,7
@@
from ..utils import (
class ArteTvIE(InfoExtractor):
class ArteTvIE(InfoExtractor):
- _VALID_URL = r'http://videos\.arte\.tv/(?P<lang>fr|de|en|es)/.*-(?P<id>.*?)\.html'
+ _VALID_URL = r'http
s?
://videos\.arte\.tv/(?P<lang>fr|de|en|es)/.*-(?P<id>.*?)\.html'
IE_NAME = 'arte.tv'
def _real_extract(self, url):
IE_NAME = 'arte.tv'
def _real_extract(self, url):
diff --git
a/youtube_dl/extractor/azubu.py
b/youtube_dl/extractor/azubu.py
index 011edf128c2a688bc4ef56e487872ff1b15cee66..1805b7312a6e2d0743219b323307f56e0b0e5638 100644
(file)
--- a/
youtube_dl/extractor/azubu.py
+++ b/
youtube_dl/extractor/azubu.py
@@
-98,7
+98,7
@@
class AzubuIE(InfoExtractor):
class AzubuLiveIE(InfoExtractor):
class AzubuLiveIE(InfoExtractor):
- _VALID_URL = r'http://www.azubu.tv/(?P<id>[^/]+)$'
+ _VALID_URL = r'http
s?
://www.azubu.tv/(?P<id>[^/]+)$'
_TEST = {
'url': 'http://www.azubu.tv/MarsTVMDLen',
_TEST = {
'url': 'http://www.azubu.tv/MarsTVMDLen',
diff --git
a/youtube_dl/extractor/baidu.py
b/youtube_dl/extractor/baidu.py
index 76b21e5962eae26e6bceef265c56e1f1a16ca922..234a661d34623b0b2da3028b20bcc23fc11e2991 100644
(file)
--- a/
youtube_dl/extractor/baidu.py
+++ b/
youtube_dl/extractor/baidu.py
@@
-9,7
+9,7
@@
from ..utils import unescapeHTML
class BaiduVideoIE(InfoExtractor):
IE_DESC = '百度视频'
class BaiduVideoIE(InfoExtractor):
IE_DESC = '百度视频'
- _VALID_URL = r'http://v\.baidu\.com/(?P<type>[a-z]+)/(?P<id>\d+)\.htm'
+ _VALID_URL = r'http
s?
://v\.baidu\.com/(?P<type>[a-z]+)/(?P<id>\d+)\.htm'
_TESTS = [{
'url': 'http://v.baidu.com/comic/1069.htm?frp=bdbrand&q=%E4%B8%AD%E5%8D%8E%E5%B0%8F%E5%BD%93%E5%AE%B6',
'info_dict': {
_TESTS = [{
'url': 'http://v.baidu.com/comic/1069.htm?frp=bdbrand&q=%E4%B8%AD%E5%8D%8E%E5%B0%8F%E5%BD%93%E5%AE%B6',
'info_dict': {
diff --git
a/youtube_dl/extractor/bbc.py
b/youtube_dl/extractor/bbc.py
index c3176700ac764ddb9b15d7ce5f5c205f03fed7d0..2dfcee98d5b5ac9e01c611878ad9b073436983df 100644
(file)
--- a/
youtube_dl/extractor/bbc.py
+++ b/
youtube_dl/extractor/bbc.py
@@
-942,7
+942,7
@@
class BBCIE(BBCCoUkIE):
class BBCCoUkArticleIE(InfoExtractor):
class BBCCoUkArticleIE(InfoExtractor):
- _VALID_URL = r'http://www.bbc.co.uk/programmes/articles/(?P<id>[a-zA-Z0-9]+)'
+ _VALID_URL = r'http
s?
://www.bbc.co.uk/programmes/articles/(?P<id>[a-zA-Z0-9]+)'
IE_NAME = 'bbc.co.uk:article'
IE_DESC = 'BBC articles'
IE_NAME = 'bbc.co.uk:article'
IE_DESC = 'BBC articles'
diff --git
a/youtube_dl/extractor/behindkink.py
b/youtube_dl/extractor/behindkink.py
index 1bdc25812b6afb4cf133007f2d12b89fd56b353f..9bca853b32979a4e2700f5d121c24a08fd875224 100644
(file)
--- a/
youtube_dl/extractor/behindkink.py
+++ b/
youtube_dl/extractor/behindkink.py
@@
-8,7
+8,7
@@
from ..utils import url_basename
class BehindKinkIE(InfoExtractor):
class BehindKinkIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?behindkink\.com/(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<id>[^/#?_]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?behindkink\.com/(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<id>[^/#?_]+)'
_TEST = {
'url': 'http://www.behindkink.com/2014/12/05/what-are-you-passionate-about-marley-blaze/',
'md5': '507b57d8fdcd75a41a9a7bdb7989c762',
_TEST = {
'url': 'http://www.behindkink.com/2014/12/05/what-are-you-passionate-about-marley-blaze/',
'md5': '507b57d8fdcd75a41a9a7bdb7989c762',
diff --git
a/youtube_dl/extractor/bilibili.py
b/youtube_dl/extractor/bilibili.py
index 59beb11bce71bfc6ef9b036ad123dc44e872d0be..8baff2041bb380d0204895cbbc6c64b16be94993 100644
(file)
--- a/
youtube_dl/extractor/bilibili.py
+++ b/
youtube_dl/extractor/bilibili.py
@@
-14,7
+14,7
@@
from ..utils import (
class BiliBiliIE(InfoExtractor):
class BiliBiliIE(InfoExtractor):
- _VALID_URL = r'http://www\.bilibili\.(?:tv|com)/video/av(?P<id>\d+)(?:/index_(?P<page_num>\d+).html)?'
+ _VALID_URL = r'http
s?
://www\.bilibili\.(?:tv|com)/video/av(?P<id>\d+)(?:/index_(?P<page_num>\d+).html)?'
_TESTS = [{
'url': 'http://www.bilibili.tv/video/av1074402/',
_TESTS = [{
'url': 'http://www.bilibili.tv/video/av1074402/',
diff --git
a/youtube_dl/extractor/bokecc.py
b/youtube_dl/extractor/bokecc.py
index 122a1cbb6a5a85ea457b7652523f9dfbc3406be3..86a7f4d7d6261966101508023450e08f5d6c30d7 100644
(file)
--- a/
youtube_dl/extractor/bokecc.py
+++ b/
youtube_dl/extractor/bokecc.py
@@
-33,7
+33,7
@@
class BokeCCBaseIE(InfoExtractor):
class BokeCCIE(BokeCCBaseIE):
_IE_DESC = 'CC视频'
class BokeCCIE(BokeCCBaseIE):
_IE_DESC = 'CC视频'
- _VALID_URL = r'http://union\.bokecc\.com/playvideo\.bo\?(?P<query>.*)'
+ _VALID_URL = r'http
s?
://union\.bokecc\.com/playvideo\.bo\?(?P<query>.*)'
_TESTS = [{
'url': 'http://union.bokecc.com/playvideo.bo?vid=E44D40C15E65EA30&uid=CD0C5D3C8614B28B',
_TESTS = [{
'url': 'http://union.bokecc.com/playvideo.bo?vid=E44D40C15E65EA30&uid=CD0C5D3C8614B28B',
diff --git
a/youtube_dl/extractor/bpb.py
b/youtube_dl/extractor/bpb.py
index c28e72927fefc90c320d1b11b31db5b3d7e754d1..6ad45a1e6a30bac2450743de3f0d12a2c9f2b89d 100644
(file)
--- a/
youtube_dl/extractor/bpb.py
+++ b/
youtube_dl/extractor/bpb.py
@@
-12,7
+12,7
@@
from ..utils import (
class BpbIE(InfoExtractor):
IE_DESC = 'Bundeszentrale für politische Bildung'
class BpbIE(InfoExtractor):
IE_DESC = 'Bundeszentrale für politische Bildung'
- _VALID_URL = r'http://www\.bpb\.de/mediathek/(?P<id>[0-9]+)/'
+ _VALID_URL = r'http
s?
://www\.bpb\.de/mediathek/(?P<id>[0-9]+)/'
_TEST = {
'url': 'http://www.bpb.de/mediathek/297/joachim-gauck-zu-1989-und-die-erinnerung-an-die-ddr',
_TEST = {
'url': 'http://www.bpb.de/mediathek/297/joachim-gauck-zu-1989-und-die-erinnerung-an-die-ddr',
diff --git
a/youtube_dl/extractor/breakcom.py
b/youtube_dl/extractor/breakcom.py
index aa08051b168cee479a416647645acdd6543ac71d..725859b4d2d554df91ff4793a2b3d245f02c8996 100644
(file)
--- a/
youtube_dl/extractor/breakcom.py
+++ b/
youtube_dl/extractor/breakcom.py
@@
-11,7
+11,7
@@
from ..utils import (
class BreakIE(InfoExtractor):
class BreakIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?break\.com/video/(?:[^/]+/)*.+-(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?break\.com/video/(?:[^/]+/)*.+-(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.break.com/video/when-girls-act-like-guys-2468056',
'info_dict': {
_TESTS = [{
'url': 'http://www.break.com/video/when-girls-act-like-guys-2468056',
'info_dict': {
diff --git
a/youtube_dl/extractor/camdemy.py
b/youtube_dl/extractor/camdemy.py
index 897f3a104ce2d31aeac99e98197557ef502faf18..dd4d96cecd82764aa8ae77203d5a92e43ffe3acc 100644
(file)
--- a/
youtube_dl/extractor/camdemy.py
+++ b/
youtube_dl/extractor/camdemy.py
@@
-16,7
+16,7
@@
from ..utils import (
class CamdemyIE(InfoExtractor):
class CamdemyIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?camdemy\.com/media/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?camdemy\.com/media/(?P<id>\d+)'
_TESTS = [{
# single file
'url': 'http://www.camdemy.com/media/5181/',
_TESTS = [{
# single file
'url': 'http://www.camdemy.com/media/5181/',
@@
-104,7
+104,7
@@
class CamdemyIE(InfoExtractor):
class CamdemyFolderIE(InfoExtractor):
class CamdemyFolderIE(InfoExtractor):
- _VALID_URL = r'http://www.camdemy.com/folder/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://www.camdemy.com/folder/(?P<id>\d+)'
_TESTS = [{
# links with trailing slash
'url': 'http://www.camdemy.com/folder/450',
_TESTS = [{
# links with trailing slash
'url': 'http://www.camdemy.com/folder/450',
diff --git
a/youtube_dl/extractor/cbsnews.py
b/youtube_dl/extractor/cbsnews.py
index 8ddcc5097e3bb7b83392e056080846daaab30924..f23bac9a1ff279ed28b43fa52f080bc2c4d651d7 100644
(file)
--- a/
youtube_dl/extractor/cbsnews.py
+++ b/
youtube_dl/extractor/cbsnews.py
@@
-11,7
+11,7
@@
from ..utils import (
class CBSNewsIE(ThePlatformIE):
IE_DESC = 'CBS News'
class CBSNewsIE(ThePlatformIE):
IE_DESC = 'CBS News'
- _VALID_URL = r'http://(?:www\.)?cbsnews\.com/(?:news|videos)/(?P<id>[\da-z_-]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?cbsnews\.com/(?:news|videos)/(?P<id>[\da-z_-]+)'
_TESTS = [
{
_TESTS = [
{
@@
-96,7
+96,7
@@
class CBSNewsIE(ThePlatformIE):
class CBSNewsLiveVideoIE(InfoExtractor):
IE_DESC = 'CBS News Live Videos'
class CBSNewsLiveVideoIE(InfoExtractor):
IE_DESC = 'CBS News Live Videos'
- _VALID_URL = r'http://(?:www\.)?cbsnews\.com/live/video/(?P<id>[\da-z_-]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?cbsnews\.com/live/video/(?P<id>[\da-z_-]+)'
_TEST = {
'url': 'http://www.cbsnews.com/live/video/clinton-sanders-prepare-to-face-off-in-nh/',
_TEST = {
'url': 'http://www.cbsnews.com/live/video/clinton-sanders-prepare-to-face-off-in-nh/',
diff --git
a/youtube_dl/extractor/cbssports.py
b/youtube_dl/extractor/cbssports.py
index ae47e74ccf583ac9d821dd588f07f33ff57673db..549ae32f36c8ebd258896d4189ba90ae501c40d0 100644
(file)
--- a/
youtube_dl/extractor/cbssports.py
+++ b/
youtube_dl/extractor/cbssports.py
@@
-6,7
+6,7
@@
from .common import InfoExtractor
class CBSSportsIE(InfoExtractor):
class CBSSportsIE(InfoExtractor):
- _VALID_URL = r'http://www\.cbssports\.com/video/player/(?P<section>[^/]+)/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://www\.cbssports\.com/video/player/(?P<section>[^/]+)/(?P<id>[^/]+)'
_TEST = {
'url': 'http://www.cbssports.com/video/player/tennis/318462531970/0/us-open-flashbacks-1990s',
_TEST = {
'url': 'http://www.cbssports.com/video/player/tennis/318462531970/0/us-open-flashbacks-1990s',
diff --git
a/youtube_dl/extractor/cliphunter.py
b/youtube_dl/extractor/cliphunter.py
index 2996b6b09e81fcd0e04038d1744f2fdf3d54e694..19f8b397e44a679ea936ad638048ccb488dc4b93 100644
(file)
--- a/
youtube_dl/extractor/cliphunter.py
+++ b/
youtube_dl/extractor/cliphunter.py
@@
-19,7
+19,7
@@
def _decode(s):
class CliphunterIE(InfoExtractor):
IE_NAME = 'cliphunter'
class CliphunterIE(InfoExtractor):
IE_NAME = 'cliphunter'
- _VALID_URL = r'''(?x)http://(?:www\.)?cliphunter\.com/w/
+ _VALID_URL = r'''(?x)http
s?
://(?:www\.)?cliphunter\.com/w/
(?P<id>[0-9]+)/
(?P<seo>.+?)(?:$|[#\?])
'''
(?P<id>[0-9]+)/
(?P<seo>.+?)(?:$|[#\?])
'''
diff --git
a/youtube_dl/extractor/clipsyndicate.py
b/youtube_dl/extractor/clipsyndicate.py
index 8306d6fb7d0d4414cff36f7b381ca9c877820f58..0b6ad895fd7841e70b7dc0dd136052ff0459dd3c 100644
(file)
--- a/
youtube_dl/extractor/clipsyndicate.py
+++ b/
youtube_dl/extractor/clipsyndicate.py
@@
-8,7
+8,7
@@
from ..utils import (
class ClipsyndicateIE(InfoExtractor):
class ClipsyndicateIE(InfoExtractor):
- _VALID_URL = r'http://(?:chic|www)\.clipsyndicate\.com/video/play(list/\d+)?/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:chic|www)\.clipsyndicate\.com/video/play(list/\d+)?/(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
_TESTS = [{
'url': 'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
diff --git
a/youtube_dl/extractor/clubic.py
b/youtube_dl/extractor/clubic.py
index 1dfa7c12e19dd3151b9fdbda9c76ad4f58fa3192..2fba93543474cd7ebd53848aca62848c32bf7164 100644
(file)
--- a/
youtube_dl/extractor/clubic.py
+++ b/
youtube_dl/extractor/clubic.py
@@
-12,7
+12,7
@@
from ..utils import (
class ClubicIE(InfoExtractor):
class ClubicIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?clubic\.com/video/(?:[^/]+/)*video.*-(?P<id>[0-9]+)\.html'
+ _VALID_URL = r'http
s?
://(?:www\.)?clubic\.com/video/(?:[^/]+/)*video.*-(?P<id>[0-9]+)\.html'
_TESTS = [{
'url': 'http://www.clubic.com/video/clubic-week/video-clubic-week-2-0-le-fbi-se-lance-dans-la-photo-d-identite-448474.html',
_TESTS = [{
'url': 'http://www.clubic.com/video/clubic-week/video-clubic-week-2-0-le-fbi-se-lance-dans-la-photo-d-identite-448474.html',
diff --git
a/youtube_dl/extractor/comcarcoff.py
b/youtube_dl/extractor/comcarcoff.py
index 7dff684929721699bb3df90a5a4ce52f0552848b..e697d14107534e57845ea661864826ec4843735d 100644
(file)
--- a/
youtube_dl/extractor/comcarcoff.py
+++ b/
youtube_dl/extractor/comcarcoff.py
@@
-11,7
+11,7
@@
from ..utils import (
class ComCarCoffIE(InfoExtractor):
class ComCarCoffIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?comediansincarsgettingcoffee\.com/(?P<id>[a-z0-9\-]*)'
+ _VALID_URL = r'http
s?
://(?:www\.)?comediansincarsgettingcoffee\.com/(?P<id>[a-z0-9\-]*)'
_TESTS = [{
'url': 'http://comediansincarsgettingcoffee.com/miranda-sings-happy-thanksgiving-miranda/',
'info_dict': {
_TESTS = [{
'url': 'http://comediansincarsgettingcoffee.com/miranda-sings-happy-thanksgiving-miranda/',
'info_dict': {
diff --git
a/youtube_dl/extractor/condenast.py
b/youtube_dl/extractor/condenast.py
index 6f92ae2ed0cd1383f66d21b3a9274be151ca32b2..054978ff23b367484c32c2142906c27c28379b38 100644
(file)
--- a/
youtube_dl/extractor/condenast.py
+++ b/
youtube_dl/extractor/condenast.py
@@
-45,7
+45,7
@@
class CondeNastIE(InfoExtractor):
'wmagazine': 'W Magazine',
}
'wmagazine': 'W Magazine',
}
- _VALID_URL = r'http://(?:video|www|player)\.(?P<site>%s)\.com/(?P<type>watch|series|video|embed(?:js)?)/(?P<id>[^/?#]+)' % '|'.join(_SITES.keys())
+ _VALID_URL = r'http
s?
://(?:video|www|player)\.(?P<site>%s)\.com/(?P<type>watch|series|video|embed(?:js)?)/(?P<id>[^/?#]+)' % '|'.join(_SITES.keys())
IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
EMBED_URL = r'(?:https?:)?//player\.(?P<site>%s)\.com/(?P<type>embed(?:js)?)/.+?' % '|'.join(_SITES.keys())
IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
EMBED_URL = r'(?:https?:)?//player\.(?P<site>%s)\.com/(?P<type>embed(?:js)?)/.+?' % '|'.join(_SITES.keys())
diff --git
a/youtube_dl/extractor/cspan.py
b/youtube_dl/extractor/cspan.py
index b8b9d058ddce866fa497597863c80d1de0a7f5c5..84b36f44cfac7bd45a8a7d28adb6767093a7d19b 100644
(file)
--- a/
youtube_dl/extractor/cspan.py
+++ b/
youtube_dl/extractor/cspan.py
@@
-15,7
+15,7
@@
from .senateisvp import SenateISVPIE
class CSpanIE(InfoExtractor):
class CSpanIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?c-span\.org/video/\?(?P<id>[0-9a-f]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?c-span\.org/video/\?(?P<id>[0-9a-f]+)'
IE_DESC = 'C-SPAN'
_TESTS = [{
'url': 'http://www.c-span.org/video/?313572-1/HolderonV',
IE_DESC = 'C-SPAN'
_TESTS = [{
'url': 'http://www.c-span.org/video/?313572-1/HolderonV',
diff --git
a/youtube_dl/extractor/ctsnews.py
b/youtube_dl/extractor/ctsnews.py
index 45049bf371370da6e4b64952441e76d86814fd6a..1622fc844a1b8d4794fc12694f03f37c00076f15 100644
(file)
--- a/
youtube_dl/extractor/ctsnews.py
+++ b/
youtube_dl/extractor/ctsnews.py
@@
-8,7
+8,7
@@
from ..utils import parse_iso8601, ExtractorError
class CtsNewsIE(InfoExtractor):
IE_DESC = '華視新聞'
# https connection failed (Connection reset)
class CtsNewsIE(InfoExtractor):
IE_DESC = '華視新聞'
# https connection failed (Connection reset)
- _VALID_URL = r'http://news\.cts\.com\.tw/[a-z]+/[a-z]+/\d+/(?P<id>\d+)\.html'
+ _VALID_URL = r'http
s?
://news\.cts\.com\.tw/[a-z]+/[a-z]+/\d+/(?P<id>\d+)\.html'
_TESTS = [{
'url': 'http://news.cts.com.tw/cts/international/201501/201501291578109.html',
'md5': 'a9875cb790252b08431186d741beaabe',
_TESTS = [{
'url': 'http://news.cts.com.tw/cts/international/201501/201501291578109.html',
'md5': 'a9875cb790252b08431186d741beaabe',
diff --git
a/youtube_dl/extractor/dctp.py
b/youtube_dl/extractor/dctp.py
index aa2c09eb686f9da5a7bedfdfe57566e9d29a0700..9099f5046a14ad7c769a6da50d813076f8b9231e 100644
(file)
--- a/
youtube_dl/extractor/dctp.py
+++ b/
youtube_dl/extractor/dctp.py
@@
-6,7
+6,7
@@
from ..compat import compat_str
class DctpTvIE(InfoExtractor):
class DctpTvIE(InfoExtractor):
- _VALID_URL = r'http://www.dctp.tv/(#/)?filme/(?P<id>.+?)/$'
+ _VALID_URL = r'http
s?
://www.dctp.tv/(#/)?filme/(?P<id>.+?)/$'
_TEST = {
'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/',
'info_dict': {
_TEST = {
'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/',
'info_dict': {
diff --git
a/youtube_dl/extractor/defense.py
b/youtube_dl/extractor/defense.py
index 98e3aedfd08ada1300cbf3114a41022949062402..9fe144e1431941051f3f2b7134fd9eb888522e96 100644
(file)
--- a/
youtube_dl/extractor/defense.py
+++ b/
youtube_dl/extractor/defense.py
@@
-5,7
+5,7
@@
from .common import InfoExtractor
class DefenseGouvFrIE(InfoExtractor):
IE_NAME = 'defense.gouv.fr'
class DefenseGouvFrIE(InfoExtractor):
IE_NAME = 'defense.gouv.fr'
- _VALID_URL = r'http://.*?\.defense\.gouv\.fr/layout/set/ligthboxvideo/base-de-medias/webtv/(?P<id>[^/?#]*)'
+ _VALID_URL = r'http
s?
://.*?\.defense\.gouv\.fr/layout/set/ligthboxvideo/base-de-medias/webtv/(?P<id>[^/?#]*)'
_TEST = {
'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
_TEST = {
'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
diff --git
a/youtube_dl/extractor/douyutv.py
b/youtube_dl/extractor/douyutv.py
index bdc768c783b9b3213badc5cf4b354f6159142f9f..bcb670945d27b31802bf27390feb4f6cbd53cd6f 100644
(file)
--- a/
youtube_dl/extractor/douyutv.py
+++ b/
youtube_dl/extractor/douyutv.py
@@
-10,7
+10,7
@@
from ..compat import (compat_str, compat_basestring)
class DouyuTVIE(InfoExtractor):
IE_DESC = '斗鱼'
class DouyuTVIE(InfoExtractor):
IE_DESC = '斗鱼'
- _VALID_URL = r'http://(?:www\.)?douyutv\.com/(?P<id>[A-Za-z0-9]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?douyutv\.com/(?P<id>[A-Za-z0-9]+)'
_TESTS = [{
'url': 'http://www.douyutv.com/iseven',
'info_dict': {
_TESTS = [{
'url': 'http://www.douyutv.com/iseven',
'info_dict': {
diff --git
a/youtube_dl/extractor/dplay.py
b/youtube_dl/extractor/dplay.py
index a638c827c7e01ed8acee28a091d3cdcff510ada0..1e7dcada614dbe4d0cd65efa2e8ff41c790c007b 100644
(file)
--- a/
youtube_dl/extractor/dplay.py
+++ b/
youtube_dl/extractor/dplay.py
@@
-10,7
+10,7
@@
from ..utils import int_or_none
class DPlayIE(InfoExtractor):
class DPlayIE(InfoExtractor):
- _VALID_URL = r'http://(?P<domain>it\.dplay\.com|www\.dplay\.(?:dk|se|no))/[^/]+/(?P<id>[^/?#]+)'
+ _VALID_URL = r'http
s?
://(?P<domain>it\.dplay\.com|www\.dplay\.(?:dk|se|no))/[^/]+/(?P<id>[^/?#]+)'
_TESTS = [{
'url': 'http://it.dplay.com/take-me-out/stagione-1-episodio-25/',
_TESTS = [{
'url': 'http://it.dplay.com/take-me-out/stagione-1-episodio-25/',
diff --git
a/youtube_dl/extractor/dreisat.py
b/youtube_dl/extractor/dreisat.py
index 028144f20b3458e61ed214703d5f6fd17ab79871..0040e70d4929828ebf2dc7dc74199ed639dcfebd 100644
(file)
--- a/
youtube_dl/extractor/dreisat.py
+++ b/
youtube_dl/extractor/dreisat.py
@@
-7,7
+7,7
@@
from .zdf import ZDFIE
class DreiSatIE(ZDFIE):
IE_NAME = '3sat'
class DreiSatIE(ZDFIE):
IE_NAME = '3sat'
- _VALID_URL = r'(?:http://)?(?:www\.)?3sat\.de/mediathek/(?:index\.php|mediathek\.php)?\?(?:(?:mode|display)=[^&]+&)*obj=(?P<id>[0-9]+)$'
+ _VALID_URL = r'(?:http
s?
://)?(?:www\.)?3sat\.de/mediathek/(?:index\.php|mediathek\.php)?\?(?:(?:mode|display)=[^&]+&)*obj=(?P<id>[0-9]+)$'
_TESTS = [
{
'url': 'http://www.3sat.de/mediathek/index.php?mode=play&obj=45918',
_TESTS = [
{
'url': 'http://www.3sat.de/mediathek/index.php?mode=play&obj=45918',
diff --git
a/youtube_dl/extractor/dvtv.py
b/youtube_dl/extractor/dvtv.py
index c1a4bc757f78770179f332d651227f47cceb8a99..974c69dbc75fcb29bd57e30432fa466182b68743 100644
(file)
--- a/
youtube_dl/extractor/dvtv.py
+++ b/
youtube_dl/extractor/dvtv.py
@@
-15,7
+15,7
@@
class DVTVIE(InfoExtractor):
IE_NAME = 'dvtv'
IE_DESC = 'http://video.aktualne.cz/'
IE_NAME = 'dvtv'
IE_DESC = 'http://video.aktualne.cz/'
- _VALID_URL = r'http://video\.aktualne\.cz/(?:[^/]+/)+r~(?P<id>[0-9a-f]{32})'
+ _VALID_URL = r'http
s?
://video\.aktualne\.cz/(?:[^/]+/)+r~(?P<id>[0-9a-f]{32})'
_TESTS = [{
'url': 'http://video.aktualne.cz/dvtv/vondra-o-ceskem-stoleti-pri-pohledu-na-havla-mi-bylo-trapne/r~e5efe9ca855511e4833a0025900fea04/',
_TESTS = [{
'url': 'http://video.aktualne.cz/dvtv/vondra-o-ceskem-stoleti-pri-pohledu-na-havla-mi-bylo-trapne/r~e5efe9ca855511e4833a0025900fea04/',
diff --git
a/youtube_dl/extractor/echomsk.py
b/youtube_dl/extractor/echomsk.py
index d2d94049d368e74413d93ca40628e3d5174a7675..6b7cc652fe43c60cb8d8326f1cf6bd0c51fbd59f 100644
(file)
--- a/
youtube_dl/extractor/echomsk.py
+++ b/
youtube_dl/extractor/echomsk.py
@@
-7,7
+7,7
@@
from .common import InfoExtractor
class EchoMskIE(InfoExtractor):
class EchoMskIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?echo\.msk\.ru/sounds/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?echo\.msk\.ru/sounds/(?P<id>\d+)'
_TEST = {
'url': 'http://www.echo.msk.ru/sounds/1464134.html',
'md5': '2e44b3b78daff5b458e4dbc37f191f7c',
_TEST = {
'url': 'http://www.echo.msk.ru/sounds/1464134.html',
'md5': '2e44b3b78daff5b458e4dbc37f191f7c',
diff --git
a/youtube_dl/extractor/exfm.py
b/youtube_dl/extractor/exfm.py
index 0c0fe6d652b11c2d30746f7d4da232ee4a1d65e3..09ed4f2b5644c5c8d55ea944d98e1684acacc125 100644
(file)
--- a/
youtube_dl/extractor/exfm.py
+++ b/
youtube_dl/extractor/exfm.py
@@
-8,7
+8,7
@@
from .common import InfoExtractor
class ExfmIE(InfoExtractor):
IE_NAME = 'exfm'
IE_DESC = 'ex.fm'
class ExfmIE(InfoExtractor):
IE_NAME = 'exfm'
IE_DESC = 'ex.fm'
- _VALID_URL = r'http://(?:www\.)?ex\.fm/song/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?ex\.fm/song/(?P<id>[^/]+)'
_SOUNDCLOUD_URL = r'http://(?:www\.)?api\.soundcloud\.com/tracks/([^/]+)/stream'
_TESTS = [
{
_SOUNDCLOUD_URL = r'http://(?:www\.)?api\.soundcloud\.com/tracks/([^/]+)/stream'
_TESTS = [
{
diff --git
a/youtube_dl/extractor/fc2.py
b/youtube_dl/extractor/fc2.py
index 9580f5c0c5d1f4eb9bd54eb76126744322ae85e9..508684d2eec8786c83ce3dce8cb4e8f85fa56673 100644
(file)
--- a/
youtube_dl/extractor/fc2.py
+++ b/
youtube_dl/extractor/fc2.py
@@
-17,7
+17,7
@@
from ..utils import (
class FC2IE(InfoExtractor):
class FC2IE(InfoExtractor):
- _VALID_URL = r'^http://video\.fc2\.com/(?:[^/]+/)*content/(?P<id>[^/]+)'
+ _VALID_URL = r'^http
s?
://video\.fc2\.com/(?:[^/]+/)*content/(?P<id>[^/]+)'
IE_NAME = 'fc2'
_NETRC_MACHINE = 'fc2'
_TESTS = [{
IE_NAME = 'fc2'
_NETRC_MACHINE = 'fc2'
_TESTS = [{
diff --git
a/youtube_dl/extractor/firstpost.py
b/youtube_dl/extractor/firstpost.py
index 298227d5793770c82d8868256d655fa7ea3dc31c..e8936cb2468f78bd2c1b59008a13e9411204380e 100644
(file)
--- a/
youtube_dl/extractor/firstpost.py
+++ b/
youtube_dl/extractor/firstpost.py
@@
-4,7
+4,7
@@
from .common import InfoExtractor
class FirstpostIE(InfoExtractor):
class FirstpostIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?firstpost\.com/[^/]+/.*-(?P<id>[0-9]+)\.html'
+ _VALID_URL = r'http
s?
://(?:www\.)?firstpost\.com/[^/]+/.*-(?P<id>[0-9]+)\.html'
_TEST = {
'url': 'http://www.firstpost.com/india/india-to-launch-indigenous-aircraft-carrier-monday-1025403.html',
_TEST = {
'url': 'http://www.firstpost.com/india/india-to-launch-indigenous-aircraft-carrier-monday-1025403.html',
diff --git
a/youtube_dl/extractor/firsttv.py
b/youtube_dl/extractor/firsttv.py
index 510d4b108944d1f220c45ddc2fbe85cdad6114ca..98b165143fe8b3f3e970ad602856b4266c59701c 100644
(file)
--- a/
youtube_dl/extractor/firsttv.py
+++ b/
youtube_dl/extractor/firsttv.py
@@
-8,7
+8,7
@@
from ..utils import int_or_none
class FirstTVIE(InfoExtractor):
IE_NAME = '1tv'
IE_DESC = 'Первый канал'
class FirstTVIE(InfoExtractor):
IE_NAME = '1tv'
IE_DESC = 'Первый канал'
- _VALID_URL = r'http://(?:www\.)?1tv\.ru/(?:[^/]+/)+(?P<id>.+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?1tv\.ru/(?:[^/]+/)+(?P<id>.+)'
_TESTS = [{
'url': 'http://www.1tv.ru/videoarchive/73390',
_TESTS = [{
'url': 'http://www.1tv.ru/videoarchive/73390',
diff --git
a/youtube_dl/extractor/fktv.py
b/youtube_dl/extractor/fktv.py
index 5f6e65daed2d5dc2c18c09a97450ae2a9c88e2df..a3a2915998dc1cc2fca8f5ccdf6cec6cac0d528b 100644
(file)
--- a/
youtube_dl/extractor/fktv.py
+++ b/
youtube_dl/extractor/fktv.py
@@
-10,7
+10,7
@@
from ..utils import (
class FKTVIE(InfoExtractor):
IE_NAME = 'fernsehkritik.tv'
class FKTVIE(InfoExtractor):
IE_NAME = 'fernsehkritik.tv'
- _VALID_URL = r'http://(?:www\.)?fernsehkritik\.tv/folge-(?P<id>[0-9]+)(?:/.*)?'
+ _VALID_URL = r'http
s?
://(?:www\.)?fernsehkritik\.tv/folge-(?P<id>[0-9]+)(?:/.*)?'
_TEST = {
'url': 'http://fernsehkritik.tv/folge-1',
_TEST = {
'url': 'http://fernsehkritik.tv/folge-1',
diff --git
a/youtube_dl/extractor/footyroom.py
b/youtube_dl/extractor/footyroom.py
index 370fd006fe015e4ab1a017d10fd8784b33ba034a..d2503ae2eff3d2e46497bbcba356af11db665452 100644
(file)
--- a/
youtube_dl/extractor/footyroom.py
+++ b/
youtube_dl/extractor/footyroom.py
@@
-5,7
+5,7
@@
from .common import InfoExtractor
class FootyRoomIE(InfoExtractor):
class FootyRoomIE(InfoExtractor):
- _VALID_URL = r'http://footyroom\.com/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://footyroom\.com/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://footyroom.com/schalke-04-0-2-real-madrid-2015-02/',
'info_dict': {
_TESTS = [{
'url': 'http://footyroom.com/schalke-04-0-2-real-madrid-2015-02/',
'info_dict': {
diff --git
a/youtube_dl/extractor/foxgay.py
b/youtube_dl/extractor/foxgay.py
index 08b8ea36235993f78ce7a4ba05ac05f255ee4ea7..70c1a815d3121bf048da9510a00abf10dc516126 100644
(file)
--- a/
youtube_dl/extractor/foxgay.py
+++ b/
youtube_dl/extractor/foxgay.py
@@
-4,7
+4,7
@@
from .common import InfoExtractor
class FoxgayIE(InfoExtractor):
class FoxgayIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?foxgay\.com/videos/(?:\S+-)?(?P<id>\d+)\.shtml'
+ _VALID_URL = r'http
s?
://(?:www\.)?foxgay\.com/videos/(?:\S+-)?(?P<id>\d+)\.shtml'
_TEST = {
'url': 'http://foxgay.com/videos/fuck-turkish-style-2582.shtml',
'md5': '80d72beab5d04e1655a56ad37afe6841',
_TEST = {
'url': 'http://foxgay.com/videos/fuck-turkish-style-2582.shtml',
'md5': '80d72beab5d04e1655a56ad37afe6841',
diff --git
a/youtube_dl/extractor/franceinter.py
b/youtube_dl/extractor/franceinter.py
index 0388ba00c2a7ab5bfa4cf622c359c697615daec4..2369f868da4a39b1cf84c7cee6a5830859484082 100644
(file)
--- a/
youtube_dl/extractor/franceinter.py
+++ b/
youtube_dl/extractor/franceinter.py
@@
-6,7
+6,7
@@
from ..utils import int_or_none
class FranceInterIE(InfoExtractor):
class FranceInterIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?franceinter\.fr/player/reecouter\?play=(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?franceinter\.fr/player/reecouter\?play=(?P<id>[0-9]+)'
_TEST = {
'url': 'http://www.franceinter.fr/player/reecouter?play=793962',
'md5': '4764932e466e6f6c79c317d2e74f6884',
_TEST = {
'url': 'http://www.franceinter.fr/player/reecouter?play=793962',
'md5': '4764932e466e6f6c79c317d2e74f6884',
diff --git
a/youtube_dl/extractor/freevideo.py
b/youtube_dl/extractor/freevideo.py
index c7bec027bbe37d8c13f645ae918655caeb5a53cd..cd8423a6faff4431c310e1258396bbb58dc92a14 100644
(file)
--- a/
youtube_dl/extractor/freevideo.py
+++ b/
youtube_dl/extractor/freevideo.py
@@
-5,7
+5,7
@@
from ..utils import ExtractorError
class FreeVideoIE(InfoExtractor):
class FreeVideoIE(InfoExtractor):
- _VALID_URL = r'^http://www.freevideo.cz/vase-videa/(?P<id>[^.]+)\.html(?:$|[?#])'
+ _VALID_URL = r'^http
s?
://www.freevideo.cz/vase-videa/(?P<id>[^.]+)\.html(?:$|[?#])'
_TEST = {
'url': 'http://www.freevideo.cz/vase-videa/vysukany-zadecek-22033.html',
_TEST = {
'url': 'http://www.freevideo.cz/vase-videa/vysukany-zadecek-22033.html',
diff --git
a/youtube_dl/extractor/gamekings.py
b/youtube_dl/extractor/gamekings.py
index f6b9046f943c702262897002b07c418e3e666b3d..cbcddcb7cd116a05a8b294c06988586aec955c51 100644
(file)
--- a/
youtube_dl/extractor/gamekings.py
+++ b/
youtube_dl/extractor/gamekings.py
@@
-10,7
+10,7
@@
from .youtube import YoutubeIE
class GamekingsIE(InfoExtractor):
class GamekingsIE(InfoExtractor):
- _VALID_URL = r'http://www\.gamekings\.nl/(?:videos|nieuws)/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://www\.gamekings\.nl/(?:videos|nieuws)/(?P<id>[^/]+)'
_TESTS = [{
# YouTube embed video
'url': 'http://www.gamekings.nl/videos/phoenix-wright-ace-attorney-dual-destinies-review/',
_TESTS = [{
# YouTube embed video
'url': 'http://www.gamekings.nl/videos/phoenix-wright-ace-attorney-dual-destinies-review/',
diff --git
a/youtube_dl/extractor/gamespot.py
b/youtube_dl/extractor/gamespot.py
index b3f1bafcc37ee98f1c5b89a644909f3ee0a32049..4ffdd75157486957810f718cb1019cdc5dd80f4f 100644
(file)
--- a/
youtube_dl/extractor/gamespot.py
+++ b/
youtube_dl/extractor/gamespot.py
@@
-14,7
+14,7
@@
from ..utils import (
class GameSpotIE(InfoExtractor):
class GameSpotIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?gamespot\.com/.*-(?P<id>\d+)/?'
+ _VALID_URL = r'http
s?
://(?:www\.)?gamespot\.com/.*-(?P<id>\d+)/?'
_TESTS = [{
'url': 'http://www.gamespot.com/videos/arma-3-community-guide-sitrep-i/2300-6410818/',
'md5': 'b2a30deaa8654fcccd43713a6b6a4825',
_TESTS = [{
'url': 'http://www.gamespot.com/videos/arma-3-community-guide-sitrep-i/2300-6410818/',
'md5': 'b2a30deaa8654fcccd43713a6b6a4825',
diff --git
a/youtube_dl/extractor/gamestar.py
b/youtube_dl/extractor/gamestar.py
index 590ccf5266d61e67772a1276a83bfdb6919abc63..69058a5835f2bac0d1e56ce0917909df0fb9a92b 100644
(file)
--- a/
youtube_dl/extractor/gamestar.py
+++ b/
youtube_dl/extractor/gamestar.py
@@
-13,7
+13,7
@@
from ..utils import (
class GameStarIE(InfoExtractor):
class GameStarIE(InfoExtractor):
- _VALID_URL = r'http://www\.gamestar\.de/videos/.*,(?P<id>[0-9]+)\.html'
+ _VALID_URL = r'http
s?
://www\.gamestar\.de/videos/.*,(?P<id>[0-9]+)\.html'
_TEST = {
'url': 'http://www.gamestar.de/videos/trailer,3/hobbit-3-die-schlacht-der-fuenf-heere,76110.html',
'md5': '96974ecbb7fd8d0d20fca5a00810cea7',
_TEST = {
'url': 'http://www.gamestar.de/videos/trailer,3/hobbit-3-die-schlacht-der-fuenf-heere,76110.html',
'md5': '96974ecbb7fd8d0d20fca5a00810cea7',
diff --git
a/youtube_dl/extractor/gametrailers.py
b/youtube_dl/extractor/gametrailers.py
index c3f031d9cd4341184cc3b70eea77c1f360a1a3c6..1e7948ab816f5b08ee6dbeb39de1d5f50fbdf314 100644
(file)
--- a/
youtube_dl/extractor/gametrailers.py
+++ b/
youtube_dl/extractor/gametrailers.py
@@
-9,7
+9,7
@@
from ..utils import (
class GametrailersIE(InfoExtractor):
class GametrailersIE(InfoExtractor):
- _VALID_URL = r'http://www\.gametrailers\.com/videos/view/[^/]+/(?P<id>.+)'
+ _VALID_URL = r'http
s?
://www\.gametrailers\.com/videos/view/[^/]+/(?P<id>.+)'
_TEST = {
'url': 'http://www.gametrailers.com/videos/view/gametrailers-com/116437-Just-Cause-3-Review',
_TEST = {
'url': 'http://www.gametrailers.com/videos/view/gametrailers-com/116437-Just-Cause-3-Review',
diff --git
a/youtube_dl/extractor/hotnewhiphop.py
b/youtube_dl/extractor/hotnewhiphop.py
index 31e219945412398909053ff464245763a671ae19..efc3e8429956b38016e3b9a6c7d84cbaed367ff8 100644
(file)
--- a/
youtube_dl/extractor/hotnewhiphop.py
+++ b/
youtube_dl/extractor/hotnewhiphop.py
@@
-12,7
+12,7
@@
from ..utils import (
class HotNewHipHopIE(InfoExtractor):
class HotNewHipHopIE(InfoExtractor):
- _VALID_URL = r'http://www\.hotnewhiphop\.com/.*\.(?P<id>.*)\.html'
+ _VALID_URL = r'http
s?
://www\.hotnewhiphop\.com/.*\.(?P<id>.*)\.html'
_TEST = {
'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',
_TEST = {
'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',
diff --git
a/youtube_dl/extractor/hypem.py
b/youtube_dl/extractor/hypem.py
index b3706fe6d6cd8dfabb8d8b614baf1a6e12ea75d9..e0ab318022ba4291771d2e9d146566e4f0437daf 100644
(file)
--- a/
youtube_dl/extractor/hypem.py
+++ b/
youtube_dl/extractor/hypem.py
@@
-12,7
+12,7
@@
from ..utils import (
class HypemIE(InfoExtractor):
class HypemIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?hypem\.com/track/(?P<id>[^/]+)/'
+ _VALID_URL = r'http
s?
://(?:www\.)?hypem\.com/track/(?P<id>[^/]+)/'
_TEST = {
'url': 'http://hypem.com/track/1v6ga/BODYWORK+-+TAME',
'md5': 'b9cc91b5af8995e9f0c1cee04c575828',
_TEST = {
'url': 'http://hypem.com/track/1v6ga/BODYWORK+-+TAME',
'md5': 'b9cc91b5af8995e9f0c1cee04c575828',
diff --git
a/youtube_dl/extractor/imdb.py
b/youtube_dl/extractor/imdb.py
index b61b2dc4e0e36867c55dcd62068466f1080a22ad..8bed8ccd06e2eeb64eba69f3407c9271c0643731 100644
(file)
--- a/
youtube_dl/extractor/imdb.py
+++ b/
youtube_dl/extractor/imdb.py
@@
-12,7
+12,7
@@
from ..utils import (
class ImdbIE(InfoExtractor):
IE_NAME = 'imdb'
IE_DESC = 'Internet Movie Database trailers'
class ImdbIE(InfoExtractor):
IE_NAME = 'imdb'
IE_DESC = 'Internet Movie Database trailers'
- _VALID_URL = r'http://(?:www|m)\.imdb\.com/video/imdb/vi(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www|m)\.imdb\.com/video/imdb/vi(?P<id>\d+)'
_TEST = {
'url': 'http://www.imdb.com/video/imdb/vi2524815897',
_TEST = {
'url': 'http://www.imdb.com/video/imdb/vi2524815897',
@@
-70,7
+70,7
@@
class ImdbIE(InfoExtractor):
class ImdbListIE(InfoExtractor):
IE_NAME = 'imdb:list'
IE_DESC = 'Internet Movie Database lists'
class ImdbListIE(InfoExtractor):
IE_NAME = 'imdb:list'
IE_DESC = 'Internet Movie Database lists'
- _VALID_URL = r'http://www\.imdb\.com/list/(?P<id>[\da-zA-Z_-]{11})'
+ _VALID_URL = r'http
s?
://www\.imdb\.com/list/(?P<id>[\da-zA-Z_-]{11})'
_TEST = {
'url': 'http://www.imdb.com/list/JFs9NWw6XI0',
'info_dict': {
_TEST = {
'url': 'http://www.imdb.com/list/JFs9NWw6XI0',
'info_dict': {
diff --git
a/youtube_dl/extractor/iqiyi.py
b/youtube_dl/extractor/iqiyi.py
index e7c0cb3f66ab542e79f86238d2db991047d6d453..1a4c647136f75a2c1460c7a9c8075baa8c502831 100644
(file)
--- a/
youtube_dl/extractor/iqiyi.py
+++ b/
youtube_dl/extractor/iqiyi.py
@@
-165,7
+165,7
@@
class IqiyiIE(InfoExtractor):
IE_NAME = 'iqiyi'
IE_DESC = '爱奇艺'
IE_NAME = 'iqiyi'
IE_DESC = '爱奇艺'
- _VALID_URL = r'http://(?:[^.]+\.)?iqiyi\.com/.+\.html'
+ _VALID_URL = r'http
s?
://(?:[^.]+\.)?iqiyi\.com/.+\.html'
_NETRC_MACHINE = 'iqiyi'
_NETRC_MACHINE = 'iqiyi'
diff --git
a/youtube_dl/extractor/jadorecettepub.py
b/youtube_dl/extractor/jadorecettepub.py
index 063e86de46c896c94be505ae916fd6f3fbdedc02..158c09a33a77a00a6766a572a4a18572a883dded 100644
(file)
--- a/
youtube_dl/extractor/jadorecettepub.py
+++ b/
youtube_dl/extractor/jadorecettepub.py
@@
-9,7
+9,7
@@
from .youtube import YoutubeIE
class JadoreCettePubIE(InfoExtractor):
class JadoreCettePubIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?jadorecettepub\.com/[0-9]{4}/[0-9]{2}/(?P<id>.*?)\.html'
+ _VALID_URL = r'http
s?
://(?:www\.)?jadorecettepub\.com/[0-9]{4}/[0-9]{2}/(?P<id>.*?)\.html'
_TEST = {
'url': 'http://www.jadorecettepub.com/2010/12/star-wars-massacre-par-les-japonais.html',
_TEST = {
'url': 'http://www.jadorecettepub.com/2010/12/star-wars-massacre-par-les-japonais.html',
diff --git
a/youtube_dl/extractor/jeuxvideo.py
b/youtube_dl/extractor/jeuxvideo.py
index 137db873cc09f7e57b258bcf65b8331d8b36b8c0..1a4227f6b4b0ef7370b0f09613ef9d4b8916b435 100644
(file)
--- a/
youtube_dl/extractor/jeuxvideo.py
+++ b/
youtube_dl/extractor/jeuxvideo.py
@@
-8,7
+8,7
@@
from .common import InfoExtractor
class JeuxVideoIE(InfoExtractor):
class JeuxVideoIE(InfoExtractor):
- _VALID_URL = r'http://.*?\.jeuxvideo\.com/.*/(.*?)\.htm'
+ _VALID_URL = r'http
s?
://.*?\.jeuxvideo\.com/.*/(.*?)\.htm'
_TESTS = [{
'url': 'http://www.jeuxvideo.com/reportages-videos-jeux/0004/00046170/tearaway-playstation-vita-gc-2013-tearaway-nous-presente-ses-papiers-d-identite-00115182.htm',
_TESTS = [{
'url': 'http://www.jeuxvideo.com/reportages-videos-jeux/0004/00046170/tearaway-playstation-vita-gc-2013-tearaway-nous-presente-ses-papiers-d-identite-00115182.htm',
diff --git
a/youtube_dl/extractor/karaoketv.py
b/youtube_dl/extractor/karaoketv.py
index 06daf5a89ce3ffde4d71d7dc8ceee9441840b72b..b4c30b7f3145fef78ec107d402c97927f1a8ad2e 100644
(file)
--- a/
youtube_dl/extractor/karaoketv.py
+++ b/
youtube_dl/extractor/karaoketv.py
@@
-9,7
+9,7
@@
from ..utils import (
class KaraoketvIE(InfoExtractor):
class KaraoketvIE(InfoExtractor):
- _VALID_URL = r'http://karaoketv\.co\.il/\?container=songs&id=(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://karaoketv\.co\.il/\?container=songs&id=(?P<id>[0-9]+)'
_TEST = {
'url': 'http://karaoketv.co.il/?container=songs&id=171568',
'info_dict': {
_TEST = {
'url': 'http://karaoketv.co.il/?container=songs&id=171568',
'info_dict': {
diff --git
a/youtube_dl/extractor/karrierevideos.py
b/youtube_dl/extractor/karrierevideos.py
index bed94bc9338d158c77087d4e74ef341aa236f94f..2cb04e533d2e5c7caf5d3be062b9c0a51635cb1c 100644
(file)
--- a/
youtube_dl/extractor/karrierevideos.py
+++ b/
youtube_dl/extractor/karrierevideos.py
@@
-12,7
+12,7
@@
from ..utils import (
class KarriereVideosIE(InfoExtractor):
class KarriereVideosIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?karrierevideos\.at(?:/[^/]+)+/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?karrierevideos\.at(?:/[^/]+)+/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://www.karrierevideos.at/berufsvideos/mittlere-hoehere-schulen/altenpflegerin',
'info_dict': {
_TESTS = [{
'url': 'http://www.karrierevideos.at/berufsvideos/mittlere-hoehere-schulen/altenpflegerin',
'info_dict': {
diff --git
a/youtube_dl/extractor/kontrtube.py
b/youtube_dl/extractor/kontrtube.py
index a59c529f4c90d8f3211a783ec5e4e2d3f7be9d84..704bd7b34554af60dfec9b811251f5270cbd1f55 100644
(file)
--- a/
youtube_dl/extractor/kontrtube.py
+++ b/
youtube_dl/extractor/kontrtube.py
@@
-13,7
+13,7
@@
from ..utils import (
class KontrTubeIE(InfoExtractor):
IE_NAME = 'kontrtube'
IE_DESC = 'KontrTube.ru - Труба зовёт'
class KontrTubeIE(InfoExtractor):
IE_NAME = 'kontrtube'
IE_DESC = 'KontrTube.ru - Труба зовёт'
- _VALID_URL = r'http://(?:www\.)?kontrtube\.ru/videos/(?P<id>\d+)/(?P<display_id>[^/]+)/'
+ _VALID_URL = r'http
s?
://(?:www\.)?kontrtube\.ru/videos/(?P<id>\d+)/(?P<display_id>[^/]+)/'
_TEST = {
'url': 'http://www.kontrtube.ru/videos/2678/nad-olimpiyskoy-derevney-v-sochi-podnyat-rossiyskiy-flag/',
_TEST = {
'url': 'http://www.kontrtube.ru/videos/2678/nad-olimpiyskoy-derevney-v-sochi-podnyat-rossiyskiy-flag/',
diff --git
a/youtube_dl/extractor/ku6.py
b/youtube_dl/extractor/ku6.py
index a602980a141f3f8ccce026eaddc8b383e7894352..a574408e55b6a5ee251d94ca1d0346b9e34ac0b8 100644
(file)
--- a/
youtube_dl/extractor/ku6.py
+++ b/
youtube_dl/extractor/ku6.py
@@
-4,7
+4,7
@@
from .common import InfoExtractor
class Ku6IE(InfoExtractor):
class Ku6IE(InfoExtractor):
- _VALID_URL = r'http://v\.ku6\.com/show/(?P<id>[a-zA-Z0-9\-\_]+)(?:\.)*html'
+ _VALID_URL = r'http
s?
://v\.ku6\.com/show/(?P<id>[a-zA-Z0-9\-\_]+)(?:\.)*html'
_TEST = {
'url': 'http://v.ku6.com/show/JG-8yS14xzBr4bCn1pu0xw...html',
'md5': '01203549b9efbb45f4b87d55bdea1ed1',
_TEST = {
'url': 'http://v.ku6.com/show/JG-8yS14xzBr4bCn1pu0xw...html',
'md5': '01203549b9efbb45f4b87d55bdea1ed1',
diff --git
a/youtube_dl/extractor/kusi.py
b/youtube_dl/extractor/kusi.py
index 931f34c9b5694e3b9ba27859b0be79bbcecf1274..12cc56e444aaa63839664c8e70f82154045041c7 100644
(file)
--- a/
youtube_dl/extractor/kusi.py
+++ b/
youtube_dl/extractor/kusi.py
@@
-16,7
+16,7
@@
from ..utils import (
class KUSIIE(InfoExtractor):
class KUSIIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?kusi\.com/(?P<path>story/.+|video\?clipId=(?P<clipId>\d+))'
+ _VALID_URL = r'http
s?
://(?:www\.)?kusi\.com/(?P<path>story/.+|video\?clipId=(?P<clipId>\d+))'
_TESTS = [{
'url': 'http://www.kusi.com/story/31183873/turko-files-case-closed-put-on-hold',
'md5': 'f926e7684294cf8cb7bdf8858e1b3988',
_TESTS = [{
'url': 'http://www.kusi.com/story/31183873/turko-files-case-closed-put-on-hold',
'md5': 'f926e7684294cf8cb7bdf8858e1b3988',
diff --git
a/youtube_dl/extractor/kuwo.py
b/youtube_dl/extractor/kuwo.py
index 45d65e61f58a860afc72c3131a04edd29e2b7263..a586308b2d31e8bbac83b8446c5e00dd9b2bdce9 100644
(file)
--- a/
youtube_dl/extractor/kuwo.py
+++ b/
youtube_dl/extractor/kuwo.py
@@
-55,7
+55,7
@@
class KuwoBaseIE(InfoExtractor):
class KuwoIE(KuwoBaseIE):
IE_NAME = 'kuwo:song'
IE_DESC = '酷我音乐'
class KuwoIE(KuwoBaseIE):
IE_NAME = 'kuwo:song'
IE_DESC = '酷我音乐'
- _VALID_URL = r'http://www\.kuwo\.cn/yinyue/(?P<id>\d+?)'
+ _VALID_URL = r'http
s?
://www\.kuwo\.cn/yinyue/(?P<id>\d+?)'
_TESTS = [{
'url': 'http://www.kuwo.cn/yinyue/635632/',
'info_dict': {
_TESTS = [{
'url': 'http://www.kuwo.cn/yinyue/635632/',
'info_dict': {
@@
-134,7
+134,7
@@
class KuwoIE(KuwoBaseIE):
class KuwoAlbumIE(InfoExtractor):
IE_NAME = 'kuwo:album'
IE_DESC = '酷我音乐 - 专辑'
class KuwoAlbumIE(InfoExtractor):
IE_NAME = 'kuwo:album'
IE_DESC = '酷我音乐 - 专辑'
- _VALID_URL = r'http://www\.kuwo\.cn/album/(?P<id>\d+?)/'
+ _VALID_URL = r'http
s?
://www\.kuwo\.cn/album/(?P<id>\d+?)/'
_TEST = {
'url': 'http://www.kuwo.cn/album/502294/',
'info_dict': {
_TEST = {
'url': 'http://www.kuwo.cn/album/502294/',
'info_dict': {
@@
-170,7
+170,7
@@
class KuwoAlbumIE(InfoExtractor):
class KuwoChartIE(InfoExtractor):
IE_NAME = 'kuwo:chart'
IE_DESC = '酷我音乐 - 排行榜'
class KuwoChartIE(InfoExtractor):
IE_NAME = 'kuwo:chart'
IE_DESC = '酷我音乐 - 排行榜'
- _VALID_URL = r'http://yinyue\.kuwo\.cn/billboard_(?P<id>[^.]+).htm'
+ _VALID_URL = r'http
s?
://yinyue\.kuwo\.cn/billboard_(?P<id>[^.]+).htm'
_TEST = {
'url': 'http://yinyue.kuwo.cn/billboard_香港中文龙虎榜.htm',
'info_dict': {
_TEST = {
'url': 'http://yinyue.kuwo.cn/billboard_香港中文龙虎榜.htm',
'info_dict': {
@@
-195,7
+195,7
@@
class KuwoChartIE(InfoExtractor):
class KuwoSingerIE(InfoExtractor):
IE_NAME = 'kuwo:singer'
IE_DESC = '酷我音乐 - 歌手'
class KuwoSingerIE(InfoExtractor):
IE_NAME = 'kuwo:singer'
IE_DESC = '酷我音乐 - 歌手'
- _VALID_URL = r'http://www\.kuwo\.cn/mingxing/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://www\.kuwo\.cn/mingxing/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://www.kuwo.cn/mingxing/bruno+mars/',
'info_dict': {
_TESTS = [{
'url': 'http://www.kuwo.cn/mingxing/bruno+mars/',
'info_dict': {
@@
-251,7
+251,7
@@
class KuwoSingerIE(InfoExtractor):
class KuwoCategoryIE(InfoExtractor):
IE_NAME = 'kuwo:category'
IE_DESC = '酷我音乐 - 分类'
class KuwoCategoryIE(InfoExtractor):
IE_NAME = 'kuwo:category'
IE_DESC = '酷我音乐 - 分类'
- _VALID_URL = r'http://yinyue\.kuwo\.cn/yy/cinfo_(?P<id>\d+?).htm'
+ _VALID_URL = r'http
s?
://yinyue\.kuwo\.cn/yy/cinfo_(?P<id>\d+?).htm'
_TEST = {
'url': 'http://yinyue.kuwo.cn/yy/cinfo_86375.htm',
'info_dict': {
_TEST = {
'url': 'http://yinyue.kuwo.cn/yy/cinfo_86375.htm',
'info_dict': {
@@
-288,7
+288,7
@@
class KuwoCategoryIE(InfoExtractor):
class KuwoMvIE(KuwoBaseIE):
IE_NAME = 'kuwo:mv'
IE_DESC = '酷我音乐 - MV'
class KuwoMvIE(KuwoBaseIE):
IE_NAME = 'kuwo:mv'
IE_DESC = '酷我音乐 - MV'
- _VALID_URL = r'http://www\.kuwo\.cn/mv/(?P<id>\d+?)/'
+ _VALID_URL = r'http
s?
://www\.kuwo\.cn/mv/(?P<id>\d+?)/'
_TEST = {
'url': 'http://www.kuwo.cn/mv/6480076/',
'info_dict': {
_TEST = {
'url': 'http://www.kuwo.cn/mv/6480076/',
'info_dict': {
diff --git
a/youtube_dl/extractor/leeco.py
b/youtube_dl/extractor/leeco.py
index df47e88ba98a8d69d2dca43cf20ccb7366232f57..462b752dd9b85af0f845f5677bc3128eb6780590 100644
(file)
--- a/
youtube_dl/extractor/leeco.py
+++ b/
youtube_dl/extractor/leeco.py
@@
-28,7
+28,7
@@
from ..utils import (
class LeIE(InfoExtractor):
IE_DESC = '乐视网'
class LeIE(InfoExtractor):
IE_DESC = '乐视网'
- _VALID_URL = r'http://www\.le\.com/ptv/vplay/(?P<id>\d+)\.html'
+ _VALID_URL = r'http
s?
://www\.le\.com/ptv/vplay/(?P<id>\d+)\.html'
_URL_TEMPLATE = 'http://www.le.com/ptv/vplay/%s.html'
_URL_TEMPLATE = 'http://www.le.com/ptv/vplay/%s.html'
@@
-196,7
+196,7
@@
class LeIE(InfoExtractor):
class LePlaylistIE(InfoExtractor):
class LePlaylistIE(InfoExtractor):
- _VALID_URL = r'http://[a-z]+\.le\.com/[a-z]+/(?P<id>[a-z0-9_]+)'
+ _VALID_URL = r'http
s?
://[a-z]+\.le\.com/[a-z]+/(?P<id>[a-z0-9_]+)'
_TESTS = [{
'url': 'http://www.le.com/tv/46177.html',
_TESTS = [{
'url': 'http://www.le.com/tv/46177.html',
diff --git
a/youtube_dl/extractor/lifenews.py
b/youtube_dl/extractor/lifenews.py
index a8fd639cc9276c2290f9c89dbded1bb9a1cbe7dd..ba2f80a757d071042b8d574721bde37a1b7006ba 100644
(file)
--- a/
youtube_dl/extractor/lifenews.py
+++ b/
youtube_dl/extractor/lifenews.py
@@
-17,7
+17,7
@@
from ..utils import (
class LifeNewsIE(InfoExtractor):
IE_NAME = 'lifenews'
IE_DESC = 'LIFE | NEWS'
class LifeNewsIE(InfoExtractor):
IE_NAME = 'lifenews'
IE_DESC = 'LIFE | NEWS'
- _VALID_URL = r'http://lifenews\.ru/(?:mobile/)?(?P<section>news|video)/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://lifenews\.ru/(?:mobile/)?(?P<section>news|video)/(?P<id>\d+)'
_TESTS = [{
# single video embedded via video/source
_TESTS = [{
# single video embedded via video/source
@@
-159,7
+159,7
@@
class LifeNewsIE(InfoExtractor):
class LifeEmbedIE(InfoExtractor):
IE_NAME = 'life:embed'
class LifeEmbedIE(InfoExtractor):
IE_NAME = 'life:embed'
- _VALID_URL = r'http://embed\.life\.ru/embed/(?P<id>[\da-f]{32})'
+ _VALID_URL = r'http
s?
://embed\.life\.ru/embed/(?P<id>[\da-f]{32})'
_TEST = {
'url': 'http://embed.life.ru/embed/e50c2dec2867350528e2574c899b8291',
_TEST = {
'url': 'http://embed.life.ru/embed/e50c2dec2867350528e2574c899b8291',
diff --git
a/youtube_dl/extractor/limelight.py
b/youtube_dl/extractor/limelight.py
index 1a0625ac3e0eeefa5ca18e968ae69e210a960662..2599d45c37e3c7874e12227677962fae3a2fbf84 100644
(file)
--- a/
youtube_dl/extractor/limelight.py
+++ b/
youtube_dl/extractor/limelight.py
@@
-123,7
+123,7
@@
class LimelightBaseIE(InfoExtractor):
class LimelightMediaIE(LimelightBaseIE):
IE_NAME = 'limelight'
class LimelightMediaIE(LimelightBaseIE):
IE_NAME = 'limelight'
- _VALID_URL = r'(?:limelight:media:|http://link\.videoplatform\.limelight\.com/media/\??\bmediaId=)(?P<id>[a-z0-9]{32})'
+ _VALID_URL = r'(?:limelight:media:|http
s?
://link\.videoplatform\.limelight\.com/media/\??\bmediaId=)(?P<id>[a-z0-9]{32})'
_TESTS = [{
'url': 'http://link.videoplatform.limelight.com/media/?mediaId=3ffd040b522b4485b6d84effc750cd86',
'info_dict': {
_TESTS = [{
'url': 'http://link.videoplatform.limelight.com/media/?mediaId=3ffd040b522b4485b6d84effc750cd86',
'info_dict': {
@@
-176,7
+176,7
@@
class LimelightMediaIE(LimelightBaseIE):
class LimelightChannelIE(LimelightBaseIE):
IE_NAME = 'limelight:channel'
class LimelightChannelIE(LimelightBaseIE):
IE_NAME = 'limelight:channel'
- _VALID_URL = r'(?:limelight:channel:|http://link\.videoplatform\.limelight\.com/media/\??\bchannelId=)(?P<id>[a-z0-9]{32})'
+ _VALID_URL = r'(?:limelight:channel:|http
s?
://link\.videoplatform\.limelight\.com/media/\??\bchannelId=)(?P<id>[a-z0-9]{32})'
_TEST = {
'url': 'http://link.videoplatform.limelight.com/media/?channelId=ab6a524c379342f9b23642917020c082',
'info_dict': {
_TEST = {
'url': 'http://link.videoplatform.limelight.com/media/?channelId=ab6a524c379342f9b23642917020c082',
'info_dict': {
@@
-207,7
+207,7
@@
class LimelightChannelIE(LimelightBaseIE):
class LimelightChannelListIE(LimelightBaseIE):
IE_NAME = 'limelight:channel_list'
class LimelightChannelListIE(LimelightBaseIE):
IE_NAME = 'limelight:channel_list'
- _VALID_URL = r'(?:limelight:channel_list:|http://link\.videoplatform\.limelight\.com/media/\?.*?\bchannelListId=)(?P<id>[a-z0-9]{32})'
+ _VALID_URL = r'(?:limelight:channel_list:|http
s?
://link\.videoplatform\.limelight\.com/media/\?.*?\bchannelListId=)(?P<id>[a-z0-9]{32})'
_TEST = {
'url': 'http://link.videoplatform.limelight.com/media/?channelListId=301b117890c4465c8179ede21fd92e2b',
'info_dict': {
_TEST = {
'url': 'http://link.videoplatform.limelight.com/media/?channelListId=301b117890c4465c8179ede21fd92e2b',
'info_dict': {
diff --git
a/youtube_dl/extractor/m6.py
b/youtube_dl/extractor/m6.py
index 7e025831b51d611f00e248bda637b4ae8f35efb6..d5945ad66b3a784263fb1c5106534081b1f04913 100644
(file)
--- a/
youtube_dl/extractor/m6.py
+++ b/
youtube_dl/extractor/m6.py
@@
-8,7
+8,7
@@
from .common import InfoExtractor
class M6IE(InfoExtractor):
IE_NAME = 'm6'
class M6IE(InfoExtractor):
IE_NAME = 'm6'
- _VALID_URL = r'http://(?:www\.)?m6\.fr/[^/]+/videos/(?P<id>\d+)-[^\.]+\.html'
+ _VALID_URL = r'http
s?
://(?:www\.)?m6\.fr/[^/]+/videos/(?P<id>\d+)-[^\.]+\.html'
_TEST = {
'url': 'http://www.m6.fr/emission-les_reines_du_shopping/videos/11323908-emeline_est_la_reine_du_shopping_sur_le_theme_ma_fete_d_8217_anniversaire.html',
_TEST = {
'url': 'http://www.m6.fr/emission-les_reines_du_shopping/videos/11323908-emeline_est_la_reine_du_shopping_sur_le_theme_ma_fete_d_8217_anniversaire.html',
diff --git
a/youtube_dl/extractor/metacafe.py
b/youtube_dl/extractor/metacafe.py
index 67d6271e1ad107aceddaa2c8b4bd96558426bfce..c31e8798ae7ccdbaa8ef9baa481336ef8a5e8dd9 100644
(file)
--- a/
youtube_dl/extractor/metacafe.py
+++ b/
youtube_dl/extractor/metacafe.py
@@
-17,7
+17,7
@@
from ..utils import (
class MetacafeIE(InfoExtractor):
class MetacafeIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+ _VALID_URL = r'http
s?
://(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
IE_NAME = 'metacafe'
_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
IE_NAME = 'metacafe'
diff --git
a/youtube_dl/extractor/mit.py
b/youtube_dl/extractor/mit.py
index 819c1b90bb755c873b3f7f1b64e07dc97126a9b9..1aea78d118a84a135494214da54c3c2c21465bc9 100644
(file)
--- a/
youtube_dl/extractor/mit.py
+++ b/
youtube_dl/extractor/mit.py
@@
-91,7
+91,7
@@
class MITIE(TechTVMITIE):
class OCWMITIE(InfoExtractor):
IE_NAME = 'ocw.mit.edu'
class OCWMITIE(InfoExtractor):
IE_NAME = 'ocw.mit.edu'
- _VALID_URL = r'^http://ocw\.mit\.edu/courses/(?P<topic>[a-z0-9\-]+)'
+ _VALID_URL = r'^http
s?
://ocw\.mit\.edu/courses/(?P<topic>[a-z0-9\-]+)'
_BASE_URL = 'http://ocw.mit.edu/'
_TESTS = [
_BASE_URL = 'http://ocw.mit.edu/'
_TESTS = [
diff --git
a/youtube_dl/extractor/mitele.py
b/youtube_dl/extractor/mitele.py
index c595f20775efd8e4aed348e4886ac55209e2c6e2..9e584860a2e4ac98596093b701910c0060d978b9 100644
(file)
--- a/
youtube_dl/extractor/mitele.py
+++ b/
youtube_dl/extractor/mitele.py
@@
-14,7
+14,7
@@
from ..utils import (
class MiTeleIE(InfoExtractor):
IE_DESC = 'mitele.es'
class MiTeleIE(InfoExtractor):
IE_DESC = 'mitele.es'
- _VALID_URL = r'http://www\.mitele\.es/[^/]+/[^/]+/[^/]+/(?P<id>[^/]+)/'
+ _VALID_URL = r'http
s?
://www\.mitele\.es/[^/]+/[^/]+/[^/]+/(?P<id>[^/]+)/'
_TESTS = [{
'url': 'http://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144/',
_TESTS = [{
'url': 'http://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144/',
diff --git
a/youtube_dl/extractor/mooshare.py
b/youtube_dl/extractor/mooshare.py
index 7cc7f054f6bba16b0ea44554de4a515bf7020342..f010f52d50b40685000c8eab0e20b1373badcc9d 100644
(file)
--- a/
youtube_dl/extractor/mooshare.py
+++ b/
youtube_dl/extractor/mooshare.py
@@
-13,7
+13,7
@@
from ..utils import (
class MooshareIE(InfoExtractor):
IE_NAME = 'mooshare'
IE_DESC = 'Mooshare.biz'
class MooshareIE(InfoExtractor):
IE_NAME = 'mooshare'
IE_DESC = 'Mooshare.biz'
- _VALID_URL = r'http://(?:www\.)?mooshare\.biz/(?P<id>[\da-z]{12})'
+ _VALID_URL = r'http
s?
://(?:www\.)?mooshare\.biz/(?P<id>[\da-z]{12})'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/motherless.py
b/youtube_dl/extractor/motherless.py
index 0b4787c1d23daa2ed8ed4065df9baa9ab706521b..ad04b12cd761f53ae90e31a0a230635cf6782fcc 100644
(file)
--- a/
youtube_dl/extractor/motherless.py
+++ b/
youtube_dl/extractor/motherless.py
@@
-12,7
+12,7
@@
from ..utils import (
class MotherlessIE(InfoExtractor):
class MotherlessIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?motherless\.com/(?:g/[a-z0-9_]+/)?(?P<id>[A-Z0-9]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?motherless\.com/(?:g/[a-z0-9_]+/)?(?P<id>[A-Z0-9]+)'
_TESTS = [{
'url': 'http://motherless.com/AC3FFE1',
'md5': '310f62e325a9fafe64f68c0bccb6e75f',
_TESTS = [{
'url': 'http://motherless.com/AC3FFE1',
'md5': '310f62e325a9fafe64f68c0bccb6e75f',
diff --git
a/youtube_dl/extractor/motorsport.py
b/youtube_dl/extractor/motorsport.py
index c1a482dba39fb98efdb28e85b681565eb58e3f9e..370328b362c2a0661925d054be121a7216dc94c7 100644
(file)
--- a/
youtube_dl/extractor/motorsport.py
+++ b/
youtube_dl/extractor/motorsport.py
@@
-9,7
+9,7
@@
from ..compat import (
class MotorsportIE(InfoExtractor):
IE_DESC = 'motorsport.com'
class MotorsportIE(InfoExtractor):
IE_DESC = 'motorsport.com'
- _VALID_URL = r'http://www\.motorsport\.com/[^/?#]+/video/(?:[^/?#]+/)(?P<id>[^/]+)/?(?:$|[?#])'
+ _VALID_URL = r'http
s?
://www\.motorsport\.com/[^/?#]+/video/(?:[^/?#]+/)(?P<id>[^/]+)/?(?:$|[?#])'
_TEST = {
'url': 'http://www.motorsport.com/f1/video/main-gallery/red-bull-racing-2014-rules-explained/',
'info_dict': {
_TEST = {
'url': 'http://www.motorsport.com/f1/video/main-gallery/red-bull-racing-2014-rules-explained/',
'info_dict': {
diff --git
a/youtube_dl/extractor/myspass.py
b/youtube_dl/extractor/myspass.py
index f936b92bbdbb031485fd66fb8dc802b3ba9ff9b3..1ca7b1a9e958c221f44c48bced04c314c0957f8c 100644
(file)
--- a/
youtube_dl/extractor/myspass.py
+++ b/
youtube_dl/extractor/myspass.py
@@
-11,7
+11,7
@@
from ..utils import (
class MySpassIE(InfoExtractor):
class MySpassIE(InfoExtractor):
- _VALID_URL = r'http://www\.myspass\.de/.*'
+ _VALID_URL = r'http
s?
://www\.myspass\.de/.*'
_TEST = {
'url': 'http://www.myspass.de/myspass/shows/tvshows/absolute-mehrheit/Absolute-Mehrheit-vom-17022013-Die-Highlights-Teil-2--/11741/',
'md5': '0b49f4844a068f8b33f4b7c88405862b',
_TEST = {
'url': 'http://www.myspass.de/myspass/shows/tvshows/absolute-mehrheit/Absolute-Mehrheit-vom-17022013-Die-Highlights-Teil-2--/11741/',
'md5': '0b49f4844a068f8b33f4b7c88405862b',
diff --git
a/youtube_dl/extractor/myvideo.py
b/youtube_dl/extractor/myvideo.py
index 1e21cf98a9a415a33a4bb563dd296928c27426b6..c83a1eab5ba6b90229422bce078c9ae170fa5069 100644
(file)
--- a/
youtube_dl/extractor/myvideo.py
+++ b/
youtube_dl/extractor/myvideo.py
@@
-20,7
+20,7
@@
from ..utils import (
class MyVideoIE(InfoExtractor):
_WORKING = False
class MyVideoIE(InfoExtractor):
_WORKING = False
- _VALID_URL = r'http://(?:www\.)?myvideo\.de/(?:[^/]+/)?watch/(?P<id>[0-9]+)/[^?/]+.*'
+ _VALID_URL = r'http
s?
://(?:www\.)?myvideo\.de/(?:[^/]+/)?watch/(?P<id>[0-9]+)/[^?/]+.*'
IE_NAME = 'myvideo'
_TEST = {
'url': 'http://www.myvideo.de/watch/8229274/bowling_fail_or_win',
IE_NAME = 'myvideo'
_TEST = {
'url': 'http://www.myvideo.de/watch/8229274/bowling_fail_or_win',
diff --git
a/youtube_dl/extractor/myvidster.py
b/youtube_dl/extractor/myvidster.py
index a94ab8358cacc51094ab791ace648ec062eb5f94..731c245428103b3ea96f5c396b063afadac82702 100644
(file)
--- a/
youtube_dl/extractor/myvidster.py
+++ b/
youtube_dl/extractor/myvidster.py
@@
-4,7
+4,7
@@
from .common import InfoExtractor
class MyVidsterIE(InfoExtractor):
class MyVidsterIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?myvidster\.com/video/(?P<id>\d+)/'
+ _VALID_URL = r'http
s?
://(?:www\.)?myvidster\.com/video/(?P<id>\d+)/'
_TEST = {
'url': 'http://www.myvidster.com/video/32059805/Hot_chemistry_with_raw_love_making',
_TEST = {
'url': 'http://www.myvidster.com/video/32059805/Hot_chemistry_with_raw_love_making',
diff --git
a/youtube_dl/extractor/nationalgeographic.py
b/youtube_dl/extractor/nationalgeographic.py
index 7ce8d9b182ca78401e772ebef5311a37c7819ee0..d5e53365cc52d93da99953a774871e862ca3cc2a 100644
(file)
--- a/
youtube_dl/extractor/nationalgeographic.py
+++ b/
youtube_dl/extractor/nationalgeographic.py
@@
-8,7
+8,7
@@
from ..utils import (
class NationalGeographicIE(InfoExtractor):
class NationalGeographicIE(InfoExtractor):
- _VALID_URL = r'http://video\.nationalgeographic\.com/.*?'
+ _VALID_URL = r'http
s?
://video\.nationalgeographic\.com/.*?'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/nbc.py
b/youtube_dl/extractor/nbc.py
index bb0817e34ea98edb641580d356b901fee2200c7b..a622f2212d8af38519b2906f6b27d5c0ad0dac57 100644
(file)
--- a/
youtube_dl/extractor/nbc.py
+++ b/
youtube_dl/extractor/nbc.py
@@
-115,7
+115,7
@@
class NBCSportsVPlayerIE(InfoExtractor):
class NBCSportsIE(InfoExtractor):
# Does not include https because its certificate is invalid
class NBCSportsIE(InfoExtractor):
# Does not include https because its certificate is invalid
- _VALID_URL = r'http://www\.nbcsports\.com//?(?:[^/]+/)+(?P<id>[0-9a-z-]+)'
+ _VALID_URL = r'http
s?
://www\.nbcsports\.com//?(?:[^/]+/)+(?P<id>[0-9a-z-]+)'
_TEST = {
'url': 'http://www.nbcsports.com//college-basketball/ncaab/tom-izzo-michigan-st-has-so-much-respect-duke',
_TEST = {
'url': 'http://www.nbcsports.com//college-basketball/ncaab/tom-izzo-michigan-st-has-so-much-respect-duke',
@@
-295,7
+295,7
@@
class NBCNewsIE(ThePlatformIE):
class MSNBCIE(InfoExtractor):
# https URLs redirect to corresponding http ones
class MSNBCIE(InfoExtractor):
# https URLs redirect to corresponding http ones
- _VALID_URL = r'http://www\.msnbc\.com/[^/]+/watch/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://www\.msnbc\.com/[^/]+/watch/(?P<id>[^/]+)'
_TEST = {
'url': 'http://www.msnbc.com/all-in-with-chris-hayes/watch/the-chaotic-gop-immigration-vote-314487875924',
'md5': '6d236bf4f3dddc226633ce6e2c3f814d',
_TEST = {
'url': 'http://www.msnbc.com/all-in-with-chris-hayes/watch/the-chaotic-gop-immigration-vote-314487875924',
'md5': '6d236bf4f3dddc226633ce6e2c3f814d',
diff --git
a/youtube_dl/extractor/nextmedia.py
b/youtube_dl/extractor/nextmedia.py
index d1688457f28d298e7de2921dcf00e3fba6c087a2..aae7aeeebb8e2adebd2669bcd899caec3432275d 100644
(file)
--- a/
youtube_dl/extractor/nextmedia.py
+++ b/
youtube_dl/extractor/nextmedia.py
@@
-7,7
+7,7
@@
from ..utils import parse_iso8601
class NextMediaIE(InfoExtractor):
IE_DESC = '蘋果日報'
class NextMediaIE(InfoExtractor):
IE_DESC = '蘋果日報'
- _VALID_URL = r'http://hk.apple.nextmedia.com/[^/]+/[^/]+/(?P<date>\d+)/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://hk.apple.nextmedia.com/[^/]+/[^/]+/(?P<date>\d+)/(?P<id>\d+)'
_TESTS = [{
'url': 'http://hk.apple.nextmedia.com/realtime/news/20141108/53109199',
'md5': 'dff9fad7009311c421176d1ac90bfe4f',
_TESTS = [{
'url': 'http://hk.apple.nextmedia.com/realtime/news/20141108/53109199',
'md5': 'dff9fad7009311c421176d1ac90bfe4f',
@@
-68,7
+68,7
@@
class NextMediaIE(InfoExtractor):
class NextMediaActionNewsIE(NextMediaIE):
IE_DESC = '蘋果日報 - 動新聞'
class NextMediaActionNewsIE(NextMediaIE):
IE_DESC = '蘋果日報 - 動新聞'
- _VALID_URL = r'http://hk.dv.nextmedia.com/actionnews/[^/]+/(?P<date>\d+)/(?P<id>\d+)/\d+'
+ _VALID_URL = r'http
s?
://hk.dv.nextmedia.com/actionnews/[^/]+/(?P<date>\d+)/(?P<id>\d+)/\d+'
_TESTS = [{
'url': 'http://hk.dv.nextmedia.com/actionnews/hit/20150121/19009428/20061460',
'md5': '05fce8ffeed7a5e00665d4b7cf0f9201',
_TESTS = [{
'url': 'http://hk.dv.nextmedia.com/actionnews/hit/20150121/19009428/20061460',
'md5': '05fce8ffeed7a5e00665d4b7cf0f9201',
@@
-93,7
+93,7
@@
class NextMediaActionNewsIE(NextMediaIE):
class AppleDailyIE(NextMediaIE):
IE_DESC = '臺灣蘋果日報'
class AppleDailyIE(NextMediaIE):
IE_DESC = '臺灣蘋果日報'
- _VALID_URL = r'http://(www|ent).appledaily.com.tw/(?:animation|appledaily|enews|realtimenews)/[^/]+/[^/]+/(?P<date>\d+)/(?P<id>\d+)(/.*)?'
+ _VALID_URL = r'http
s?
://(www|ent).appledaily.com.tw/(?:animation|appledaily|enews|realtimenews)/[^/]+/[^/]+/(?P<date>\d+)/(?P<id>\d+)(/.*)?'
_TESTS = [{
'url': 'http://ent.appledaily.com.tw/enews/article/entertainment/20150128/36354694',
'md5': 'a843ab23d150977cc55ef94f1e2c1e4d',
_TESTS = [{
'url': 'http://ent.appledaily.com.tw/enews/article/entertainment/20150128/36354694',
'md5': 'a843ab23d150977cc55ef94f1e2c1e4d',
diff --git
a/youtube_dl/extractor/noco.py
b/youtube_dl/extractor/noco.py
index d440313d545b18723614d8eb9b8dc738a4cf476c..ec7317a2f6d16911562285871167786e31902c62 100644
(file)
--- a/
youtube_dl/extractor/noco.py
+++ b/
youtube_dl/extractor/noco.py
@@
-22,7
+22,7
@@
from ..utils import (
class NocoIE(InfoExtractor):
class NocoIE(InfoExtractor):
- _VALID_URL = r'http://(?:(?:www\.)?noco\.tv/emission/|player\.noco\.tv/\?idvideo=)(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:(?:www\.)?noco\.tv/emission/|player\.noco\.tv/\?idvideo=)(?P<id>\d+)'
_LOGIN_URL = 'http://noco.tv/do.php'
_API_URL_TEMPLATE = 'https://api.noco.tv/1.1/%s?ts=%s&tk=%s'
_SUB_LANG_TEMPLATE = '&sub_lang=%s'
_LOGIN_URL = 'http://noco.tv/do.php'
_API_URL_TEMPLATE = 'https://api.noco.tv/1.1/%s?ts=%s&tk=%s'
_SUB_LANG_TEMPLATE = '&sub_lang=%s'
diff --git
a/youtube_dl/extractor/normalboots.py
b/youtube_dl/extractor/normalboots.py
index 5952d136f7b3efd3e9f91843ba12de6a13d989ba..77e09107299824f5ae4063817d73e505e893c2af 100644
(file)
--- a/
youtube_dl/extractor/normalboots.py
+++ b/
youtube_dl/extractor/normalboots.py
@@
-9,7
+9,7
@@
from ..utils import (
class NormalbootsIE(InfoExtractor):
class NormalbootsIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?normalboots\.com/video/(?P<id>[0-9a-z-]*)/?$'
+ _VALID_URL = r'http
s?
://(?:www\.)?normalboots\.com/video/(?P<id>[0-9a-z-]*)/?$'
_TEST = {
'url': 'http://normalboots.com/video/home-alone-games-jontron/',
'md5': '8bf6de238915dd501105b44ef5f1e0f6',
_TEST = {
'url': 'http://normalboots.com/video/home-alone-games-jontron/',
'md5': '8bf6de238915dd501105b44ef5f1e0f6',
diff --git
a/youtube_dl/extractor/nova.py
b/youtube_dl/extractor/nova.py
index 72f72b80313fd1a0796247d2aee123f791c285b7..17671ad398b9e9a8148bceff74db678969d26d3f 100644
(file)
--- a/
youtube_dl/extractor/nova.py
+++ b/
youtube_dl/extractor/nova.py
@@
-12,7
+12,7
@@
from ..utils import (
class NovaIE(InfoExtractor):
IE_DESC = 'TN.cz, Prásk.tv, Nova.cz, Novaplus.cz, FANDA.tv, Krásná.cz and Doma.cz'
class NovaIE(InfoExtractor):
IE_DESC = 'TN.cz, Prásk.tv, Nova.cz, Novaplus.cz, FANDA.tv, Krásná.cz and Doma.cz'
- _VALID_URL = r'http://(?:[^.]+\.)?(?P<site>tv(?:noviny)?|tn|novaplus|vymena|fanda|krasna|doma|prask)\.nova\.cz/(?:[^/]+/)+(?P<id>[^/]+?)(?:\.html|/|$)'
+ _VALID_URL = r'http
s?
://(?:[^.]+\.)?(?P<site>tv(?:noviny)?|tn|novaplus|vymena|fanda|krasna|doma|prask)\.nova\.cz/(?:[^/]+/)+(?P<id>[^/]+?)(?:\.html|/|$)'
_TESTS = [{
'url': 'http://tvnoviny.nova.cz/clanek/novinky/co-na-sebe-sportaci-praskli-vime-jestli-pujde-hrdlicka-na-materskou.html?utm_source=tvnoviny&utm_medium=cpfooter&utm_campaign=novaplus',
'info_dict': {
_TESTS = [{
'url': 'http://tvnoviny.nova.cz/clanek/novinky/co-na-sebe-sportaci-praskli-vime-jestli-pujde-hrdlicka-na-materskou.html?utm_source=tvnoviny&utm_medium=cpfooter&utm_campaign=novaplus',
'info_dict': {
diff --git
a/youtube_dl/extractor/npr.py
b/youtube_dl/extractor/npr.py
index 125c7010b9206bce25688c5c3cbad576753f70f0..a3f0abb4eda4afdfb7afb5e6dec168874431e716 100644
(file)
--- a/
youtube_dl/extractor/npr.py
+++ b/
youtube_dl/extractor/npr.py
@@
-9,7
+9,7
@@
from ..utils import (
class NprIE(InfoExtractor):
class NprIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?npr\.org/player/v2/mediaPlayer\.html\?.*\bid=(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?npr\.org/player/v2/mediaPlayer\.html\?.*\bid=(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.npr.org/player/v2/mediaPlayer.html?id=449974205',
'info_dict': {
_TESTS = [{
'url': 'http://www.npr.org/player/v2/mediaPlayer.html?id=449974205',
'info_dict': {
diff --git
a/youtube_dl/extractor/ntvru.py
b/youtube_dl/extractor/ntvru.py
index 2cd924d059dafd9aa3734697c9c4a396b2bb01f6..0895d7ea4cb88f805605a55cb0c1fe56ff1d475d 100644
(file)
--- a/
youtube_dl/extractor/ntvru.py
+++ b/
youtube_dl/extractor/ntvru.py
@@
-11,7
+11,7
@@
from ..utils import (
class NTVRuIE(InfoExtractor):
IE_NAME = 'ntv.ru'
class NTVRuIE(InfoExtractor):
IE_NAME = 'ntv.ru'
- _VALID_URL = r'http://(?:www\.)?ntv\.ru/(?P<id>.+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?ntv\.ru/(?P<id>.+)'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/orf.py
b/youtube_dl/extractor/orf.py
index 958eb398b992e4d3b4278ebe362f71074e87c19b..66c75f8b3559752127c091d437e4764b7c722e9d 100644
(file)
--- a/
youtube_dl/extractor/orf.py
+++ b/
youtube_dl/extractor/orf.py
@@
-137,7
+137,7
@@
class ORFTVthekIE(InfoExtractor):
class ORFOE1IE(InfoExtractor):
IE_NAME = 'orf:oe1'
IE_DESC = 'Radio Österreich 1'
class ORFOE1IE(InfoExtractor):
IE_NAME = 'orf:oe1'
IE_DESC = 'Radio Österreich 1'
- _VALID_URL = r'http://oe1\.orf\.at/(?:programm/|konsole.*?#\?track_id=)(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://oe1\.orf\.at/(?:programm/|konsole.*?#\?track_id=)(?P<id>[0-9]+)'
# Audios on ORF radio are only available for 7 days, so we can't add tests.
_TEST = {
# Audios on ORF radio are only available for 7 days, so we can't add tests.
_TEST = {
@@
-171,7
+171,7
@@
class ORFOE1IE(InfoExtractor):
class ORFFM4IE(InfoExtractor):
IE_NAME = 'orf:fm4'
IE_DESC = 'radio FM4'
class ORFFM4IE(InfoExtractor):
IE_NAME = 'orf:fm4'
IE_DESC = 'radio FM4'
- _VALID_URL = r'http://fm4\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)'
+ _VALID_URL = r'http
s?
://fm4\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)'
_TEST = {
'url': 'http://fm4.orf.at/player/20160110/IS/',
_TEST = {
'url': 'http://fm4.orf.at/player/20160110/IS/',
@@
-222,7
+222,7
@@
class ORFFM4IE(InfoExtractor):
class ORFIPTVIE(InfoExtractor):
IE_NAME = 'orf:iptv'
IE_DESC = 'iptv.ORF.at'
class ORFIPTVIE(InfoExtractor):
IE_NAME = 'orf:iptv'
IE_DESC = 'iptv.ORF.at'
- _VALID_URL = r'http://iptv\.orf\.at/(?:#/)?stories/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://iptv\.orf\.at/(?:#/)?stories/(?P<id>\d+)'
_TEST = {
'url': 'http://iptv.orf.at/stories/2275236/',
_TEST = {
'url': 'http://iptv.orf.at/stories/2275236/',
diff --git
a/youtube_dl/extractor/philharmoniedeparis.py
b/youtube_dl/extractor/philharmoniedeparis.py
index 6e60e5fe98920c64d310c3610194d98b01790ceb..f1008ae514f78f6c843e399031135afb00f5f23f 100644
(file)
--- a/
youtube_dl/extractor/philharmoniedeparis.py
+++ b/
youtube_dl/extractor/philharmoniedeparis.py
@@
-12,7
+12,7
@@
from ..utils import (
class PhilharmonieDeParisIE(InfoExtractor):
IE_DESC = 'Philharmonie de Paris'
class PhilharmonieDeParisIE(InfoExtractor):
IE_DESC = 'Philharmonie de Paris'
- _VALID_URL = r'http://live\.philharmoniedeparis\.fr/(?:[Cc]oncert/|misc/Playlist\.ashx\?id=)(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://live\.philharmoniedeparis\.fr/(?:[Cc]oncert/|misc/Playlist\.ashx\?id=)(?P<id>\d+)'
_TESTS = [{
'url': 'http://live.philharmoniedeparis.fr/concert/1032066.html',
'info_dict': {
_TESTS = [{
'url': 'http://live.philharmoniedeparis.fr/concert/1032066.html',
'info_dict': {
diff --git
a/youtube_dl/extractor/photobucket.py
b/youtube_dl/extractor/photobucket.py
index 788411ccc18082f59588d40704900c26dba1fe21..6c8bbe1d95c3c4972baa4c956ad1a62ef6518e2d 100644
(file)
--- a/
youtube_dl/extractor/photobucket.py
+++ b/
youtube_dl/extractor/photobucket.py
@@
-8,7
+8,7
@@
from ..compat import compat_urllib_parse_unquote
class PhotobucketIE(InfoExtractor):
class PhotobucketIE(InfoExtractor):
- _VALID_URL = r'http://(?:[a-z0-9]+\.)?photobucket\.com/.*(([\?\&]current=)|_)(?P<id>.*)\.(?P<ext>(flv)|(mp4))'
+ _VALID_URL = r'http
s?
://(?:[a-z0-9]+\.)?photobucket\.com/.*(([\?\&]current=)|_)(?P<id>.*)\.(?P<ext>(flv)|(mp4))'
_TEST = {
'url': 'http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0',
'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
_TEST = {
'url': 'http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0',
'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
diff --git
a/youtube_dl/extractor/pornhd.py
b/youtube_dl/extractor/pornhd.py
index 57c78ba52a994a9c2aff224470b86b913702241f..39b53ecf68c77786f18956040bf7ccac4fd6dbc5 100644
(file)
--- a/
youtube_dl/extractor/pornhd.py
+++ b/
youtube_dl/extractor/pornhd.py
@@
-12,7
+12,7
@@
from ..utils import (
class PornHdIE(InfoExtractor):
class PornHdIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?pornhd\.com/(?:[a-z]{2,4}/)?videos/(?P<id>\d+)(?:/(?P<display_id>.+))?'
+ _VALID_URL = r'http
s?
://(?:www\.)?pornhd\.com/(?:[a-z]{2,4}/)?videos/(?P<id>\d+)(?:/(?P<display_id>.+))?'
_TEST = {
'url': 'http://www.pornhd.com/videos/1962/sierra-day-gets-his-cum-all-over-herself-hd-porn-video',
'md5': '956b8ca569f7f4d8ec563e2c41598441',
_TEST = {
'url': 'http://www.pornhd.com/videos/1962/sierra-day-gets-his-cum-all-over-herself-hd-porn-video',
'md5': '956b8ca569f7f4d8ec563e2c41598441',
diff --git
a/youtube_dl/extractor/pornovoisines.py
b/youtube_dl/extractor/pornovoisines.py
index 1a53fd71c068626e3d91e737c9b295f4e0a1b0a9..6b51e5c5400ee59859eb0d29cb740a31f34f3a96 100644
(file)
--- a/
youtube_dl/extractor/pornovoisines.py
+++ b/
youtube_dl/extractor/pornovoisines.py
@@
-13,7
+13,7
@@
from ..utils import (
class PornoVoisinesIE(InfoExtractor):
class PornoVoisinesIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?pornovoisines\.com/showvideo/(?P<id>\d+)/(?P<display_id>[^/]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?pornovoisines\.com/showvideo/(?P<id>\d+)/(?P<display_id>[^/]+)'
_VIDEO_URL_TEMPLATE = 'http://stream%d.pornovoisines.com' \
'/static/media/video/transcoded/%s-640x360-1000-trscded.mp4'
_VIDEO_URL_TEMPLATE = 'http://stream%d.pornovoisines.com' \
'/static/media/video/transcoded/%s-640x360-1000-trscded.mp4'
diff --git
a/youtube_dl/extractor/pyvideo.py
b/youtube_dl/extractor/pyvideo.py
index 30a5f2de4475a934cfa467764d0ce559d3e68a74..cc0416cb81eb23ed87d1dae0cdf2573a6df8936a 100644
(file)
--- a/
youtube_dl/extractor/pyvideo.py
+++ b/
youtube_dl/extractor/pyvideo.py
@@
-7,7
+7,7
@@
from .common import InfoExtractor
class PyvideoIE(InfoExtractor):
class PyvideoIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?pyvideo\.org/video/(?P<id>\d+)/(.*)'
+ _VALID_URL = r'http
s?
://(?:www\.)?pyvideo\.org/video/(?P<id>\d+)/(.*)'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/qqmusic.py
b/youtube_dl/extractor/qqmusic.py
index 45a3c41c59438b8784434fb2c5dbfb9cef3c1674..ff0af9543c2b5e5527f406958e9ae5ae4d1adbda 100644
(file)
--- a/
youtube_dl/extractor/qqmusic.py
+++ b/
youtube_dl/extractor/qqmusic.py
@@
-18,7
+18,7
@@
from ..utils import (
class QQMusicIE(InfoExtractor):
IE_NAME = 'qqmusic'
IE_DESC = 'QQ音乐'
class QQMusicIE(InfoExtractor):
IE_NAME = 'qqmusic'
IE_DESC = 'QQ音乐'
- _VALID_URL = r'http://y.qq.com/#type=song&mid=(?P<id>[0-9A-Za-z]+)'
+ _VALID_URL = r'http
s?
://y.qq.com/#type=song&mid=(?P<id>[0-9A-Za-z]+)'
_TESTS = [{
'url': 'http://y.qq.com/#type=song&mid=004295Et37taLD',
'md5': '9ce1c1c8445f561506d2e3cfb0255705',
_TESTS = [{
'url': 'http://y.qq.com/#type=song&mid=004295Et37taLD',
'md5': '9ce1c1c8445f561506d2e3cfb0255705',
@@
-172,7
+172,7
@@
class QQPlaylistBaseIE(InfoExtractor):
class QQMusicSingerIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:singer'
IE_DESC = 'QQ音乐 - 歌手'
class QQMusicSingerIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:singer'
IE_DESC = 'QQ音乐 - 歌手'
- _VALID_URL = r'http://y.qq.com/#type=singer&mid=(?P<id>[0-9A-Za-z]+)'
+ _VALID_URL = r'http
s?
://y.qq.com/#type=singer&mid=(?P<id>[0-9A-Za-z]+)'
_TEST = {
'url': 'http://y.qq.com/#type=singer&mid=001BLpXF2DyJe2',
'info_dict': {
_TEST = {
'url': 'http://y.qq.com/#type=singer&mid=001BLpXF2DyJe2',
'info_dict': {
@@
-217,7
+217,7
@@
class QQMusicSingerIE(QQPlaylistBaseIE):
class QQMusicAlbumIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:album'
IE_DESC = 'QQ音乐 - 专辑'
class QQMusicAlbumIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:album'
IE_DESC = 'QQ音乐 - 专辑'
- _VALID_URL = r'http://y.qq.com/#type=album&mid=(?P<id>[0-9A-Za-z]+)'
+ _VALID_URL = r'http
s?
://y.qq.com/#type=album&mid=(?P<id>[0-9A-Za-z]+)'
_TESTS = [{
'url': 'http://y.qq.com/#type=album&mid=000gXCTb2AhRR1',
_TESTS = [{
'url': 'http://y.qq.com/#type=album&mid=000gXCTb2AhRR1',
@@
-260,7
+260,7
@@
class QQMusicAlbumIE(QQPlaylistBaseIE):
class QQMusicToplistIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:toplist'
IE_DESC = 'QQ音乐 - 排行榜'
class QQMusicToplistIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:toplist'
IE_DESC = 'QQ音乐 - 排行榜'
- _VALID_URL = r'http://y\.qq\.com/#type=toplist&p=(?P<id>(top|global)_[0-9]+)'
+ _VALID_URL = r'http
s?
://y\.qq\.com/#type=toplist&p=(?P<id>(top|global)_[0-9]+)'
_TESTS = [{
'url': 'http://y.qq.com/#type=toplist&p=global_123',
_TESTS = [{
'url': 'http://y.qq.com/#type=toplist&p=global_123',
@@
-314,7
+314,7
@@
class QQMusicToplistIE(QQPlaylistBaseIE):
class QQMusicPlaylistIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:playlist'
IE_DESC = 'QQ音乐 - 歌单'
class QQMusicPlaylistIE(QQPlaylistBaseIE):
IE_NAME = 'qqmusic:playlist'
IE_DESC = 'QQ音乐 - 歌单'
- _VALID_URL = r'http://y\.qq\.com/#type=taoge&id=(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://y\.qq\.com/#type=taoge&id=(?P<id>[0-9]+)'
_TESTS = [{
'url': 'http://y.qq.com/#type=taoge&id=3462654915',
_TESTS = [{
'url': 'http://y.qq.com/#type=taoge&id=3462654915',
diff --git
a/youtube_dl/extractor/rai.py
b/youtube_dl/extractor/rai.py
index a4dc5c335e152ce47424a73263dc208d942d31ab..e36ce1aa1940deafd5a633bec814e7462008c3b1 100644
(file)
--- a/
youtube_dl/extractor/rai.py
+++ b/
youtube_dl/extractor/rai.py
@@
-18,7
+18,7
@@
from ..utils import (
class RaiTVIE(InfoExtractor):
class RaiTVIE(InfoExtractor):
- _VALID_URL = r'http://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/(?:[^/]+/)+media/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/(?:[^/]+/)+media/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
_TESTS = [
{
'url': 'http://www.rai.tv/dl/RaiTV/programmi/media/ContentItem-cb27157f-9dd0-4aee-b788-b1f67643a391.html',
_TESTS = [
{
'url': 'http://www.rai.tv/dl/RaiTV/programmi/media/ContentItem-cb27157f-9dd0-4aee-b788-b1f67643a391.html',
@@
-175,7
+175,7
@@
class RaiTVIE(InfoExtractor):
class RaiIE(InfoExtractor):
class RaiIE(InfoExtractor):
- _VALID_URL = r'http://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?(?:rai\.it|rai\.tv|rainews\.it)/dl/.+?-(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})(?:-.+?)?\.html'
_TESTS = [
{
'url': 'http://www.report.rai.it/dl/Report/puntata/ContentItem-0c7a664b-d0f4-4b2c-8835-3f82e46f433e.html',
_TESTS = [
{
'url': 'http://www.report.rai.it/dl/Report/puntata/ContentItem-0c7a664b-d0f4-4b2c-8835-3f82e46f433e.html',
diff --git
a/youtube_dl/extractor/redtube.py
b/youtube_dl/extractor/redtube.py
index d6054d7175fd49a22117dd357bea7905f6e739be..7ba41ba593295cdc7d2e28e6b64702321ed1ef08 100644
(file)
--- a/
youtube_dl/extractor/redtube.py
+++ b/
youtube_dl/extractor/redtube.py
@@
-5,7
+5,7
@@
from ..utils import ExtractorError
class RedTubeIE(InfoExtractor):
class RedTubeIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?redtube\.com/(?P<id>[0-9]+)'
_TEST = {
'url': 'http://www.redtube.com/66418',
'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
_TEST = {
'url': 'http://www.redtube.com/66418',
'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
diff --git
a/youtube_dl/extractor/ringtv.py
b/youtube_dl/extractor/ringtv.py
index 50875807577d076cd81c2021aa7695334ef272da..2c2c707bd36ad3f737072bf1f9011027e0514bd9 100644
(file)
--- a/
youtube_dl/extractor/ringtv.py
+++ b/
youtube_dl/extractor/ringtv.py
@@
-6,7
+6,7
@@
from .common import InfoExtractor
class RingTVIE(InfoExtractor):
class RingTVIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?ringtv\.craveonline\.com/(?P<type>news|videos/video)/(?P<id>[^/?#]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?ringtv\.craveonline\.com/(?P<type>news|videos/video)/(?P<id>[^/?#]+)'
_TEST = {
'url': 'http://ringtv.craveonline.com/news/310833-luis-collazo-says-victor-ortiz-better-not-quit-on-jan-30',
'md5': 'd25945f5df41cdca2d2587165ac28720',
_TEST = {
'url': 'http://ringtv.craveonline.com/news/310833-luis-collazo-says-victor-ortiz-better-not-quit-on-jan-30',
'md5': 'd25945f5df41cdca2d2587165ac28720',
diff --git
a/youtube_dl/extractor/rtve.py
b/youtube_dl/extractor/rtve.py
index 8a8c5d2a0e2b27bd6e476ef7d848753fbe648dd5..08cd1ae6cd3a138d6a12ca147cdca51613922f6e 100644
(file)
--- a/
youtube_dl/extractor/rtve.py
+++ b/
youtube_dl/extractor/rtve.py
@@
-62,7
+62,7
@@
def _decrypt_url(png):
class RTVEALaCartaIE(InfoExtractor):
IE_NAME = 'rtve.es:alacarta'
IE_DESC = 'RTVE a la carta'
class RTVEALaCartaIE(InfoExtractor):
IE_NAME = 'rtve.es:alacarta'
IE_DESC = 'RTVE a la carta'
- _VALID_URL = r'http://www\.rtve\.es/(m/)?alacarta/videos/[^/]+/[^/]+/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://www\.rtve\.es/(m/)?alacarta/videos/[^/]+/[^/]+/(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.rtve.es/alacarta/videos/balonmano/o-swiss-cup-masculina-final-espana-suecia/2491869/',
_TESTS = [{
'url': 'http://www.rtve.es/alacarta/videos/balonmano/o-swiss-cup-masculina-final-espana-suecia/2491869/',
@@
-179,7
+179,7
@@
class RTVEInfantilIE(InfoExtractor):
class RTVELiveIE(InfoExtractor):
IE_NAME = 'rtve.es:live'
IE_DESC = 'RTVE.es live streams'
class RTVELiveIE(InfoExtractor):
IE_NAME = 'rtve.es:live'
IE_DESC = 'RTVE.es live streams'
- _VALID_URL = r'http://www\.rtve\.es/directo/(?P<id>[a-zA-Z0-9-]+)'
+ _VALID_URL = r'http
s?
://www\.rtve\.es/directo/(?P<id>[a-zA-Z0-9-]+)'
_TESTS = [{
'url': 'http://www.rtve.es/directo/la-1/',
_TESTS = [{
'url': 'http://www.rtve.es/directo/la-1/',
diff --git
a/youtube_dl/extractor/ruhd.py
b/youtube_dl/extractor/ruhd.py
index 0e470e73f538fd60d7ed34cbe515042f6abc078b..1f7c262993c8ce7e0d602f612fc6316e80052f66 100644
(file)
--- a/
youtube_dl/extractor/ruhd.py
+++ b/
youtube_dl/extractor/ruhd.py
@@
-5,7
+5,7
@@
from .common import InfoExtractor
class RUHDIE(InfoExtractor):
class RUHDIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?ruhd\.ru/play\.php\?vid=(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?ruhd\.ru/play\.php\?vid=(?P<id>\d+)'
_TEST = {
'url': 'http://www.ruhd.ru/play.php?vid=207',
'md5': 'd1a9ec4edf8598e3fbd92bb16072ba83',
_TEST = {
'url': 'http://www.ruhd.ru/play.php?vid=207',
'md5': 'd1a9ec4edf8598e3fbd92bb16072ba83',
diff --git
a/youtube_dl/extractor/rutube.py
b/youtube_dl/extractor/rutube.py
index c5c47d01ecef917ce037fc0ede75dd2b5e770138..9ca4ae147cb1e3c430de3abd9fd0927aaee2ed5a 100644
(file)
--- a/
youtube_dl/extractor/rutube.py
+++ b/
youtube_dl/extractor/rutube.py
@@
-122,7
+122,7
@@
class RutubeEmbedIE(InfoExtractor):
class RutubeChannelIE(InfoExtractor):
IE_NAME = 'rutube:channel'
IE_DESC = 'Rutube channels'
class RutubeChannelIE(InfoExtractor):
IE_NAME = 'rutube:channel'
IE_DESC = 'Rutube channels'
- _VALID_URL = r'http://rutube\.ru/tags/video/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://rutube\.ru/tags/video/(?P<id>\d+)'
_TESTS = [{
'url': 'http://rutube.ru/tags/video/1800/',
'info_dict': {
_TESTS = [{
'url': 'http://rutube.ru/tags/video/1800/',
'info_dict': {
@@
-156,7
+156,7
@@
class RutubeChannelIE(InfoExtractor):
class RutubeMovieIE(RutubeChannelIE):
IE_NAME = 'rutube:movie'
IE_DESC = 'Rutube movies'
class RutubeMovieIE(RutubeChannelIE):
IE_NAME = 'rutube:movie'
IE_DESC = 'Rutube movies'
- _VALID_URL = r'http://rutube\.ru/metainfo/tv/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://rutube\.ru/metainfo/tv/(?P<id>\d+)'
_TESTS = []
_MOVIE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/?format=json'
_TESTS = []
_MOVIE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/?format=json'
@@
-174,7
+174,7
@@
class RutubeMovieIE(RutubeChannelIE):
class RutubePersonIE(RutubeChannelIE):
IE_NAME = 'rutube:person'
IE_DESC = 'Rutube person videos'
class RutubePersonIE(RutubeChannelIE):
IE_NAME = 'rutube:person'
IE_DESC = 'Rutube person videos'
- _VALID_URL = r'http://rutube\.ru/video/person/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://rutube\.ru/video/person/(?P<id>\d+)'
_TESTS = [{
'url': 'http://rutube.ru/video/person/313878/',
'info_dict': {
_TESTS = [{
'url': 'http://rutube.ru/video/person/313878/',
'info_dict': {
diff --git
a/youtube_dl/extractor/screenjunkies.py
b/youtube_dl/extractor/screenjunkies.py
index f2af15f6b43ef5cd205db383cd01c283069dd05b..dd0a6ba19d4ef3b9397af6d977277256cbc0e1e9 100644
(file)
--- a/
youtube_dl/extractor/screenjunkies.py
+++ b/
youtube_dl/extractor/screenjunkies.py
@@
-11,7
+11,7
@@
from ..utils import (
class ScreenJunkiesIE(InfoExtractor):
class ScreenJunkiesIE(InfoExtractor):
- _VALID_URL = r'http://www.screenjunkies.com/video/(?P<display_id>[^/]+?)(?:-(?P<id>\d+))?(?:[/?#&]|$)'
+ _VALID_URL = r'http
s?
://www.screenjunkies.com/video/(?P<display_id>[^/]+?)(?:-(?P<id>\d+))?(?:[/?#&]|$)'
_TESTS = [{
'url': 'http://www.screenjunkies.com/video/best-quentin-tarantino-movie-2841915',
'md5': '5c2b686bec3d43de42bde9ec047536b0',
_TESTS = [{
'url': 'http://www.screenjunkies.com/video/best-quentin-tarantino-movie-2841915',
'md5': '5c2b686bec3d43de42bde9ec047536b0',
diff --git
a/youtube_dl/extractor/senateisvp.py
b/youtube_dl/extractor/senateisvp.py
index 4d3b585228570769f1c4ece0955ff2e6c0b6b73c..c5f474dd1d8a5040a5368de7f2aa050658f7a984 100644
(file)
--- a/
youtube_dl/extractor/senateisvp.py
+++ b/
youtube_dl/extractor/senateisvp.py
@@
-48,7
+48,7
@@
class SenateISVPIE(InfoExtractor):
['arch', '', 'http://ussenate-f.akamaihd.net/']
]
_IE_NAME = 'senate.gov'
['arch', '', 'http://ussenate-f.akamaihd.net/']
]
_IE_NAME = 'senate.gov'
- _VALID_URL = r'http://www\.senate\.gov/isvp/?\?(?P<qs>.+)'
+ _VALID_URL = r'http
s?
://www\.senate\.gov/isvp/?\?(?P<qs>.+)'
_TESTS = [{
'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
'info_dict': {
_TESTS = [{
'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
'info_dict': {
diff --git
a/youtube_dl/extractor/shared.py
b/youtube_dl/extractor/shared.py
index 8eda3c8648a093213426437e151d217a1115da92..96fe0b90d91b080218ca387d8a4403130171358d 100644
(file)
--- a/
youtube_dl/extractor/shared.py
+++ b/
youtube_dl/extractor/shared.py
@@
-13,7
+13,7
@@
from ..utils import (
class SharedIE(InfoExtractor):
IE_DESC = 'shared.sx and vivo.sx'
class SharedIE(InfoExtractor):
IE_DESC = 'shared.sx and vivo.sx'
- _VALID_URL = r'http://(?:shared|vivo)\.sx/(?P<id>[\da-z]{10})'
+ _VALID_URL = r'http
s?
://(?:shared|vivo)\.sx/(?P<id>[\da-z]{10})'
_TESTS = [{
'url': 'http://shared.sx/0060718775',
_TESTS = [{
'url': 'http://shared.sx/0060718775',
diff --git
a/youtube_dl/extractor/sport5.py
b/youtube_dl/extractor/sport5.py
index dfe50ed4585b0fe876b8a300edd00a453ae4b690..7e67833062d0a21d2c663b1b5d24246d653f0116 100644
(file)
--- a/
youtube_dl/extractor/sport5.py
+++ b/
youtube_dl/extractor/sport5.py
@@
-8,7
+8,7
@@
from ..utils import ExtractorError
class Sport5IE(InfoExtractor):
class Sport5IE(InfoExtractor):
- _VALID_URL = r'http://(?:www|vod)?\.sport5\.co\.il/.*\b(?:Vi|docID)=(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www|vod)?\.sport5\.co\.il/.*\b(?:Vi|docID)=(?P<id>\d+)'
_TESTS = [
{
'url': 'http://vod.sport5.co.il/?Vc=147&Vi=176331&Page=1',
_TESTS = [
{
'url': 'http://vod.sport5.co.il/?Vc=147&Vi=176331&Page=1',
diff --git
a/youtube_dl/extractor/ssa.py
b/youtube_dl/extractor/ssa.py
index 13101c7146244181f62a634b773da446e2f5e79a..54d1843f2200d0cef7fa2e7b192f673d316c5f18 100644
(file)
--- a/
youtube_dl/extractor/ssa.py
+++ b/
youtube_dl/extractor/ssa.py
@@
-8,7
+8,7
@@
from ..utils import (
class SSAIE(InfoExtractor):
class SSAIE(InfoExtractor):
- _VALID_URL = r'http://ssa\.nls\.uk/film/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://ssa\.nls\.uk/film/(?P<id>\d+)'
_TEST = {
'url': 'http://ssa.nls.uk/film/3561',
'info_dict': {
_TEST = {
'url': 'http://ssa.nls.uk/film/3561',
'info_dict': {
diff --git
a/youtube_dl/extractor/sztvhu.py
b/youtube_dl/extractor/sztvhu.py
index aa5964acb6b3f40b0d663bd2169ac6aec0c210ae..f562aa6d386ee891f4ab3a724bef53e20a6cec92 100644
(file)
--- a/
youtube_dl/extractor/sztvhu.py
+++ b/
youtube_dl/extractor/sztvhu.py
@@
-5,7
+5,7
@@
from .common import InfoExtractor
class SztvHuIE(InfoExtractor):
class SztvHuIE(InfoExtractor):
- _VALID_URL = r'http://(?:(?:www\.)?sztv\.hu|www\.tvszombathely\.hu)/(?:[^/]+)/.+-(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://(?:(?:www\.)?sztv\.hu|www\.tvszombathely\.hu)/(?:[^/]+)/.+-(?P<id>[0-9]+)'
_TEST = {
'url': 'http://sztv.hu/hirek/cserkeszek-nepszerusitettek-a-kornyezettudatos-eletmodot-a-savaria-teren-20130909',
'md5': 'a6df607b11fb07d0e9f2ad94613375cb',
_TEST = {
'url': 'http://sztv.hu/hirek/cserkeszek-nepszerusitettek-a-kornyezettudatos-eletmodot-a-savaria-teren-20130909',
'md5': 'a6df607b11fb07d0e9f2ad94613375cb',
diff --git
a/youtube_dl/extractor/teamcoco.py
b/youtube_dl/extractor/teamcoco.py
index d1b7264b4ca4a0cb72e491da26d7f5bbc1cc66b7..b49ab5f5b98c2d6219d1d17a1c0aea02eb534f61 100644
(file)
--- a/
youtube_dl/extractor/teamcoco.py
+++ b/
youtube_dl/extractor/teamcoco.py
@@
-16,7
+16,7
@@
from ..compat import compat_ord
class TeamcocoIE(InfoExtractor):
class TeamcocoIE(InfoExtractor):
- _VALID_URL = r'http://teamcoco\.com/video/(?P<video_id>[0-9]+)?/?(?P<display_id>.*)'
+ _VALID_URL = r'http
s?
://teamcoco\.com/video/(?P<video_id>[0-9]+)?/?(?P<display_id>.*)'
_TESTS = [
{
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
_TESTS = [
{
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
diff --git
a/youtube_dl/extractor/tele13.py
b/youtube_dl/extractor/tele13.py
index 4e860db0a906f7892a2f155483bd66f7e34cecc2..a29a64b6d5d2fbcec5667902eba259cefb679125 100644
(file)
--- a/
youtube_dl/extractor/tele13.py
+++ b/
youtube_dl/extractor/tele13.py
@@
-11,7
+11,7
@@
from ..utils import (
class Tele13IE(InfoExtractor):
class Tele13IE(InfoExtractor):
- _VALID_URL = r'^http://(?:www\.)?t13\.cl/videos(?:/[^/]+)+/(?P<id>[\w-]+)'
+ _VALID_URL = r'^http
s?
://(?:www\.)?t13\.cl/videos(?:/[^/]+)+/(?P<id>[\w-]+)'
_TESTS = [
{
'url': 'http://www.t13.cl/videos/actualidad/el-circulo-de-hierro-de-michelle-bachelet-en-su-regreso-a-la-moneda',
_TESTS = [
{
'url': 'http://www.t13.cl/videos/actualidad/el-circulo-de-hierro-de-michelle-bachelet-en-su-regreso-a-la-moneda',
diff --git
a/youtube_dl/extractor/tf1.py
b/youtube_dl/extractor/tf1.py
index 9ee84468488c61979f35b527dad0b617133f04b2..3f54b2744cb16cd6385e5cb06919cbaf9628167a 100644
(file)
--- a/
youtube_dl/extractor/tf1.py
+++ b/
youtube_dl/extractor/tf1.py
@@
-6,7
+6,7
@@
from .common import InfoExtractor
class TF1IE(InfoExtractor):
"""TF1 uses the wat.tv player."""
class TF1IE(InfoExtractor):
"""TF1 uses the wat.tv player."""
- _VALID_URL = r'http://(?:(?:videos|www|lci)\.tf1|www\.tfou)\.fr/(?:[^/]+/)*(?P<id>.+?)\.html'
+ _VALID_URL = r'http
s?
://(?:(?:videos|www|lci)\.tf1|www\.tfou)\.fr/(?:[^/]+/)*(?P<id>.+?)\.html'
_TESTS = [{
'url': 'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',
'info_dict': {
_TESTS = [{
'url': 'http://videos.tf1.fr/auto-moto/citroen-grand-c4-picasso-2013-presentation-officielle-8062060.html',
'info_dict': {
diff --git
a/youtube_dl/extractor/thvideo.py
b/youtube_dl/extractor/thvideo.py
index 496f15d80b478f94bc2aac86c3d20417e2b09925..406f4a826623c0335e973a0f6dd79744fb32e982 100644
(file)
--- a/
youtube_dl/extractor/thvideo.py
+++ b/
youtube_dl/extractor/thvideo.py
@@
-10,7
+10,7
@@
from ..utils import (
class THVideoIE(InfoExtractor):
class THVideoIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?thvideo\.tv/(?:v/th|mobile\.php\?cid=)(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?thvideo\.tv/(?:v/th|mobile\.php\?cid=)(?P<id>[0-9]+)'
_TEST = {
'url': 'http://thvideo.tv/v/th1987/',
'md5': 'fa107b1f73817e325e9433505a70db50',
_TEST = {
'url': 'http://thvideo.tv/v/th1987/',
'md5': 'fa107b1f73817e325e9433505a70db50',
diff --git
a/youtube_dl/extractor/tinypic.py
b/youtube_dl/extractor/tinypic.py
index e036b8cdf1e6ca6ad4277a4c3d22e79361322703..c43cace24d5bfd107328944d0bd290594ec06b3f 100644
(file)
--- a/
youtube_dl/extractor/tinypic.py
+++ b/
youtube_dl/extractor/tinypic.py
@@
-9,7
+9,7
@@
from ..utils import ExtractorError
class TinyPicIE(InfoExtractor):
IE_NAME = 'tinypic'
IE_DESC = 'tinypic.com videos'
class TinyPicIE(InfoExtractor):
IE_NAME = 'tinypic'
IE_DESC = 'tinypic.com videos'
- _VALID_URL = r'http://(?:.+?\.)?tinypic\.com/player\.php\?v=(?P<id>[^&]+)&s=\d+'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?tinypic\.com/player\.php\?v=(?P<id>[^&]+)&s=\d+'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/tlc.py
b/youtube_dl/extractor/tlc.py
index 17add954338c1f5d70640577f7e75a8afab5c7e3..abad3ff64b5e519414615d3dd3cf8da345e9a2f3 100644
(file)
--- a/
youtube_dl/extractor/tlc.py
+++ b/
youtube_dl/extractor/tlc.py
@@
-9,7
+9,7
@@
from ..compat import compat_parse_qs
class TlcDeIE(InfoExtractor):
IE_NAME = 'tlc.de'
class TlcDeIE(InfoExtractor):
IE_NAME = 'tlc.de'
- _VALID_URL = r'http://www\.tlc\.de/(?:[^/]+/)*videos/(?P<title>[^/?#]+)?(?:.*#(?P<id>\d+))?'
+ _VALID_URL = r'http
s?
://www\.tlc\.de/(?:[^/]+/)*videos/(?P<title>[^/?#]+)?(?:.*#(?P<id>\d+))?'
_TEST = {
'url': 'http://www.tlc.de/sendungen/breaking-amish/videos/#3235167922001',
_TEST = {
'url': 'http://www.tlc.de/sendungen/breaking-amish/videos/#3235167922001',
diff --git
a/youtube_dl/extractor/toypics.py
b/youtube_dl/extractor/toypics.py
index 2756f56d3a94ae8f2bed64aa39acf4d45616366b..2579ba8c67498c91aa117c6853b83f391ccb3ba6 100644
(file)
--- a/
youtube_dl/extractor/toypics.py
+++ b/
youtube_dl/extractor/toypics.py
@@
-41,7
+41,7
@@
class ToypicsIE(InfoExtractor):
class ToypicsUserIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
class ToypicsUserIE(InfoExtractor):
IE_DESC = 'Toypics user profile'
- _VALID_URL = r'http://videos\.toypics\.net/(?P<username>[^/?]+)(?:$|[?#])'
+ _VALID_URL = r'http
s?
://videos\.toypics\.net/(?P<username>[^/?]+)(?:$|[?#])'
_TEST = {
'url': 'http://videos.toypics.net/Mikey',
'info_dict': {
_TEST = {
'url': 'http://videos.toypics.net/Mikey',
'info_dict': {
diff --git
a/youtube_dl/extractor/traileraddict.py
b/youtube_dl/extractor/traileraddict.py
index 0e01b15fcc51ed41d6ace902058e8446ad5625fd..747370d12d7fc8fd1c66b1ac101db0ba01c963e5 100644
(file)
--- a/
youtube_dl/extractor/traileraddict.py
+++ b/
youtube_dl/extractor/traileraddict.py
@@
-7,7
+7,7
@@
from .common import InfoExtractor
class TrailerAddictIE(InfoExtractor):
_WORKING = False
class TrailerAddictIE(InfoExtractor):
_WORKING = False
- _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'
+ _VALID_URL = r'(?:http
s?
://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'
_TEST = {
'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
'md5': '41365557f3c8c397d091da510e73ceb4',
_TEST = {
'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
'md5': '41365557f3c8c397d091da510e73ceb4',
diff --git
a/youtube_dl/extractor/trollvids.py
b/youtube_dl/extractor/trollvids.py
index d239949a668a3cfb1d3267bf0be8780c2bda6569..65770562309186acc95c33c2165d3d50ae8f5f36 100644
(file)
--- a/
youtube_dl/extractor/trollvids.py
+++ b/
youtube_dl/extractor/trollvids.py
@@
-7,7
+7,7
@@
from .nuevo import NuevoBaseIE
class TrollvidsIE(NuevoBaseIE):
class TrollvidsIE(NuevoBaseIE):
- _VALID_URL = r'http://(?:www\.)?trollvids\.com/video/(?P<id>\d+)/(?P<display_id>[^/?#&]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?trollvids\.com/video/(?P<id>\d+)/(?P<display_id>[^/?#&]+)'
IE_NAME = 'trollvids'
_TEST = {
'url': 'http://trollvids.com/video/2349002/%E3%80%90MMD-R-18%E3%80%91%E3%82%AC%E3%83%BC%E3%83%AB%E3%83%95%E3%83%AC%E3%83%B3%E3%83%89-carrymeoff',
IE_NAME = 'trollvids'
_TEST = {
'url': 'http://trollvids.com/video/2349002/%E3%80%90MMD-R-18%E3%80%91%E3%82%AC%E3%83%BC%E3%83%AB%E3%83%95%E3%83%AC%E3%83%B3%E3%83%89-carrymeoff',
diff --git
a/youtube_dl/extractor/tumblr.py
b/youtube_dl/extractor/tumblr.py
index 4f844706d365950d6e1d04e237a5c20df7a1cafc..cea117c79407ed9a3f8cac283718f392746c7a06 100644
(file)
--- a/
youtube_dl/extractor/tumblr.py
+++ b/
youtube_dl/extractor/tumblr.py
@@
-8,7
+8,7
@@
from ..utils import int_or_none
class TumblrIE(InfoExtractor):
class TumblrIE(InfoExtractor):
- _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
+ _VALID_URL = r'http
s?
://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
_TESTS = [{
'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes',
'md5': '479bb068e5b16462f5176a6828829767',
_TESTS = [{
'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes',
'md5': '479bb068e5b16462f5176a6828829767',
diff --git
a/youtube_dl/extractor/tv2.py
b/youtube_dl/extractor/tv2.py
index 535d0d361a0d0967828515af97badffefd136e07..86bb7915db170ecf4c75fdc2b960160a65daa1c0 100644
(file)
--- a/
youtube_dl/extractor/tv2.py
+++ b/
youtube_dl/extractor/tv2.py
@@
-14,7
+14,7
@@
from ..utils import (
class TV2IE(InfoExtractor):
class TV2IE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?tv2\.no/v/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?tv2\.no/v/(?P<id>\d+)'
_TEST = {
'url': 'http://www.tv2.no/v/916509/',
'info_dict': {
_TEST = {
'url': 'http://www.tv2.no/v/916509/',
'info_dict': {
@@
-100,7
+100,7
@@
class TV2IE(InfoExtractor):
class TV2ArticleIE(InfoExtractor):
class TV2ArticleIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?tv2\.no/(?:a|\d{4}/\d{2}/\d{2}(/[^/]+)+)/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?tv2\.no/(?:a|\d{4}/\d{2}/\d{2}(/[^/]+)+)/(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.tv2.no/2015/05/16/nyheter/alesund/krim/pingvin/6930542',
'info_dict': {
_TESTS = [{
'url': 'http://www.tv2.no/2015/05/16/nyheter/alesund/krim/pingvin/6930542',
'info_dict': {
diff --git
a/youtube_dl/extractor/tvc.py
b/youtube_dl/extractor/tvc.py
index 3a4f393fcf6d79f3f42970db7aab853d5efedf84..4065354ddde2c63698908dfac81dc98cac77e79d 100644
(file)
--- a/
youtube_dl/extractor/tvc.py
+++ b/
youtube_dl/extractor/tvc.py
@@
-11,7
+11,7
@@
from ..utils import (
class TVCIE(InfoExtractor):
class TVCIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?tvc\.ru/video/iframe/id/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?tvc\.ru/video/iframe/id/(?P<id>\d+)'
_TEST = {
'url': 'http://www.tvc.ru/video/iframe/id/74622/isPlay/false/id_stat/channel/?acc_video_id=/channel/brand/id/17/show/episodes/episode_id/39702',
'md5': 'bbc5ff531d1e90e856f60fc4b3afd708',
_TEST = {
'url': 'http://www.tvc.ru/video/iframe/id/74622/isPlay/false/id_stat/channel/?acc_video_id=/channel/brand/id/17/show/episodes/episode_id/39702',
'md5': 'bbc5ff531d1e90e856f60fc4b3afd708',
@@
-64,7
+64,7
@@
class TVCIE(InfoExtractor):
class TVCArticleIE(InfoExtractor):
class TVCArticleIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?tvc\.ru/(?!video/iframe/id/)(?P<id>[^?#]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?tvc\.ru/(?!video/iframe/id/)(?P<id>[^?#]+)'
_TESTS = [{
'url': 'http://www.tvc.ru/channel/brand/id/29/show/episodes/episode_id/39702/',
'info_dict': {
_TESTS = [{
'url': 'http://www.tvc.ru/channel/brand/id/29/show/episodes/episode_id/39702/',
'info_dict': {
diff --git
a/youtube_dl/extractor/tvplay.py
b/youtube_dl/extractor/tvplay.py
index b4683de542dffbcc839f162d282285b3cb5d02f3..df70a6b230a4217261f3f69a3e1213a88f07afbf 100644
(file)
--- a/
youtube_dl/extractor/tvplay.py
+++ b/
youtube_dl/extractor/tvplay.py
@@
-13,7
+13,7
@@
from ..utils import (
class TVPlayIE(InfoExtractor):
IE_DESC = 'TV3Play and related services'
class TVPlayIE(InfoExtractor):
IE_DESC = 'TV3Play and related services'
- _VALID_URL = r'''(?x)http://(?:www\.)?
+ _VALID_URL = r'''(?x)http
s?
://(?:www\.)?
(?:tvplay\.lv/parraides|
tv3play\.lt/programos|
play\.tv3\.lt/programos|
(?:tvplay\.lv/parraides|
tv3play\.lt/programos|
play\.tv3\.lt/programos|
diff --git
a/youtube_dl/extractor/ubu.py
b/youtube_dl/extractor/ubu.py
index d5023775857a8bd27ee0f19cffd8176a477be4fd..1d52cbc98e38c0b1d014578c61b95eeb1c9e3f61 100644
(file)
--- a/
youtube_dl/extractor/ubu.py
+++ b/
youtube_dl/extractor/ubu.py
@@
-10,7
+10,7
@@
from ..utils import (
class UbuIE(InfoExtractor):
class UbuIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?ubu\.com/film/(?P<id>[\da-z_-]+)\.html'
+ _VALID_URL = r'http
s?
://(?:www\.)?ubu\.com/film/(?P<id>[\da-z_-]+)\.html'
_TEST = {
'url': 'http://ubu.com/film/her_noise.html',
'md5': '138d5652618bf0f03878978db9bef1ee',
_TEST = {
'url': 'http://ubu.com/film/her_noise.html',
'md5': '138d5652618bf0f03878978db9bef1ee',
diff --git
a/youtube_dl/extractor/unistra.py
b/youtube_dl/extractor/unistra.py
index 594bee4f9a681f928f37887270b062b6e7079514..66d9f1bf3fc9ff8481fb55aa8045078244b11635 100644
(file)
--- a/
youtube_dl/extractor/unistra.py
+++ b/
youtube_dl/extractor/unistra.py
@@
-7,7
+7,7
@@
from ..utils import qualities
class UnistraIE(InfoExtractor):
class UnistraIE(InfoExtractor):
- _VALID_URL = r'http://utv\.unistra\.fr/(?:index|video)\.php\?id_video\=(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://utv\.unistra\.fr/(?:index|video)\.php\?id_video\=(?P<id>\d+)'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/vbox7.py
b/youtube_dl/extractor/vbox7.py
index 3794bcded273235f3fc2a77097b1ca6e48fab348..b755dda902f3370de27a8f496e7cc4b3b8b76a31 100644
(file)
--- a/
youtube_dl/extractor/vbox7.py
+++ b/
youtube_dl/extractor/vbox7.py
@@
-13,7
+13,7
@@
from ..utils import (
class Vbox7IE(InfoExtractor):
class Vbox7IE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?vbox7\.com/play:(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?vbox7\.com/play:(?P<id>[^/]+)'
_TEST = {
'url': 'http://vbox7.com/play:249bb972c2',
'md5': '99f65c0c9ef9b682b97313e052734c3f',
_TEST = {
'url': 'http://vbox7.com/play:249bb972c2',
'md5': '99f65c0c9ef9b682b97313e052734c3f',
diff --git
a/youtube_dl/extractor/veoh.py
b/youtube_dl/extractor/veoh.py
index 9633f7ffeec865c69c77a0e2d7475399a998d44a..23ce0a0d1929febac87f789374d8411d7b7ddd00 100644
(file)
--- a/
youtube_dl/extractor/veoh.py
+++ b/
youtube_dl/extractor/veoh.py
@@
-12,7
+12,7
@@
from ..utils import (
class VeohIE(InfoExtractor):
class VeohIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/(?P<id>(?:v|yapi-)[\da-zA-Z]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/(?P<id>(?:v|yapi-)[\da-zA-Z]+)'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/vesti.py
b/youtube_dl/extractor/vesti.py
index a0c59a2e0e1cb8fca2e0e3eb3ec2e4edce2918bb..cb64ae0bd07cdca051eb3aa10550840a296ded85 100644
(file)
--- a/
youtube_dl/extractor/vesti.py
+++ b/
youtube_dl/extractor/vesti.py
@@
-10,7
+10,7
@@
from .rutv import RUTVIE
class VestiIE(InfoExtractor):
IE_DESC = 'Вести.Ru'
class VestiIE(InfoExtractor):
IE_DESC = 'Вести.Ru'
- _VALID_URL = r'http://(?:.+?\.)?vesti\.ru/(?P<id>.+)'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?vesti\.ru/(?P<id>.+)'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/vgtv.py
b/youtube_dl/extractor/vgtv.py
index 77d8978d4a1b2cf92c895a70720e5daa7a769778..b11cd254c7da9c8c780dedd2b2db120f8025c74b 100644
(file)
--- a/
youtube_dl/extractor/vgtv.py
+++ b/
youtube_dl/extractor/vgtv.py
@@
-214,7
+214,7
@@
class VGTVIE(XstreamIE):
class BTArticleIE(InfoExtractor):
IE_NAME = 'bt:article'
IE_DESC = 'Bergens Tidende Articles'
class BTArticleIE(InfoExtractor):
IE_NAME = 'bt:article'
IE_DESC = 'Bergens Tidende Articles'
- _VALID_URL = r'http://(?:www\.)?bt\.no/(?:[^/]+/)+(?P<id>[^/]+)-\d+\.html'
+ _VALID_URL = r'http
s?
://(?:www\.)?bt\.no/(?:[^/]+/)+(?P<id>[^/]+)-\d+\.html'
_TEST = {
'url': 'http://www.bt.no/nyheter/lokalt/Kjemper-for-internatet-1788214.html',
'md5': '2acbe8ad129b3469d5ae51b1158878df',
_TEST = {
'url': 'http://www.bt.no/nyheter/lokalt/Kjemper-for-internatet-1788214.html',
'md5': '2acbe8ad129b3469d5ae51b1158878df',
@@
-241,7
+241,7
@@
class BTArticleIE(InfoExtractor):
class BTVestlendingenIE(InfoExtractor):
IE_NAME = 'bt:vestlendingen'
IE_DESC = 'Bergens Tidende - Vestlendingen'
class BTVestlendingenIE(InfoExtractor):
IE_NAME = 'bt:vestlendingen'
IE_DESC = 'Bergens Tidende - Vestlendingen'
- _VALID_URL = r'http://(?:www\.)?bt\.no/spesial/vestlendingen/#!/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?bt\.no/spesial/vestlendingen/#!/(?P<id>\d+)'
_TESTS = [{
'url': 'http://www.bt.no/spesial/vestlendingen/#!/86588',
'md5': 'd7d17e3337dc80de6d3a540aefbe441b',
_TESTS = [{
'url': 'http://www.bt.no/spesial/vestlendingen/#!/86588',
'md5': 'd7d17e3337dc80de6d3a540aefbe441b',
diff --git
a/youtube_dl/extractor/videott.py
b/youtube_dl/extractor/videott.py
index 2cd36508a2dfef07a963109327349e7c453ab298..0f798711bca7ebc25c893f82746ed3b1a49ff778 100644
(file)
--- a/
youtube_dl/extractor/videott.py
+++ b/
youtube_dl/extractor/videott.py
@@
-14,7
+14,7
@@
class VideoTtIE(InfoExtractor):
_WORKING = False
ID_NAME = 'video.tt'
IE_DESC = 'video.tt - Your True Tube'
_WORKING = False
ID_NAME = 'video.tt'
IE_DESC = 'video.tt - Your True Tube'
- _VALID_URL = r'http://(?:www\.)?video\.tt/(?:(?:video|embed)/|watch_video\.php\?v=)(?P<id>[\da-zA-Z]{9})'
+ _VALID_URL = r'http
s?
://(?:www\.)?video\.tt/(?:(?:video|embed)/|watch_video\.php\?v=)(?P<id>[\da-zA-Z]{9})'
_TESTS = [{
'url': 'http://www.video.tt/watch_video.php?v=amd5YujV8',
_TESTS = [{
'url': 'http://www.video.tt/watch_video.php?v=amd5YujV8',
diff --git
a/youtube_dl/extractor/viidea.py
b/youtube_dl/extractor/viidea.py
index 315984bf9dbd298304d4211c3793f3aaf5d267e2..03b9f13534a880f3d6cfa2a0780ed8dfa2c07ad7 100644
(file)
--- a/
youtube_dl/extractor/viidea.py
+++ b/
youtube_dl/extractor/viidea.py
@@
-15,7
+15,7
@@
from ..utils import (
class ViideaIE(InfoExtractor):
class ViideaIE(InfoExtractor):
- _VALID_URL = r'''(?x)http://(?:www\.)?(?:
+ _VALID_URL = r'''(?x)http
s?
://(?:www\.)?(?:
videolectures\.net|
flexilearn\.viidea\.net|
presentations\.ocwconsortium\.org|
videolectures\.net|
flexilearn\.viidea\.net|
presentations\.ocwconsortium\.org|
diff --git
a/youtube_dl/extractor/vube.py
b/youtube_dl/extractor/vube.py
index 149e364677fcab4d0374479c4b96ff741277b17e..10ca6acb12469f85267405f9431b9508c0537e57 100644
(file)
--- a/
youtube_dl/extractor/vube.py
+++ b/
youtube_dl/extractor/vube.py
@@
-15,7
+15,7
@@
from ..utils import (
class VubeIE(InfoExtractor):
IE_NAME = 'vube'
IE_DESC = 'Vube.com'
class VubeIE(InfoExtractor):
IE_NAME = 'vube'
IE_DESC = 'Vube.com'
- _VALID_URL = r'http://vube\.com/(?:[^/]+/)+(?P<id>[\da-zA-Z]{10})\b'
+ _VALID_URL = r'http
s?
://vube\.com/(?:[^/]+/)+(?P<id>[\da-zA-Z]{10})\b'
_TESTS = [
{
_TESTS = [
{
diff --git
a/youtube_dl/extractor/vuclip.py
b/youtube_dl/extractor/vuclip.py
index a6d9b5fee1f4864d82c7f8bb83e87884c96afe3b..eaa888f005cc61c53b8f45c3e3b93633083b17ed 100644
(file)
--- a/
youtube_dl/extractor/vuclip.py
+++ b/
youtube_dl/extractor/vuclip.py
@@
-14,7
+14,7
@@
from ..utils import (
class VuClipIE(InfoExtractor):
class VuClipIE(InfoExtractor):
- _VALID_URL = r'http://(?:m\.)?vuclip\.com/w\?.*?cid=(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://(?:m\.)?vuclip\.com/w\?.*?cid=(?P<id>[0-9]+)'
_TEST = {
'url': 'http://m.vuclip.com/w?cid=922692425&fid=70295&z=1010&nvar&frm=index.html',
_TEST = {
'url': 'http://m.vuclip.com/w?cid=922692425&fid=70295&z=1010&nvar&frm=index.html',
diff --git
a/youtube_dl/extractor/walla.py
b/youtube_dl/extractor/walla.py
index 24efbd6e6341ba5aa73e5df11cb9af36f941da43..8b9488340368ea0292fa2614336778099c9eb11e 100644
(file)
--- a/
youtube_dl/extractor/walla.py
+++ b/
youtube_dl/extractor/walla.py
@@
-11,7
+11,7
@@
from ..utils import (
class WallaIE(InfoExtractor):
class WallaIE(InfoExtractor):
- _VALID_URL = r'http://vod\.walla\.co\.il/[^/]+/(?P<id>\d+)/(?P<display_id>.+)'
+ _VALID_URL = r'http
s?
://vod\.walla\.co\.il/[^/]+/(?P<id>\d+)/(?P<display_id>.+)'
_TEST = {
'url': 'http://vod.walla.co.il/movie/2642630/one-direction-all-for-one',
'info_dict': {
_TEST = {
'url': 'http://vod.walla.co.il/movie/2642630/one-direction-all-for-one',
'info_dict': {
diff --git
a/youtube_dl/extractor/wat.py
b/youtube_dl/extractor/wat.py
index 37cf3d3097c94b39f1b66ab11e0e651579f8d533..5227bb5ad9a2cd4f71c156cd8ca9bb3f5fbd5d17 100644
(file)
--- a/
youtube_dl/extractor/wat.py
+++ b/
youtube_dl/extractor/wat.py
@@
-12,7
+12,7
@@
from ..utils import (
class WatIE(InfoExtractor):
class WatIE(InfoExtractor):
- _VALID_URL = r'(?:wat:(?P<real_id>\d{8})|http://www\.wat\.tv/video/(?P<display_id>.*)-(?P<short_id>.*?)_.*?\.html)'
+ _VALID_URL = r'(?:wat:(?P<real_id>\d{8})|http
s?
://www\.wat\.tv/video/(?P<display_id>.*)-(?P<short_id>.*?)_.*?\.html)'
IE_NAME = 'wat.tv'
_TESTS = [
{
IE_NAME = 'wat.tv'
_TESTS = [
{
diff --git
a/youtube_dl/extractor/wdr.py
b/youtube_dl/extractor/wdr.py
index 65cab40694409b111eef026da92e28aaddef54fe..31c90430327da895ffc974c1d489cb4c92689d2f 100644
(file)
--- a/
youtube_dl/extractor/wdr.py
+++ b/
youtube_dl/extractor/wdr.py
@@
-244,7
+244,7
@@
class WDRMobileIE(InfoExtractor):
class WDRMausIE(InfoExtractor):
class WDRMausIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?wdrmaus\.de/(?:[^/]+/){,2}(?P<id>[^/?#]+)(?:/index\.php5|(?<!index)\.php5|/(?:$|[?#]))'
+ _VALID_URL = r'http
s?
://(?:www\.)?wdrmaus\.de/(?:[^/]+/){,2}(?P<id>[^/?#]+)(?:/index\.php5|(?<!index)\.php5|/(?:$|[?#]))'
IE_DESC = 'Sendung mit der Maus'
_TESTS = [{
'url': 'http://www.wdrmaus.de/aktuelle-sendung/index.php5',
IE_DESC = 'Sendung mit der Maus'
_TESTS = [{
'url': 'http://www.wdrmaus.de/aktuelle-sendung/index.php5',
diff --git
a/youtube_dl/extractor/weiqitv.py
b/youtube_dl/extractor/weiqitv.py
index e333ae345b16e6ff6a25d2f57559c970eaf601d9..3dafbeec2c5f7ba0b2e18ec621c67966214d3307 100644
(file)
--- a/
youtube_dl/extractor/weiqitv.py
+++ b/
youtube_dl/extractor/weiqitv.py
@@
-6,7
+6,7
@@
from .common import InfoExtractor
class WeiqiTVIE(InfoExtractor):
IE_DESC = 'WQTV'
class WeiqiTVIE(InfoExtractor):
IE_DESC = 'WQTV'
- _VALID_URL = r'http://www\.weiqitv\.com/index/video_play\?videoId=(?P<id>[A-Za-z0-9]+)'
+ _VALID_URL = r'http
s?
://www\.weiqitv\.com/index/video_play\?videoId=(?P<id>[A-Za-z0-9]+)'
_TESTS = [{
'url': 'http://www.weiqitv.com/index/video_play?videoId=53c744f09874f0e76a8b46f3',
_TESTS = [{
'url': 'http://www.weiqitv.com/index/video_play?videoId=53c744f09874f0e76a8b46f3',
diff --git
a/youtube_dl/extractor/wimp.py
b/youtube_dl/extractor/wimp.py
index fb0accac744532625c04bb964c1fa031723ed8ff..828c03dc38c4d4d4668f6dfb66e4cc29c51fd7e5 100644
(file)
--- a/
youtube_dl/extractor/wimp.py
+++ b/
youtube_dl/extractor/wimp.py
@@
-5,7
+5,7
@@
from .youtube import YoutubeIE
class WimpIE(InfoExtractor):
class WimpIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?wimp\.com/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?wimp\.com/(?P<id>[^/]+)'
_TESTS = [{
'url': 'http://www.wimp.com/maruexhausted/',
'md5': 'ee21217ffd66d058e8b16be340b74883',
_TESTS = [{
'url': 'http://www.wimp.com/maruexhausted/',
'md5': 'ee21217ffd66d058e8b16be340b74883',
diff --git
a/youtube_dl/extractor/xbef.py
b/youtube_dl/extractor/xbef.py
index 4ff99e5ca37fb8f4f0b663cc99761c31e75f1cf4..e4a2baad22534d772a90b8ec5832c11833f10281 100644
(file)
--- a/
youtube_dl/extractor/xbef.py
+++ b/
youtube_dl/extractor/xbef.py
@@
-5,7
+5,7
@@
from ..compat import compat_urllib_parse_unquote
class XBefIE(InfoExtractor):
class XBefIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?xbef\.com/video/(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://(?:www\.)?xbef\.com/video/(?P<id>[0-9]+)'
_TEST = {
'url': 'http://xbef.com/video/5119-glamourous-lesbians-smoking-drinking-and-fucking',
'md5': 'a478b565baff61634a98f5e5338be995',
_TEST = {
'url': 'http://xbef.com/video/5119-glamourous-lesbians-smoking-drinking-and-fucking',
'md5': 'a478b565baff61634a98f5e5338be995',
diff --git
a/youtube_dl/extractor/yam.py
b/youtube_dl/extractor/yam.py
index 001ee17b6f93d457bdc2fbdaf802b61ef19e1b41..63bbc06346a04b385c722eaae22d0ff5c41445f4 100644
(file)
--- a/
youtube_dl/extractor/yam.py
+++ b/
youtube_dl/extractor/yam.py
@@
-15,7
+15,7
@@
from ..utils import (
class YamIE(InfoExtractor):
IE_DESC = '蕃薯藤yam天空部落'
class YamIE(InfoExtractor):
IE_DESC = '蕃薯藤yam天空部落'
- _VALID_URL = r'http://mymedia.yam.com/m/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://mymedia.yam.com/m/(?P<id>\d+)'
_TESTS = [{
# An audio hosted on Yam
_TESTS = [{
# An audio hosted on Yam
diff --git
a/youtube_dl/extractor/ynet.py
b/youtube_dl/extractor/ynet.py
index 869f3e8190ca0b751366a85f142a0b49fe294fa1..2522551dc061b6652d143f1e4d09ee2428b827dc 100644
(file)
--- a/
youtube_dl/extractor/ynet.py
+++ b/
youtube_dl/extractor/ynet.py
@@
-9,7
+9,7
@@
from ..compat import compat_urllib_parse_unquote_plus
class YnetIE(InfoExtractor):
class YnetIE(InfoExtractor):
- _VALID_URL = r'http://(?:.+?\.)?ynet\.co\.il/(?:.+?/)?0,7340,(?P<id>L(?:-[0-9]+)+),00\.html'
+ _VALID_URL = r'http
s?
://(?:.+?\.)?ynet\.co\.il/(?:.+?/)?0,7340,(?P<id>L(?:-[0-9]+)+),00\.html'
_TESTS = [
{
'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html',
_TESTS = [
{
'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html',