From 74a568d0cd89d16cf41946bab2995d36d40fa2bf Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Wed, 14 Dec 2022 17:34:44 +0800 Subject: [PATCH 1/5] fix:[#366]sequence contains no element --- .../LoginTaskAppService.cs | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs b/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs index 12171eed5..81a09764a 100644 --- a/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs +++ b/src/Ray.BiliBiliTool.Application/LoginTaskAppService.cs @@ -220,7 +220,7 @@ protected void AddOrUpdateCkToQingLong(BiliCookie ckInfo) return; } - var list = re.Data.Where(x=>x.name.StartsWith("Ray_BiliBiliCookies__")); + var list = re.Data.Where(x => x.name.StartsWith("Ray_BiliBiliCookies__")).ToList(); QingLongEnv oldEnv = list.FirstOrDefault(x => x.value.Contains(ckInfo.UserId)); if (oldEnv != null) @@ -245,13 +245,17 @@ protected void AddOrUpdateCkToQingLong(BiliCookie ckInfo) } _logger.LogInformation("用户不存在，新增cookie"); - var lastNum = list.Select(x => + var maxNum = -1; + if (list.Any()) { - var num = x.name.Replace("Ray_BiliBiliCookies__",""); - var parseSuc= int.TryParse(num, out int envNum); - return parseSuc ? envNum : 0; - }).MaxBy(x=>x); - var name = $"Ray_BiliBiliCookies__{lastNum + 1}"; + maxNum = list.Select(x => + { + var num = x.name.Replace("Ray_BiliBiliCookies__", ""); + var parseSuc = int.TryParse(num, out int envNum); + return parseSuc ? envNum : 0; + }).Max(); + } + var name = $"Ray_BiliBiliCookies__{maxNum + 1}"; _logger.LogInformation("Key：{key}", name); var add = new AddQingLongEnv() @@ -378,7 +382,7 @@ private bool GetToken(out string token) var qlDir = _configuration["QL_DIR"] ?? "/ql"; - string authFile= qlDir; + string authFile = qlDir; if (_hostingEnvironment.ContentRootPath.Contains($"{qlDir}/data/")) { authFile = Path.Combine(authFile, "data"); From c67f32b5aca5f55c6db2bb4a0f32ca1d340a9074 Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Wed, 14 Dec 2022 17:41:13 +0800 Subject: [PATCH 2/5] fix:[#361]add cookies.json for docker sample --- .gitignore | 2 +- docker/sample/cookies.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docker/sample/cookies.json diff --git a/.gitignore b/.gitignore index c8f3ae875..ff1b25cdd 100644 --- a/.gitignore +++ b/.gitignore @@ -367,4 +367,4 @@ bilipro kustomization.yaml # cookie config -cookies.json \ No newline at end of file +**/Ray.BiliBiliTool.Console/cookies.json \ No newline at end of file diff --git a/docker/sample/cookies.json b/docker/sample/cookies.json new file mode 100644 index 000000000..1361386ff --- /dev/null +++ b/docker/sample/cookies.json @@ -0,0 +1,4 @@ +{ + "BiliBiliCookies": [ + ], +} \ No newline at end of file From 416606901f27d0eec00e03b77912b15a0f4eebc3 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Dec 2022 23:16:33 +0800 Subject: [PATCH 3/5] feat:[#359]compatiable with reading $QL_DIR error --- qinglong/DefaultTasks/bili_task_base.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index 5dfeea189..532ed09b1 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -2,7 +2,7 @@ # new Env("bili_base") # cron 0 0 1 1 * bili_base.sh -dir_shell=$QL_DIR/shell +dir_shell=${$QL_DIR-'/ql'}/shell . $dir_shell/share.sh ## 安装dotnet diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index 40a6fa5a2..d0ff2764d 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -2,7 +2,7 @@ # new Env("bili_dev_task_base") # cron 0 0 1 1 * bili_dev_task_base.sh -dir_shell=$QL_DIR/shell +dir_shell=${$QL_DIR-'/ql'}/shell . $dir_shell/share.sh ## 安装dotnet From 3353c4376c2d1ecf4225dcc852513888cc574717 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Dec 2022 23:22:09 +0800 Subject: [PATCH 4/5] feat:[#359]compatiable with reading $QL_DIR error --- qinglong/DefaultTasks/bili_task_base.sh | 2 +- qinglong/DefaultTasks/dev/bili_dev_task_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index 532ed09b1..6f33a43ee 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -2,7 +2,7 @@ # new Env("bili_base") # cron 0 0 1 1 * bili_base.sh -dir_shell=${$QL_DIR-'/ql'}/shell +dir_shell=${QL_DIR-'/ql'}/shell . $dir_shell/share.sh ## 安装dotnet diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index d0ff2764d..4253cad9b 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -2,7 +2,7 @@ # new Env("bili_dev_task_base") # cron 0 0 1 1 * bili_dev_task_base.sh -dir_shell=${$QL_DIR-'/ql'}/shell +dir_shell=${QL_DIR-'/ql'}/shell . $dir_shell/share.sh ## 安装dotnet From 4f117a9fb95f571315212fe0bdcc40d73bc5150a Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 14 Dec 2022 23:33:52 +0800 Subject: [PATCH 5/5] chore: update change log --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 636beeb99..a0757b5b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,5 +74,7 @@ - Fix( #260 )，在需要的时候encode cookie - 更新文档 ## 0.3.2 -- Fix( #358 )，获取auth时兼容老板青龙文件路径 -- Fix( #364 )，兼容青龙异性response数据类型 +- Fix( #358 )，获取auth时兼容老版青龙文件路径 +- Fix( #364 )，兼容青龙异形response数据类型 +- Fix( #366 #361 )，修复一些低级bug +- Feature( #359 )，兼容读取不到`$QL_DIR`的情况