fix:whitelist order(#765)

Author: Guovin

updates/subscribe/request.py

@@ -30,6 +30,8 @@ async def get_channels_by_subscribe_urls(
     """
     Get the channels by subscribe urls
     """
+    if whitelist:
+        urls.sort(key=lambda url: whitelist.index(url) if url in whitelist else len(whitelist))
     subscribe_results = {}
     subscribe_urls_len = len(urls)
     pbar = tqdm_asyncio(
@@ -43,7 +45,6 @@ async def get_channels_by_subscribe_urls(
             f"正在获取{mode_name}源, 共{subscribe_urls_len}个{mode_name}源",
             0,
         )
-    session = Session()
     hotel_name = constants.origin_map["hotel"]
     multicast_name = constants.origin_map["multicast"]
     subscribe_name = constants.origin_map["subscribe"]
@@ -57,6 +58,7 @@ def process_subscribe_channels(subscribe_info):
             subscribe_url = subscribe_info
         channels = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
         in_whitelist = whitelist and (subscribe_url in whitelist)
+        session = Session()
         try:
             response = None
             try:
@@ -100,7 +102,7 @@ def process_subscribe_channels(subscribe_info):
                                 )
                             )
                             if in_whitelist:
-                                info = "!" + info
+                                info = "!"
                             url = add_url_info(url, info)
                         url = format_url_with_cache(
                             url, cache=subscribe_url if (multicast or hotel) else None
@@ -122,6 +124,7 @@ def process_subscribe_channels(subscribe_info):
             if error_print:
                 print(f"Error on {subscribe_url}: {e}")
         finally:
+            session.close()
             pbar.update()
             remain = subscribe_urls_len - pbar.n
             if callback:
@@ -138,6 +141,5 @@ def process_subscribe_channels(subscribe_info):
         ]
         for future in futures:
             subscribe_results = merge_objects(subscribe_results, future.result())
-    session.close()
     pbar.close()
     return subscribe_results

utils/tools.py

@@ -317,8 +317,7 @@ def merge_dicts(dict1, dict2):
                     dict1[key].update(value)
                 elif isinstance(dict1[key], list):
                     if value:
-                        dict1[key].extend(value)
-                        dict1[key] = list(set(dict1[key]))
+                        dict1[key].extend(x for x in value if x not in dict1[key])
                 elif value:
                     dict1[key] = {dict1[key], value}
             else:
@@ -477,11 +476,11 @@ def format_url_with_cache(url, cache=None):
     return add_url_info(url, f"cache:{cache}") if cache else url
 
 
-def remove_cache_info(str):
+def remove_cache_info(string):
     """
     Remove the cache info from the string
     """
-    return re.sub(r"[^a-zA-Z\u4e00-\u9fa5\$]?cache:.*", "", str)
+    return re.sub(r"[^a-zA-Z\u4e00-\u9fa5$]?cache:.*", "", string)
 
 
 def resource_path(relative_path, persistent=False):