Skip to content

Commit

Permalink
Merge pull request #449 from My-Responsitories/master
Browse files Browse the repository at this point in the history 
添加aria2c命令行参数支持, 一些帮助信息更改
  • Loading branch information
@nilaoda
nilaoda authored Oct 14, 2022
2 parents 800ccce + fdaff8e commit 7f3a657
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 35 deletions.
4 changes: 2 additions & 2 deletions BBDown/BBDownAria2c.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ public static async Task<int> RunCommandCodeAsync(string command, string args)
return p.ExitCode;
}

public static async Task DownloadFileByAria2cAsync(string url, string path, string proxy)
public static async Task DownloadFileByAria2cAsync(string url, string path, string extraArgs)
{
var headerArgs = "";
if (!url.Contains("platform=android_tv_yst") && !url.Contains("platform=android"))
headerArgs += " --header=\"Referer: https://www.bilibili.com\"";
headerArgs += " --header=\"User-Agent: Mozilla/5.0\"";
headerArgs += $" --header=\"Cookie: {Core.Config.COOKIE}\"";
await RunCommandCodeAsync(ARIA2C, $"{(proxy == "" ? "" : "--all-proxy=" + proxy)} --auto-file-renaming=false --download-result=hide --allow-overwrite=true --console-log-level=warn -x16 -s16 -k5M {headerArgs} \"{url}\" -d \"{Path.GetDirectoryName(path)}\" -o \"{Path.GetFileName(path)}\"");
await RunCommandCodeAsync(ARIA2C, $" --auto-file-renaming=false --download-result=hide --allow-overwrite=true --console-log-level=warn -x16 -s16 -j16 -k5M {headerArgs} {extraArgs} \"{url}\" -d \"{Path.GetDirectoryName(path)}\" -o \"{Path.GetFileName(path)}\"");
}
}
}
24 changes: 12 additions & 12 deletions BBDown/BBDownUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public static async Task<string> FixAvidAsync(string avid)
json = await GetWebSourceAsync(api);
using var infoJson = JsonDocument.Parse(json);
var data = infoJson.RootElement.GetProperty("data");
if (data.TryGetProperty("redirect_url", out _) && data.GetProperty("redirect_url").ToString().Contains("bangumi"))
if (data.TryGetProperty("redirect_url", out _) && data.GetProperty("redirect_url").ToString().Contains("bangumi"))
{
var epId = RedirectRegex().Match(data.GetProperty("redirect_url").ToString()).Groups[1].Value;
return $"ep:{epId}";
Expand Down Expand Up @@ -327,7 +327,7 @@ private static string ReplaceUrl(string url)
}
}

public static async Task DownloadFile(string url, string path, bool aria2c, string aria2cProxy, bool forceHttp = false)
public static async Task DownloadFile(string url, string path, bool aria2c, string aria2cArgs, bool forceHttp = false)
{
if (forceHttp) url = ReplaceUrl(url);
LogDebug("Start downloading: {0}", url);
Expand All @@ -337,7 +337,7 @@ public static async Task DownloadFile(string url, string path, bool aria2c, stri
}
if (aria2c)
{
await BBDownAria2c.DownloadFileByAria2cAsync(url, path, aria2cProxy);
await BBDownAria2c.DownloadFileByAria2cAsync(url, path, aria2cArgs);
if (File.Exists(path + ".aria2") || !File.Exists(path))
throw new Exception("aria2下载可能存在错误");
Console.WriteLine();
Expand All @@ -359,13 +359,13 @@ public static async Task DownloadFile(string url, string path, bool aria2c, stri
}
}

public static async Task MultiThreadDownloadFileAsync(string url, string path, bool aria2c, string aria2cProxy, bool forceHttp = false)
public static async Task MultiThreadDownloadFileAsync(string url, string path, bool aria2c, string aria2cArgs, bool forceHttp = false)
{
if (forceHttp) url = ReplaceUrl(url);
LogDebug("Start downloading: {0}", url);
if (aria2c)
{
await BBDownAria2c.DownloadFileByAria2cAsync(url, path, aria2cProxy);
await BBDownAria2c.DownloadFileByAria2cAsync(url, path, aria2cArgs);
if (File.Exists(path + ".aria2") || !File.Exists(path))
throw new Exception("aria2下载可能存在错误");
Console.WriteLine();
Expand Down Expand Up @@ -549,7 +549,7 @@ public static async Task<string> Get302(string url)
public static string GetValidFileName(string input, string re = ".", bool filterSlash = false)
{
string title = input;

foreach (char invalidChar in InvalidChars)
{
title = title.Replace(invalidChar.ToString(), re);
Expand All @@ -563,12 +563,12 @@ public static string GetValidFileName(string input, string re = ".", bool filter
}


/// <summary>
/// 获取url字符串参数，返回参数值字符串
/// </summary>
/// <param name="name">参数名称</param>
/// <param name="url">url字符串</param>
/// <returns></returns>
/// <summary>
/// 获取url字符串参数，返回参数值字符串
/// </summary>
/// <param name="name">参数名称</param>
/// <param name="url">url字符串</param>
/// <returns></returns>
public static string GetQueryString(string name, string url)
{
Regex re = QueryRegex();
Expand Down
23 changes: 13 additions & 10 deletions BBDown/CommandLineInvoker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ internal class CommandLineInvoker
private readonly static Option<bool> UseAppApi = new(new string[] { "--use-app-api", "-app" }, "使用APP端解析模式");
private readonly static Option<bool> UseIntlApi = new(new string[] { "--use-intl-api", "-intl" }, "使用国际版解析模式");
private readonly static Option<bool> UseMP4box = new(new string[] { "--use-mp4box" }, "使用MP4Box来混流");
private readonly static Option<string> EncodingPriority = new(new string[] { "--encoding-priority" }, "视频编码的选择优先级,用逗号分割 例:\"hevc,av1,avc\"");
private readonly static Option<string> DfnPriority = new(new string[] { "--dfn-priority" }, "画质优先级,用逗号分隔 例:\"8K 超高清, 1080P 高码率, HDR 真彩, 杜比视界\"");
private readonly static Option<string> EncodingPriority = new(new string[] { "--encoding-priority" }, "视频编码的选择优先级, 用逗号分割 例: \"hevc,av1,avc\"");
private readonly static Option<string> DfnPriority = new(new string[] { "--dfn-priority" }, "画质优先级,用逗号分隔 例: \"8K 超高清, 1080P 高码率, HDR 真彩, 杜比视界\"");
private readonly static Option<bool> OnlyShowInfo = new(new string[] { "--only-show-info", "-info" }, "仅解析而不进行下载");
private readonly static Option<bool> HideStreams = new(new string[] { "--hide-streams", "-hs" }, "不要显示所有可用音视频流");
private readonly static Option<bool> Interactive = new(new string[] { "--interactive", "-ia" }, "交互式选择清晰度");
private readonly static Option<bool> ShowAll = new(new string[] { "--show-all" }, "展示所有分P标题");
private readonly static Option<bool> UseAria2c = new(new string[] { "--use-aria2c" }, "调用aria2c进行下载(你需要自行准备好二进制可执行文件)");
private readonly static Option<string> Aria2cProxy = new(new string[] { "--aria2c-proxy" }, "调用aria2c进行下载时的代理地址配置");
private readonly static Option<string> Aria2cArgs = new(new string[] { "--aria2c-args" }, "调用aria2c的附加参数(默认参数包含\"-x16 -s16 -j16 -k 5M\", 使用时注意字符串转义)");
private readonly static Option<bool> MultiThread = new(new string[] { "--multi-thread", "-mt" }, "使用多线程下载(默认开启)");
private readonly static Option<string> SelectPage = new(new string[] { "--select-page", "-p" }, "选择指定分p或分p范围：(-p 8 或 -p 1,2 或 -p 3-5 或 -p ALL)");
private readonly static Option<string> SelectPage = new(new string[] { "--select-page", "-p" }, "选择指定分p或分p范围: (-p 8 或 -p 1,2 或 -p 3-5 或 -p ALL 或 -p LAST)");
private readonly static Option<bool> AudioOnly = new(new string[] { "--audio-only" }, "仅下载音频");
private readonly static Option<bool> VideoOnly = new(new string[] { "--video-only" }, "仅下载视频");
private readonly static Option<bool> SubOnly = new(new string[] { "--sub-only" }, "仅下载字幕");
Expand All @@ -37,7 +37,7 @@ internal class CommandLineInvoker
private readonly static Option<bool> DownloadDanmaku = new(new string[] { "--download-danmaku", "-dd" }, "下载弹幕");
private readonly static Option<bool> SkipAi = new(new string[] { "--skip-ai" }, "跳过AI字幕下载");
private readonly static Option<bool> BandwithAscending = new(new string[] { "--bandwith-ascending" }, "比特率升序(最小体积优先)");
private readonly static Option<string> Language = new(new string[] { "--language" }, "设置混流的音频语言(代码)，如chi, jpn等");
private readonly static Option<string> Language = new(new string[] { "--language" }, "设置混流的音频语言(代码), 如chi, jpn等");
private readonly static Option<string> Cookie = new(new string[] { "--cookie", "-c" }, "设置字符串cookie用以下载网页接口的会员内容");
private readonly static Option<string> AccessToken = new(new string[] { "--access-token", "-token" }, "设置access_token用以下载TV/APP接口的会员内容");
private readonly static Option<string> WorkDir = new(new string[] { "--work-dir" }, "设置程序的工作目录");
Expand All @@ -49,12 +49,13 @@ internal class CommandLineInvoker
private readonly static Option<string> MultiFilePattern = new(new string[] { "--multi-file-pattern", "-M" }, $"使用内置变量自定义多P存储文件名:\r\n\r\n" + $"默认为: {Program.MultiPageDefaultSavePath}\r\n");
private readonly static Option<string> Host = new(new string[] { "--host" }, "指定BiliPlus host(解析服务器能够获取你账号的大部分权限!)");
private readonly static Option<string> EpHost = new(new string[] { "--ep-host" }, "指定BiliPlus EP host");
private readonly static Option<string> Area = new(new string[] { "--area" }, "指定BiliPlus area");
private readonly static Option<string> ConfigFile = new(new string[] { "--config-file" }, "读取指定的BBDown本地配置文件(默认为: BBDown.config)");//以下仅为兼容旧版本命令行，不建议使用
private readonly static Option<string> Area = new(new string[] { "--area" }, "指定BiliPlus area 例: hk(使用BiliPlus需要access_token, 不需要cookie)");
private readonly static Option<string> ConfigFile = new(new string[] { "--config-file" }, "读取指定的BBDown本地配置文件(默认为: BBDown.config)");//以下仅为兼容旧版本命令行, 不建议使用
private readonly static Option<string> Aria2cProxy = new(new string[] { "--aria2c-proxy" }, "调用aria2c进行下载时的代理地址配置") { IsHidden = true };
private readonly static Option<bool> OnlyHevc = new(new string[] { "--only-hevc", "-hevc" }, "只下载hevc编码") { IsHidden = true };
private readonly static Option<bool> OnlyAvc = new(new string[] { "--only-avc", "-avc" }, "只下载avc编码") { IsHidden = true };
private readonly static Option<bool> OnlyAv1 = new(new string[] { "--only-av1", "-av1" }, "只下载av1编码") { IsHidden = true };
private readonly static Option<bool> AddDfnSubfix = new(new string[] { "--add-dfn-subfix" }, "为文件加入清晰度后缀，如XXX[1080P 高码率]") { IsHidden = true };
private readonly static Option<bool> AddDfnSubfix = new(new string[] { "--add-dfn-subfix" }, "为文件加入清晰度后缀, 如XXX[1080P 高码率]") { IsHidden = true };
private readonly static Option<bool> NoPaddingPageNum = new(new string[] { "--no-padding-page-num" }, "不给分P序号补零") { IsHidden = true };


Expand Down Expand Up @@ -96,7 +97,7 @@ protected override MyOption GetBoundValue(BindingContext bindingContext)
if (bindingContext.ParseResult.HasOption(Language)) option.Language = bindingContext.ParseResult.GetValueForOption(Language)!;
if (bindingContext.ParseResult.HasOption(Cookie)) option.Cookie = bindingContext.ParseResult.GetValueForOption(Cookie)!;
if (bindingContext.ParseResult.HasOption(AccessToken)) option.AccessToken = bindingContext.ParseResult.GetValueForOption(AccessToken)!;
if (bindingContext.ParseResult.HasOption(Aria2cProxy)) option.Aria2cProxy = bindingContext.ParseResult.GetValueForOption(Aria2cProxy)!;
if (bindingContext.ParseResult.HasOption(Aria2cArgs)) option.Aria2cArgs = bindingContext.ParseResult.GetValueForOption(Aria2cArgs)!;
if (bindingContext.ParseResult.HasOption(WorkDir)) option.WorkDir = bindingContext.ParseResult.GetValueForOption(WorkDir)!;
if (bindingContext.ParseResult.HasOption(FFmpegPath)) option.FFmpegPath = bindingContext.ParseResult.GetValueForOption(FFmpegPath)!;
if (bindingContext.ParseResult.HasOption(Mp4boxPath)) option.Mp4boxPath = bindingContext.ParseResult.GetValueForOption(Mp4boxPath)!;
Expand All @@ -106,6 +107,7 @@ protected override MyOption GetBoundValue(BindingContext bindingContext)
if (bindingContext.ParseResult.HasOption(EpHost)) option.EpHost = bindingContext.ParseResult.GetValueForOption(EpHost)!;
if (bindingContext.ParseResult.HasOption(Area)) option.Area = bindingContext.ParseResult.GetValueForOption(Area)!;
if (bindingContext.ParseResult.HasOption(ConfigFile)) option.ConfigFile = bindingContext.ParseResult.GetValueForOption(ConfigFile)!;
if (bindingContext.ParseResult.HasOption(Aria2cProxy)) option.Aria2cProxy = bindingContext.ParseResult.GetValueForOption(Aria2cProxy)!;
if (bindingContext.ParseResult.HasOption(OnlyHevc)) option.OnlyHevc = bindingContext.ParseResult.GetValueForOption(OnlyHevc)!;
if (bindingContext.ParseResult.HasOption(OnlyAvc)) option.OnlyAvc = bindingContext.ParseResult.GetValueForOption(OnlyAvc)!;
if (bindingContext.ParseResult.HasOption(OnlyAv1)) option.OnlyAv1 = bindingContext.ParseResult.GetValueForOption(OnlyAv1)!;
Expand Down Expand Up @@ -149,7 +151,7 @@ public static RootCommand GetRootCommand(Func<MyOption, Task> action)
Language,
Cookie,
AccessToken,
Aria2cProxy,
Aria2cArgs,
WorkDir,
FFmpegPath,
Mp4boxPath,
Expand All @@ -159,6 +161,7 @@ public static RootCommand GetRootCommand(Func<MyOption, Task> action)
EpHost,
Area,
ConfigFile,
Aria2cProxy,
OnlyHevc,
OnlyAvc,
OnlyAv1,
Expand Down
3 changes: 2 additions & 1 deletion BBDown/MyOption.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ internal class MyOption
public string Language { get; set; } = "";
public string Cookie { get; set; } = "";
public string AccessToken { get; set; } = "";
public string Aria2cProxy { get; set; } = "";
public string Aria2cArgs { get; set; } = "";
public string WorkDir { get; set; } = "";
public string FFmpegPath { get; set; } = "";
public string Mp4boxPath { get; set; } = "";
Expand All @@ -49,6 +49,7 @@ internal class MyOption
public string Area { get; set; } = "";
public string? ConfigFile { get; set; }
//以下仅为兼容旧版本命令行，不建议使用
public string Aria2cProxy { get; set; } = "";
public bool OnlyHevc { get; set; }
public bool OnlyAvc { get; set; }
public bool OnlyAv1 { get; set; }
Expand Down
Loading

0 comments on commit 7f3a657

Please sign in to comment.