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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Rokic 2016-04-11 05:38:50 -05:00
commit c2a58e76bc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/you_get/common.py
View File

@ -15,7 +15,7 @@ SITES = {
'dilidili' : 'dilidili', 'dilidili' : 'dilidili',
'dongting' : 'dongting', 'dongting' : 'dongting',
'douban' : 'douban', 'douban' : 'douban',
'douyutv' : 'douyutv', 'douyu' : 'douyutv',
'ehow' : 'ehow', 'ehow' : 'ehow',
'facebook' : 'facebook', 'facebook' : 'facebook',
'fc2' : 'fc2video', 'fc2' : 'fc2video',

6
src/you_get/extractors/douyutv.py
View File

@ -12,7 +12,7 @@ def douyutv_download(url, output_dir = '.', merge = True, info_only = False, **k
#Thanks to @yan12125 for providing decoding method!! #Thanks to @yan12125 for providing decoding method!!
suffix = 'room/%s?aid=android&client_sys=android&time=%d' % (room_id, int(time.time())) suffix = 'room/%s?aid=android&client_sys=android&time=%d' % (room_id, int(time.time()))
sign = hashlib.md5((suffix + '1231').encode('ascii')).hexdigest() sign = hashlib.md5((suffix + '1231').encode('ascii')).hexdigest()
json_request_url = "http://www.douyutv.com/api/v1/%s&auth=%s" % (suffix, sign) json_request_url = "http://www.douyu.com/api/v1/%s&auth=%s" % (suffix, sign)
content = get_html(json_request_url) content = get_html(json_request_url)
data = json.loads(content)['data'] data = json.loads(content)['data']
server_status = data.get('error',0) server_status = data.get('error',0)
@ -28,6 +28,6 @@ def douyutv_download(url, output_dir = '.', merge = True, info_only = False, **k
if not info_only: if not info_only:
download_urls([real_url], title, 'flv', None, output_dir, merge = merge) download_urls([real_url], title, 'flv', None, output_dir, merge = merge)
site_info = "douyutv.com" site_info = "douyu.com"
download = douyutv_download download = douyutv_download
download_playlist = playlist_not_supported('douyutv') download_playlist = playlist_not_supported('douyu')

6
src/you_get/processor/ffmpeg.py
View File

@ -58,7 +58,7 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'):
concat_list.close() concat_list.close()
params = [FFMPEG] + LOGLEVEL params = [FFMPEG] + LOGLEVEL
params.extend(['-f', 'concat', '-y', '-i']) params.extend(['-f', 'concat', '-safe', '-1', '-y', '-i'])
params.append(output + '.txt') params.append(output + '.txt')
params += ['-c', 'copy', output] params += ['-c', 'copy', output]
@ -122,7 +122,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
concat_list.write("file %s\n" % parameterize(file)) concat_list.write("file %s\n" % parameterize(file))
concat_list.close() concat_list.close()
params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i'] params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-safe', '-1', '-y', '-i']
params.append(output + '.txt') params.append(output + '.txt')
params += ['-c', 'copy', output] params += ['-c', 'copy', output]
@ -167,7 +167,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
concat_list.write("file %s\n" % parameterize(file)) concat_list.write("file %s\n" % parameterize(file))
concat_list.close() concat_list.close()
params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i'] params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-safe', '-1', '-y', '-i']
params.append(output + '.txt') params.append(output + '.txt')
params += ['-c', 'copy', output] params += ['-c', 'copy', output]