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

Merge branch 'develop' of https://github.com/bryanzhou/you-get into bryanzhou-develop

Browse Source
This commit is contained in:
Mort Yao 2021-11-18 16:28:12 +01:00
commit f36fc91296
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/you_get/common.py
View File

@ -1339,7 +1339,13 @@ def download_main(download, download_playlist, urls, playlist, **kwargs):
if re.match(r'https?://', url) is None:
url = 'http://' + url
if playlist:
if m3u8:
if output_filename:
title = output_filename
else:
title = "m3u8file"
download_url_ffmpeg(url=url, title=title,ext = 'mp4',output_dir = '.')
elif playlist:
download_playlist(url, **kwargs)
else:
download(url, **kwargs)
@ -1443,7 +1449,6 @@ def set_socks_proxy(proxy):
proxy_info = proxy.split("@")
socks_proxy_addrs = proxy_info[1].split(':')
socks_proxy_auth = proxy_info[0].split(":")
print(socks_proxy_auth[0]+" "+socks_proxy_auth[1]+" "+socks_proxy_addrs[0]+" "+socks_proxy_addrs[1])
socks.set_default_proxy(
socks.SOCKS5,
socks_proxy_addrs[0],
@ -1454,7 +1459,6 @@ def set_socks_proxy(proxy):
)
else:
socks_proxy_addrs = proxy.split(':')
print(socks_proxy_addrs[0]+" "+socks_proxy_addrs[1])
socks.set_default_proxy(
socks.SOCKS5,
socks_proxy_addrs[0],
@ -1619,6 +1623,10 @@ def script_main(download, download_playlist, **kwargs):
download_grp.add_argument('--stream', help=argparse.SUPPRESS)
download_grp.add_argument('--itag', help=argparse.SUPPRESS)
download_grp.add_argument('-m', '--m3u8', action='store_true', default=False,
help = 'download vide using an m3u8 url')
parser.add_argument('URL', nargs='*', help=argparse.SUPPRESS)
args = parser.parse_args()
@ -1644,6 +1652,7 @@ def script_main(download, download_playlist, **kwargs):
global output_filename
global auto_rename
global insecure
global m3u8
output_filename = args.output_filename
extractor_proxy = args.extractor_proxy
@ -1665,6 +1674,9 @@ def script_main(download, download_playlist, **kwargs):
if args.cookies:
load_cookies(args.cookies)
if args.m3u8:
m3u8 = True
caption = True
stream_id = args.format or args.stream or args.itag
if args.no_caption: