diff --git a/src/you_get/common.py b/src/you_get/common.py index f56f85e3..8278004c 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +import ssl +ssl._create_default_https_context = ssl._create_unverified_context + SITES = { '163' : 'netease', '56' : 'w56', @@ -730,8 +733,8 @@ def get_output_filename(urls, title, ext, output_dir, merge): global output_filename if output_filename: if ext: - return output_filename + '.' + ext - return output_filename + return output_filename + '-' + title + '.' + ext + return output_filename + '-' + title merged_ext = ext if (len(urls) > 1) and merge: @@ -904,12 +907,13 @@ def download_url_ffmpeg(url,title, ext,params={}, total_size=0, output_dir='.', global output_filename if output_filename: - dotPos = output_filename.rfind(".") - title = output_filename[:dotPos] - ext = output_filename[dotPos+1:] + title = output_filename + '-' + title title = tr(get_filename(title)) + if not os.path.exists(output_dir): + os.mkdir(output_dir) + ffmpeg_download_stream(url, title, ext, params, output_dir, stream=stream) def playlist_not_supported(name): diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py index c7b362e1..55837a93 100755 --- a/src/you_get/processor/ffmpeg.py +++ b/src/you_get/processor/ffmpeg.py @@ -238,7 +238,7 @@ def ffmpeg_download_stream(files, title, ext, params={}, output_dir='.', stream= ffmpeg_params.append(output) - print(' '.join(ffmpeg_params)) + # print(' '.join(ffmpeg_params)) try: a = subprocess.Popen(ffmpeg_params, stdin= subprocess.PIPE)