Update merged2upload.py

merged2upload.py

@@ -1,14 +1,18 @@
 import requests
 import os
+import logging
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
 def fetch_content(url):
-    print(f"Fetching content from: {url}")
+    proxy = os.getenv('PROXY')
+    proxies = {'http': proxy, 'https': proxy} if proxy else None
     try:
-        response = requests.get(url, verify=False)
+        response = requests.get(url, verify=False, proxies=proxies)
         response.raise_for_status()
         return response.text
     except requests.RequestException as e:
-        print(f"Error fetching {url}: {e}")
+        logging.error(f"Error fetching {url}: {e}")
         return None
 
 def upload_to_gist(content, gist_id, github_token):
@@ -24,27 +28,24 @@ def upload_to_gist(content, gist_id, github_token):
             }
         }
     }
+    proxy = os.getenv('PROXY')
+    proxies = {'http': proxy, 'https': proxy} if proxy else None
     try:
-        response = requests.patch(url, headers=headers, json=data)
+        response = requests.patch(url, headers=headers, json=data, proxies=proxies)
         response.raise_for_status()
-        print(f"Successfully updated Gist: {gist_id}")
+        logging.info(f"Successfully updated Gist: {gist_id}")
     except requests.RequestException as e:
-        print(f"Error updating Gist: {e}")
+        logging.error(f"Error updating Gist: {e}")
 
 def main():
-    file_path = '/app/aggregator/data/subscribes.txt'
+    file_path = '/app/subscribes.txt'
     
-    if not os.path.exists(file_path):
-        print(f"Warning: {file_path} does not exist. Creating an empty file.")
-        os.makedirs(os.path.dirname(file_path), exist_ok=True)
-        open(file_path, 'w').close()
-
     try:
         with open(file_path, 'r') as file:
             urls = file.read().strip().split('\n')
     except FileNotFoundError:
-        print(f"Error: {file_path} not found. Proceeding with an empty list of URLs.")
-        urls = []
+        logging.error(f"Error: {file_path} not found. Exiting.")
+        return
 
     all_contents = []
 
@@ -55,15 +56,13 @@ def main():
 
     merged_content = "\n".join(all_contents)
 
-    merged_file_path = '/app/aggregator/data/merged.txt'
-    os.makedirs(os.path.dirname(merged_file_path), exist_ok=True)
-    with open(merged_file_path, 'w') as file:
-        file.write(merged_content)
-        print(f"Merged content written to {merged_file_path}")
-
-    # Upload the merged content to the Gist
     github_token = os.getenv('GITHUB_TOKEN')
     gist_id = os.getenv('GITHUB_GIST_ID')
+    
+    if not github_token or not gist_id:
+        logging.error("GITHUB_TOKEN or GITHUB_GIST_ID not set. Exiting.")
+        return
+
     upload_to_gist(merged_content, gist_id, github_token)
 
 if __name__ == "__main__":