优化课程和番剧 EP/SS ID 解析，提升用户体验 (#919)

* 优化课程 EP ID 解析时的体验 * 简单整理格式
nilaoda · Aug 14, 2024 · adf8d0b · adf8d0b
1 parent e4b292c
commit adf8d0b
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/BBDown/BBDownUtil.cs b/BBDown/BBDownUtil.cs
@@ -84,12 +84,12 @@ public static async Task<string> GetAvIdAsync(string input)
                     string epId = await GetEpIdByBangumiSSIdAsync(SsRegex().Match(input).Groups[1].Value);
                     avid = $"ep:{epId}";
                 }
-                else if (input.Contains("/medialist/") && input.Contains("business_id=") && input.Contains("business=space_collection")) //列表类型是合集
+                else if (input.Contains("/medialist/") && input.Contains("business_id=") && input.Contains("business=space_collection")) // 列表类型是合集
                 {
                     string bizId = GetQueryString("business_id", input);
                     avid = $"listBizId:{bizId}";
                 }
-                else if (input.Contains("/medialist/") && input.Contains("business_id=") && input.Contains("business=space_series")) //列表类型是系列
+                else if (input.Contains("/medialist/") && input.Contains("business_id=") && input.Contains("business=space_series")) // 列表类型是系列
                 {
                     string bizId = GetQueryString("business_id", input);
                     avid = $"seriesBizId:{bizId}";
@@ -145,10 +145,23 @@ public static async Task<string> GetAvIdAsync(string input)
             {
                 avid = GetAidByBV(input[3..]);
             }
-            else if (input.ToLower().StartsWith("av")) //av
+            else if (input.ToLower().StartsWith("av")) // av
             {
                 avid = input.ToLower()[2..];
             }
+            else if (input.StartsWith("cheese/")) // ^cheese/(ep|ss)\d+ 格式
+            {
+                string epId = "";
+                if (input.Contains("/ep"))
+                {
+                    epId = EpRegex().Match(input).Groups[1].Value;
+                }
+                else if (input.Contains("/ss"))
+                {
+                    epId = await GetEpidBySSIdAsync(SsRegex().Match(input).Groups[1].Value);
+                }
+                avid = $"cheese:{epId}";
+            }
             else if (input.StartsWith("ep"))
             {
                 string epId = input[2..];

diff --git a/BBDown/Program.cs b/BBDown/Program.cs
@@ -226,14 +226,15 @@ public static (Dictionary<string, byte> encodingPriority, Dictionary<string, int
 
         public static async Task<(string fetchedAid, VInfo vInfo, string apiType)> GetVideoInfoAsync(MyOption myOption, string aidOri, string input)
         {
-            //加载认证信息
+            Log("检测账号登录...");
+
+            // 加载认证信息
             LoadCredentials(myOption);
 
             // 检测是否登录了账号
             bool is_login = await CheckLogin(Config.COOKIE);
             if (!myOption.UseIntlApi && !myOption.UseTvApi && Config.AREA == "")
             {
-                Log("检测账号登录...");
                 if (!is_login)
                 {
                     LogWarn("你尚未登录B站账号, 解析可能受到限制");
@@ -251,7 +252,33 @@ public static (Dictionary<string, byte> encodingPriority, Dictionary<string, int
 
             Log("获取视频信息...");
             IFetcher fetcher = FetcherFactory.CreateFetcher(aidOri, myOption.UseIntlApi);
-            var vInfo = await fetcher.FetchAsync(aidOri);
+            VInfo? vInfo = null;
+
+            // 只输入 EP/SS 时优先按番剧查找，如果找不到则尝试按课程查找
+            try
+            {
+                vInfo = await fetcher.FetchAsync(aidOri);
+            }
+            catch (KeyNotFoundException e)
+            {
+                if (e.Message != "Arg_KeyNotFound") throw; // 错误消息不符合预期，抛出异常
+                if (aidOri.StartsWith("cheese:")) throw; // 已经按课程查找过，不再重复尝试
+
+                LogWarn("未找到此 EP/SS 对应番剧信息, 正在尝试按课程查找。");
+
+                aidOri = aidOri.Replace("ep", "cheese");
+                Log("新的 aid: " + aidOri);
+
+                if (string.IsNullOrEmpty(aidOri))
+                {
+                    throw new Exception("输入有误");
+                }
+
+                Log("获取视频信息...");
+                fetcher = FetcherFactory.CreateFetcher(aidOri, myOption.UseIntlApi);
+                vInfo = await fetcher.FetchAsync(aidOri);
+            }
+
             string title = vInfo.Title;
             long pubTime = vInfo.PubTime;
             LogColor("视频标题: " + title);