优化订阅URL匹配

aiqinxuancai · Jan 15, 2025 · e65e673 · e65e673
1 parent 5e02e54
commit e65e673
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/Aria2Fast/Service/Model/TaskModel.cs b/Aria2Fast/Service/Model/TaskModel.cs
@@ -22,11 +22,11 @@ public bool FromSubscription
         {
             get
             {
-                //if (!string.IsNullOrWhiteSpace(Data.Gid) && 
-                //    SubscriptionManager.Instance.TaskUrlToSubscriptionName.ContainsKey(Data.Gid))
-                //{
-                //    return true;
-                //}
+                if (!string.IsNullOrWhiteSpace(Data.Gid) &&
+                    SubscriptionManager.Instance.TaskUrlToSubscriptionName.ContainsKey(Data.Gid))
+                {
+                    return true;
+                }
                 if (!string.IsNullOrWhiteSpace(Data.InfoHash) &&
                     SubscriptionManager.Instance.TaskUrlToSubscriptionName.Any(a => a.Key.Contains(Data.InfoHash)))
                 {
@@ -73,26 +73,24 @@ public string SubscriptionName
             {
                 if (FromSubscription)
                 {
-                    //var name = (string)SubscriptionManager.Instance.TaskUrlToSubscriptionName[Data.Gid];
-                    //if (!string.IsNullOrWhiteSpace(name))
-                    //{
-                    //    return name;
-                    //}
-
-                    SubscriptionManager.Instance.TaskUrlToSubscriptionName.TryGetValue(Data.InfoHash!, out string name);
+                    var name = (string)SubscriptionManager.Instance.TaskUrlToSubscriptionName[Data.Gid];
                     if (!string.IsNullOrWhiteSpace(name))
                     {
                         return name;
                     }
-                    else
+
+                    SubscriptionManager.Instance.TaskUrlToSubscriptionName.TryGetValue(Data.InfoHash!, out string nameFromHash);
+                    if (!string.IsNullOrWhiteSpace(nameFromHash))
                     {
-                        var kv = SubscriptionManager.Instance.TaskUrlToSubscriptionName.FirstOrDefault(a => a.Key.Contains(Data.InfoHash));
-                        if (!string.IsNullOrWhiteSpace(kv.Value))
-                        {
-                            return kv.Value;
-                        }
+                        return nameFromHash;
                     }
-
+
+                    var kv = SubscriptionManager.Instance.TaskUrlToSubscriptionName.LastOrDefault(a => a.Key.Contains(Data.InfoHash));
+                    if (!string.IsNullOrWhiteSpace(kv.Value))
+                    {
+                        return kv.Value;
+                    }
+
 
                     return ShowName;
 

diff --git a/Aria2Fast/Service/SubscriptionManager.cs b/Aria2Fast/Service/SubscriptionManager.cs
@@ -376,6 +376,7 @@ public async Task CheckSubscriptionOne(SubscriptionModel subscription, string cu
                                     {
                                         TaskUrlToSubscriptionName[aria2Result.InfoHash] = subject;
                                     }
+                                    TaskUrlToSubscriptionName[downloadUrl] = subject;
                                 }
 
                                 if (aria2Result.IsSuccessed)
-Original file line number
+Diff line change
@@ Expand Up @@
                                         {
                                             TaskUrlToSubscriptionName[aria2Result.InfoHash] = subject;
                                         }
+                                        TaskUrlToSubscriptionName[downloadUrl] = subject;
                                     }
                                     if (aria2Result.IsSuccessed)
@@ Expand Down @@