Update merged2upload.py

merged2upload.py

@@ -1,52 +1,63 @@
 import requests
+import base64
 import os
-import logging
-import glob
-import tempfile
 
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+def fetch_and_decode_base64(url):
+    print(url)
+    try:
+        response = requests.get(url, verify=False)
+        response.raise_for_status()
+        decoded_content = base64.b64decode(response.text)
+        return decoded_content.decode('utf-8')
+    except requests.RequestException as e:
+        print(f"Error fetching {url}: {e}")
+        return None
 
-def fetch_content(url):
-    proxy = os.getenv('PROXY')
-    proxies = {'http': proxy, 'https': proxy} if proxy else None
+def upload_to_gist(content, gist_id, github_token):
+    url = f"https://api.github.com/gists/{gist_id}"
+    headers = {
+        'Authorization': f'token {github_token}',
+        'Accept': 'application/vnd.github.v3+json'
+    }
+    data = {
+        "files": {
+            "configsub.yaml": {
+                "content": content
+            }
+        }
+    }
     try:
-        session = requests.Session()
-        session.trust_env = False
-        response = session.get(url, verify=False, proxies=proxies, timeout=10)
+        response = requests.patch(url, headers=headers, json=data)
         response.raise_for_status()
-        return response.text
+        print(f"Successfully updated Gist: {gist_id}")
     except requests.RequestException as e:
-        logging.error(f"Error fetching {url} with proxy: {e}")
-        try:
-            # Try without proxy
-            session = requests.Session()
-            session.trust_env = False
-            response = session.get(url, verify=False, timeout=10)
-            response.raise_for_status()
-            return response.text
-        except requests.RequestException as e:
-            logging.error(f"Error fetching {url} without proxy: {e}")
-            return None
-
-# ... [rest of the functions remain the same]
+        print(f"Error updating Gist: {e}")
 
 def main():
-    # Find the most recent temporary file
-    temp_dir = tempfile.gettempdir()
-    files = glob.glob(os.path.join(temp_dir, 'subscribes_*.txt'))
-    if not files:
-        logging.error("No subscribes file found. Exiting.")
-        return
-    file_path = max(files, key=os.path.getctime)
-    
-    try:
-        with open(file_path, 'r') as file:
-            urls = file.read().strip().split('\n')
-    except FileNotFoundError:
-        logging.error(f"Error: {file_path} not found. Exiting.")
-        return
+    file_path = '/app/aggregator/data/subscribes.txt'
+
+    with open(file_path, 'r') as file:
+        urls = file.read().strip().split('\n')
+
+    all_decoded_texts = []
+
+    for url in urls:
+        decoded_content = fetch_and_decode_base64(url)
+        if decoded_content:
+            all_decoded_texts.append(decoded_content)
+
+    merged_content = "\n".join(all_decoded_texts)
+    encoded_merged_content = base64.b64encode(merged_content.encode('utf-8')).decode('utf-8')
+
+    merged_file_path = '/app/aggregator/data/merged.txt'
+    with open(merged_file_path, 'w') as file:
+        file.write(encoded_merged_content)
+        print(f"Encoded merged content written to {merged_file_path}")
 
-    # ... [rest of the main function remains the same]
+    # Upload the merged content to the Gist
+    github_token = os.getenv('GITHUB_TOKEN')
+    gist_id = os.getenv('GITHUB_GIST_ID')
+    upload_to_gist(encoded_merged_content, gist_id, github_token)
 
 if __name__ == "__main__":
     main()