midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ivideon] Add support for map bound URLs

Browse source
This commit is contained in:
Sergey M․ 2016-01-08 05:11:23 +06:00
parent 18e6c97c48
commit 4cf096a4a9
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/ivideon.py
View file

@ -4,14 +4,17 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse from ..compat import (
compat_urllib_parse,
compat_urlparse,
)
from ..utils import qualities from ..utils import qualities
class IvideonIE(InfoExtractor): class IvideonIE(InfoExtractor):
IE_NAME = 'ivideon' IE_NAME = 'ivideon'
IE_DESC = 'Ivideon TV' IE_DESC = 'Ivideon TV'
_VALID_URL = r'https?://(?:www\.)?ivideon\.com/tv/camera/(?P<id>\d+-[\da-f]+)/(?P<camera_id>\d+)' _VALID_URL = r'https?://(?:www\.)?ivideon\.com/tv/(?:[^/]+/)*camera/(?P<id>\d+-[\da-f]+)/(?P<camera_id>\d+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.ivideon.com/tv/camera/100-916ca13b5c4ad9f564266424a026386d/0/', 'url': 'https://www.ivideon.com/tv/camera/100-916ca13b5c4ad9f564266424a026386d/0/',
'info_dict': { 'info_dict': {
@ -27,6 +30,9 @@ class IvideonIE(InfoExtractor):
}, { }, {
'url': 'https://www.ivideon.com/tv/camera/100-c4ee4cb9ede885cf62dfbe93d7b53783/589824/?lang=ru', 'url': 'https://www.ivideon.com/tv/camera/100-c4ee4cb9ede885cf62dfbe93d7b53783/589824/?lang=ru',
'only_matching': True, 'only_matching': True,
}, {
'url': 'https://www.ivideon.com/tv/map/22.917923/-31.816406/16/camera/100-e7bc16c7d4b5bbd633fd5350b66dfa9a/0',
'only_matching': True,
}] }]
_QUALITIES = ('low', 'mid', 'hi') _QUALITIES = ('low', 'mid', 'hi')
@ -35,8 +41,10 @@ class IvideonIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
server_id, camera_id = mobj.group('id'), mobj.group('camera_id') server_id, camera_id = mobj.group('id'), mobj.group('camera_id')
camera_name, description = None, None camera_name, description = None, None
camera_url = compat_urlparse.urljoin(
url, '/tv/camera/%s/%s/' % (server_id, camera_id))
webpage = self._download_webpage(url, server_id, fatal=False) webpage = self._download_webpage(camera_url, server_id, fatal=False)
if webpage: if webpage:
config_string = self._search_regex( config_string = self._search_regex(
r'var\s+config\s*=\s*({.+?});', webpage, 'config', default=None) r'var\s+config\s*=\s*({.+?});', webpage, 'config', default=None)