refactor:updates

main.py

@@ -13,9 +13,9 @@ from utils.tools import (
     get_ip_address,
 )
 from utils.speed import is_ffmpeg_installed
-from subscribe import get_channels_by_subscribe_urls
-from multicast import get_channels_by_multicast
-from online_search import get_channels_by_online_search
+from updates.subscribe import get_channels_by_subscribe_urls
+from updates.multicast import get_channels_by_multicast
+from updates.online_search import get_channels_by_online_search
 import os
 from tqdm import tqdm
 from tqdm.asyncio import tqdm_asyncio

updates/proxy/__init__.py

@@ -1,34 +1,34 @@
-from .request import get_proxy_list, get_proxy_list_with_test
-
-proxy_list = []
-proxy_list_test = []
-proxy_index = 0
-async def get_proxy(url=None, best=False, with_test=False):
-  """
-  Get the proxy
-  """
-  global proxy_list, proxy_list_test, proxy_index
-  if not proxy_list:
-    proxy_list = get_proxy_list(3)
-  if not proxy_list_test or with_test:
-    proxy_list_test = await get_proxy_list_with_test(url or "https://www.baidu.com", proxy_list)
-  if not proxy_list_test:
-    return None
-  if best:
-    return proxy_list_test[0]
-  else:
-    proxy = proxy_list_test[proxy_index]
-    proxy_index = (proxy_index + 1) % len(proxy_list_test)
-    return proxy
-  
-def get_proxy_next():
-  """
-  Get the next proxy
-  """
-  global proxy_list_test, proxy_index
-  if not proxy_list_test:
-    return None
-  else:
-    proxy = proxy_list_test[proxy_index]
-    proxy_index = (proxy_index + 1) % len(proxy_list_test)
+from .request import get_proxy_list, get_proxy_list_with_test
+
+proxy_list = []
+proxy_list_test = []
+proxy_index = 0
+async def get_proxy(url=None, best=False, with_test=False):
+  """
+  Get the proxy
+  """
+  global proxy_list, proxy_list_test, proxy_index
+  if not proxy_list:
+    proxy_list = get_proxy_list(3)
+  if not proxy_list_test or with_test:
+    proxy_list_test = await get_proxy_list_with_test(url or "https://www.baidu.com", proxy_list)
+  if not proxy_list_test:
+    return None
+  if best:
+    return proxy_list_test[0]
+  else:
+    proxy = proxy_list_test[proxy_index]
+    proxy_index = (proxy_index + 1) % len(proxy_list_test)
+    return proxy
+  
+def get_proxy_next():
+  """
+  Get the next proxy
+  """
+  global proxy_list_test, proxy_index
+  if not proxy_list_test:
+    return None
+  else:
+    proxy = proxy_list_test[proxy_index]
+    proxy_index = (proxy_index + 1) % len(proxy_list_test)
     return proxy