From 8d4e7c31cf646ea71d1cb5e13339953858a5d723 Mon Sep 17 00:00:00 2001 From: pulpe Date: Mon, 24 Feb 2014 09:25:27 +0100 Subject: [PATCH 1/2] [iprima] Fix video id extraction --- youtube_dl/extractor/iprima.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/iprima.py b/youtube_dl/extractor/iprima.py index dde482998..c733f0eaa 100644 --- a/youtube_dl/extractor/iprima.py +++ b/youtube_dl/extractor/iprima.py @@ -10,7 +10,7 @@ from ..utils import compat_urllib_request class IPrimaIE(InfoExtractor): - _VALID_URL = r'https?://play\.iprima\.cz/(?P.+)/(?P.+)' + _VALID_URL = r'https?://play\.iprima\.cz/(.+/)?(?P.+)' _TESTS = [{ 'url': 'http://play.iprima.cz/particka/particka-92', @@ -55,7 +55,7 @@ class IPrimaIE(InfoExtractor): if filename == 'null': continue - real_id = self._search_regex(r'Prima-[0-9]{10}-([0-9]+)_', filename, 'real video id') + real_id = self._search_regex(r'Prima-(?:WEB-)(\d+)-\d+_\d+|\d+-(\d+)_\d+', filename, 'real video id') if format_id == 'lq': quality = 0 From a5b96025f66a8266707ce9dcd8684ba8d8ea1037 Mon Sep 17 00:00:00 2001 From: pulpe Date: Mon, 24 Feb 2014 09:31:45 +0100 Subject: [PATCH 2/2] [iprima] Correct regex --- youtube_dl/extractor/iprima.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/iprima.py b/youtube_dl/extractor/iprima.py index c733f0eaa..fc9f71397 100644 --- a/youtube_dl/extractor/iprima.py +++ b/youtube_dl/extractor/iprima.py @@ -55,7 +55,7 @@ class IPrimaIE(InfoExtractor): if filename == 'null': continue - real_id = self._search_regex(r'Prima-(?:WEB-)(\d+)-\d+_\d+|\d+-(\d+)_\d+', filename, 'real video id') + real_id = self._search_regex(r'Prima-WEB-(\d+)-\d+_\d+|\d+-(\d+)_\d+', filename, 'real video id') if format_id == 'lq': quality = 0