Update merged2upload.py

merged2upload.py

@@ -1,6 +1,8 @@
 import requests
 import base64
 import os
+import time
+import schedule
 
 def fetch_and_decode_base64(url):
     print(url)
@@ -33,7 +35,12 @@ def upload_to_gist(content, gist_id, github_token):
     except requests.RequestException as e:
         print(f"Error updating Gist: {e}")
 
-def main():
+def run_task():
+    print("执行任务...")
+    
+    # 运行 collect.py
+    os.system("cd /app/aggregator && python -u subscribe/collect.py -si")
+    
     file_path = '/app/aggregator/data/subscribes.txt'
 
     with open(file_path, 'r') as file:
@@ -58,6 +65,19 @@ def main():
     github_token = os.getenv('GITHUB_TOKEN')
     gist_id = os.getenv('GITHUB_GIST_ID')
     upload_to_gist(encoded_merged_content, gist_id, github_token)
+    
+    print("任务完成")
+
+def main():
+    # 立即运行一次任务
+    run_task()
+    
+    # 设置每6小时运行一次任务
+    schedule.every(6).hours.do(run_task)
+    
+    while True:
+        schedule.run_pending()
+        time.sleep(1)
 
 if __name__ == "__main__":
     main()