depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-15 13:55:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse source
This commit is contained in:
Philipp Hagemeister 2014-06-07 15:41:12 +02:00
commit 9aa6637644
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
youtube_dl/extractor/teachertube.py
View file

@ -4,13 +4,17 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import (
qualities,
determine_ext,
)
class TeacherTubeIE(InfoExtractor): class TeacherTubeIE(InfoExtractor):
IE_NAME = 'teachertube' IE_NAME = 'teachertube'
IE_DESC = 'teachertube.com videos' IE_DESC = 'teachertube.com videos'
_VALID_URL = r'https?://(?:www\.)?teachertube\.com/viewVideo\.php\?video_id=(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?teachertube\.com/(viewVideo\.php\?video_id=|music\.php\?music_id=)(?P<id>\d+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.teachertube.com/viewVideo.php?video_id=339997', 'url': 'http://www.teachertube.com/viewVideo.php?video_id=339997',
@ -32,6 +36,15 @@ class TeacherTubeIE(InfoExtractor):
'description': 'md5:2ca52b20cd727773d1dc418b3d6bd07b', 'description': 'md5:2ca52b20cd727773d1dc418b3d6bd07b',
'thumbnail': 're:http://.*\.jpg', 'thumbnail': 're:http://.*\.jpg',
}, },
}, {
'url': 'http://www.teachertube.com/music.php?music_id=8805',
'md5': '01e8352006c65757caf7b961f6050e21',
'info_dict': {
'id': '8805',
'ext': 'mp3',
'title': 'PER ASPERA AD ASTRA',
'description': 'RADIJSKA EMISIJA ZRAKOPLOVNE TEHNIČKE ŠKOLE PER ASPERA AD ASTRA',
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -40,19 +53,14 @@ class TeacherTubeIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
url = self._html_search_meta('twitter:player:stream', webpage, 'twitter player') quality = qualities(['mp3', 'flv', 'mp4'])
formats = [{ formats = [
'format_id': 'flv', {
'url': url.replace('mp4v', 'flv').replace('.mp4', '.flv'), 'url': media_url,
'quality': 0, 'quality': quality(determine_ext(media_url))
'ext': 'flv', } for media_url in set(zip(*re.findall(r'([\'"])file\1\s*:\s*"([^"]+)"', webpage))[1])
}, { ]
'format_id': 'mp4',
'url': url,
'quality': 1,
'ext': 'mp4',
}]
self._sort_formats(formats) self._sort_formats(formats)