]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[ndr] make NDREmbed and NJoyEmbed _VALID_URL regex unique
authorremitamine <remitamine@gmail.com>
Tue, 8 Sep 2015 14:37:20 +0000 (15:37 +0100)
committerremitamine <remitamine@gmail.com>
Tue, 8 Sep 2015 14:37:20 +0000 (15:37 +0100)
youtube_dl/extractor/ndr.py

index aca85825d6e04bf53016cf203829a86c79ccf922..2a73650d4b5b93fd77e8df11339a7d6879245bc1 100644 (file)
@@ -152,7 +152,7 @@ class NDREmbedBaseIE(NDRBaseIE):
 
 class NDREmbedIE(NDREmbedBaseIE):
     IE_NAME = 'ndr:embed'
-    _VALID_URL = r'https?://www\.ndr\.de/(?:[^/]+/)+(?P<id>\w+)'
+    _VALID_URL = r'https?://www\.ndr\.de/(?:[^/]+/)+(?P<id>[a-z0-9]+)-(?:player|externalPlayer)\.html'
 
     _TEST = {
         'url': 'http://www.ndr.de/fernsehen/sendungen/ndr_aktuell/ndraktuell28488-player.html',
@@ -168,7 +168,7 @@ class NDREmbedIE(NDREmbedBaseIE):
 
 class NJoyEmbedIE(NDREmbedBaseIE):
     IE_NAME = 'N-JOY:embed'
-    _VALID_URL = r'https?://www\.n-joy\.de/(?:[^/]+/)(?P<id>\w+)'
+    _VALID_URL = r'https?://www\.n-joy\.de/(?:[^/]+/)+(?P<id>[a-z0-9]+)-(?:player|externalPlayer)\.html'
 
     _TEST = {
         'url': 'http://www.n-joy.de/entertainment/film/portraet374-player_image-832d9b79-fa8a-4026-92e2-e0fd99deb2f9_theme-n-joy.html',