depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-25 03:32:05 +00:00
Code Issues Releases Wiki Activity

[freesound] Fix extraction and extended (closes #11602)

Browse source
This commit is contained in:
sh!zeeg 2017-01-05 04:52:42 +03:00 committed by Sergey M․
parent 365d136b7c
commit ed06da4e7b
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
youtube_dl/extractor/freesound.py
View file

@ -3,6 +3,15 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import (
determine_ext,
float_or_none,
get_element_by_class,
get_element_by_id,
int_or_none,
parse_filesize,
unified_strdate,
)
class FreesoundIE(InfoExtractor): class FreesoundIE(InfoExtractor):
@ -23,17 +32,53 @@ class FreesoundIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
music_id = mobj.group('id') music_id = mobj.group('id')
webpage = self._download_webpage(url, music_id) webpage = self._download_webpage(url, music_id)
title = self._html_search_regex(
r'<div id="single_sample_header">.*?<a href="#">(.+?)</a>', audio_url = self._og_search_property('audio', webpage, 'song url')
webpage, 'music title', flags=re.DOTALL) title = self._og_search_property('audio:title', webpage, 'song title')
duration = float_or_none(get_element_by_class('duration', webpage), scale=1000)
tags = get_element_by_class('tags', webpage)
sound_info = get_element_by_id('sound_information_box', webpage)
release_date = get_element_by_id('sound_date', webpage)
description = self._html_search_regex( description = self._html_search_regex(
r'<div id="sound_description">(.*?)</div>', webpage, 'description', r'<div id="sound_description">(.*?)</div>', webpage, 'description',
fatal=False, flags=re.DOTALL) fatal=False, flags=re.DOTALL)
download_count = int_or_none(self._html_search_regex(
r'Downloaded.*>(\d+)<', webpage, 'downloaded', fatal=False))
filesize = float_or_none(parse_filesize(self._search_regex(
r'Filesize</dt><dd>(.*)</dd>', sound_info, 'file size (approx)', fatal=False)))
if release_date:
release_date = unified_strdate(release_date.replace('th', ''))
bitdepth = self._html_search_regex(
r'Bitdepth</dt><dd>(.*)</dd>', sound_info, 'Bitdepth', fatal=False)
channels = self._html_search_regex(
r'Channels</dt><dd>(.*)</dd>', sound_info, 'Channels info', fatal=False)
formats = [{
'url': audio_url,
'id': music_id,
'format_id': self._og_search_property('audio:type', webpage, 'audio format', fatal=False),
'format_note': '{0} {1} {2}'.format(determine_ext(audio_url), bitdepth, channels),
'filesize_approx': filesize,
'asr': int_or_none(self._html_search_regex(
r'Samplerate</dt><dd>(\d+).*</dd>',
sound_info, 'samplerate', fatal=False)),
}]
return { return {
'id': music_id, 'id': music_id,
'title': title, 'title': title,
'url': self._og_search_property('audio', webpage, 'music url'), 'uploader': self._og_search_property('audio:artist', webpage, 'music uploader', fatal=False),
'uploader': self._og_search_property('audio:artist', webpage, 'music uploader'),
'description': description, 'description': description,
'duration': duration,
'tags': [self._html_search_regex(r'>(.*)</a>', t, 'tag', fatal=False)
for t in tags.split('\n') if t.strip()],
'formats': formats,
'release_date': release_date,
'likes_count': download_count,
} }