aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/extractors.py2
-rw-r--r--youtube_dl/extractor/minoto.py19
-rw-r--r--youtube_dl/extractor/mychannels.py (renamed from youtube_dl/extractor/makerschannel.py)20
3 files changed, 18 insertions, 23 deletions
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 24c23646c..7d5927131 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -582,7 +582,6 @@ from .mailru import (
MailRuMusicIE,
MailRuMusicSearchIE,
)
-from .makerschannel import MakersChannelIE
from .makertv import MakerTVIE
from .mangomolo import (
MangomoloVideoIE,
@@ -645,6 +644,7 @@ from .mtv import (
from .muenchentv import MuenchenTVIE
from .musicplayon import MusicPlayOnIE
from .mwave import MwaveIE, MwaveMeetGreetIE
+from .mychannels import MyChannelsIE
from .myspace import MySpaceIE, MySpaceAlbumIE
from .myspass import MySpassIE
from .myvi import (
diff --git a/youtube_dl/extractor/minoto.py b/youtube_dl/extractor/minoto.py
index 959a10589..636731195 100644
--- a/youtube_dl/extractor/minoto.py
+++ b/youtube_dl/extractor/minoto.py
@@ -4,7 +4,10 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
-from ..utils import int_or_none
+from ..utils import (
+ int_or_none,
+ parse_codecs,
+)
class MinotoIE(InfoExtractor):
@@ -26,7 +29,7 @@ class MinotoIE(InfoExtractor):
formats.extend(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
else:
fmt_profile = fmt.get('profile') or {}
- f = {
+ formats.append({
'format_id': fmt_profile.get('name-short'),
'format_note': fmt_profile.get('name'),
'url': fmt_url,
@@ -35,16 +38,8 @@ class MinotoIE(InfoExtractor):
'filesize': int_or_none(fmt.get('filesize')),
'width': int_or_none(fmt.get('width')),
'height': int_or_none(fmt.get('height')),
- }
- codecs = fmt.get('codecs')
- if codecs:
- codecs = codecs.split(',')
- if len(codecs) == 2:
- f.update({
- 'vcodec': codecs[0],
- 'acodec': codecs[1],
- })
- formats.append(f)
+ 'codecs': parse_codecs(fmt.get('codecs')),
+ })
self._sort_formats(formats)
return {
diff --git a/youtube_dl/extractor/makerschannel.py b/youtube_dl/extractor/mychannels.py
index f5d00e61d..b1ffe7848 100644
--- a/youtube_dl/extractor/makerschannel.py
+++ b/youtube_dl/extractor/mychannels.py
@@ -6,17 +6,17 @@ import re
from .common import InfoExtractor
-class MakersChannelIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?makerschannel\.com/.*(?P<id_type>video|production)_id=(?P<id>[0-9]+)'
+class MyChannelsIE(InfoExtractor):
+ _VALID_URL = r'https?://(?:www\.)?mychannels\.com/.*(?P<id_type>video|production)_id=(?P<id>[0-9]+)'
_TEST = {
- 'url': 'http://makerschannel.com/en/zoomin/community-highlights?video_id=849',
- 'md5': '624a512c6969236b5967bf9286345ad1',
+ 'url': 'https://mychannels.com/missholland/miss-holland?production_id=3416',
+ 'md5': 'b8993daad4262dd68d89d651c0c52c45',
'info_dict': {
- 'id': '849',
+ 'id': 'wUUDZZep6vQD',
'ext': 'mp4',
- 'title': 'Landing a bus on a plane is an epic win',
- 'uploader': 'ZoomIn',
- 'description': 'md5:cd9cca2ea7b69b78be81d07020c97139',
+ 'title': 'Miss Holland joins VOTE LEAVE',
+ 'description': 'Miss Holland | #13 Not a potato',
+ 'uploader': 'Miss Holland',
}
}
@@ -27,12 +27,12 @@ class MakersChannelIE(InfoExtractor):
def extract_data_val(attr, fatal=False):
return self._html_search_regex(r'data-%s\s*=\s*"([^"]+)"' % attr, video_data, attr, fatal=fatal)
- minoto_id = self._search_regex(r'/id/([a-zA-Z0-9]+)', extract_data_val('video-src', True), 'minoto id')
+ minoto_id = extract_data_val('minoto-id') or self._search_regex(r'/id/([a-zA-Z0-9]+)', extract_data_val('video-src', True), 'minoto id')
return {
'_type': 'url_transparent',
'url': 'minoto:%s' % minoto_id,
- 'id': extract_data_val('video-id', True),
+ 'id': url_id,
'title': extract_data_val('title', True),
'description': extract_data_val('description'),
'thumbnail': extract_data_val('image'),