PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-03-13 11:24:02 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

[soundcloud]update client id and new api

Browse Source
This commit is contained in:
MaxwellGoblin 2017-07-29 19:59:29 +08:00
parent 728360f4cc
commit 7eb7ead380
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/you_get/common.py
View File

@ -459,6 +459,9 @@ def url_info(url, faker = False, headers = {}):
'video/x-ms-asf': 'asf', 'video/x-ms-asf': 'asf',
'audio/mp4': 'mp4', 'audio/mp4': 'mp4',
'audio/mpeg': 'mp3', 'audio/mpeg': 'mp3',
'audio/wav': 'wav',
'audio/x-wav': 'wav',
'audio/wave': 'wav',
'image/jpeg': 'jpg', 'image/jpeg': 'jpg',
'image/png': 'png', 'image/png': 'png',
'image/gif': 'gif', 'image/gif': 'gif',
@ -1085,6 +1088,8 @@ def print_info(site_info, title, type, size):
type_info = "MPEG-4 audio (%s)" % type type_info = "MPEG-4 audio (%s)" % type
elif type in ['audio/mpeg']: elif type in ['audio/mpeg']:
type_info = "MP3 (%s)" % type type_info = "MP3 (%s)" % type
elif type in ['audio/wav', 'audio/wave', 'audio/x-wav']:
type_info = 'Waveform Audio File Format ({})'.format(type)
elif type in ['image/jpeg']: elif type in ['image/jpeg']:
type_info = "JPEG Image (%s)" % type type_info = "JPEG Image (%s)" % type

36
src/you_get/extractors/soundcloud.py
View File

@ -3,28 +3,46 @@
__all__ = ['soundcloud_download', 'soundcloud_download_by_id'] __all__ = ['soundcloud_download', 'soundcloud_download_by_id']
from ..common import * from ..common import *
import json
import urllib.error
client_id = 'JlZIsxg2hY5WnBgtn3jfS0UYCl0K8DOg'
def soundcloud_download_by_id(id, title=None, output_dir='.', merge=True, info_only=False): def soundcloud_download_by_id(id, title=None, output_dir='.', merge=True, info_only=False):
assert title assert title
url = 'https://api.soundcloud.com/tracks/{}/{}?client_id={}'.format(id, 'stream', client_id)
#if info["downloadable"]:
# url = 'https://api.soundcloud.com/tracks/' + id + '/download?client_id=b45b1aa10f1ac2941910a7f0d10f8e28'
url = 'https://api.soundcloud.com/tracks/' + id + '/stream?client_id=02gUJC0hH2ct1EGOcYXQIzRFU91c72Ea'
assert url
type, ext, size = url_info(url) type, ext, size = url_info(url)
print_info(site_info, title, type, size) print_info(site_info, title, type, size)
if not info_only: if not info_only:
download_urls([url], title, ext, size, output_dir, merge = merge) download_urls([url], title, ext, size, output_dir, merge = merge)
def soundcloud_i1_api(track_id):
url = 'https://api.soundcloud.com/i1/tracks/{}/streams?client_id={}'.format(track_id, client_id)
return json.loads(get_content(url))['http_mp3_128_url']
def soundcloud_download(url, output_dir='.', merge=True, info_only=False, **kwargs): def soundcloud_download(url, output_dir='.', merge=True, info_only=False, **kwargs):
metadata = get_html('https://api.soundcloud.com/resolve.json?url=' + url + '&client_id=02gUJC0hH2ct1EGOcYXQIzRFU91c72Ea') url = 'https://api.soundcloud.com/resolve.json?url={}&client_id={}'.format(url, client_id)
import json metadata = get_content(url)
info = json.loads(metadata) info = json.loads(metadata)
title = info["title"] title = info["title"]
id = str(info["id"]) real_url = info.get('download_url')
if real_url is None:
soundcloud_download_by_id(id, title, output_dir, merge = merge, info_only = info_only) real_url = info.get('steram_url')
if real_url is None:
raise Exception('Cannot get media URI for {}'.format(url))
real_url = '{}?client_id={}'.format(real_url, client_id)
try:
mime, ext, size = url_info(real_url)
except urllib.error.HTTPError as e:
if 401 == e.status:
real_url = soundcloud_i1_api(info['id'])
mime, ext, size = url_info(real_url)
print_info(site_info, title, mime, size)
if not info_only:
download_urls([real_url], title, ext, size, output_dir, merge=merge)
site_info = "SoundCloud.com" site_info = "SoundCloud.com"
download = soundcloud_download download = soundcloud_download