Update main.py

main.py

@@ -1,37 +1,56 @@
-import os
-import time
-import shutil
-import subprocess
-
-gh_token = os.getenv("gh_token")
-
-repo = "Genarabia-Islam-Web"
-
-url_with_token = f"https://{gh_token}@github.com/Eslam-Magdy-1297/{repo}.git"
-
-os.system(f"git clone {url_with_token}")
-
-time.sleep(10)
-
-source_dir = repo
-destination_dir = "."
-
-import os
-
-current_directory = os.getcwd()
-
-items = os.listdir(current_directory)
-
-for item in items:
-    print(item)
-    
-for item in os.listdir(source_dir):
-    s = os.path.join(source_dir, item)
-    d = os.path.join(destination_dir, item)
-    shutil.move(s, d)
-
-os.rmdir(source_dir)
+import os 
+import time 
+import shutil 
+import subprocess 
+ 
+gh_token = os.getenv("gh_token") 
+ 
+repo = "Genarabia-Islam-Web" 
+ 
+url_with_token = f"https://{gh_token}@github.com/Eslam-Magdy-1297/{repo}.git" 
+ 
+os.system(f"git clone {url_with_token}") 
+ 
+time.sleep(10) 
+ 
+source_dir = repo 
+destination_dir = "." 
+ 
+current_directory = os.getcwd() 
+ 
+items = os.listdir(current_directory) 
+ 
+for item in items: 
+    print(item) 
+
+# Improved merging logic
+for item in os.listdir(source_dir): 
+    s = os.path.join(source_dir, item) 
+    d = os.path.join(destination_dir, item) 
     
-with open("app.py", "r") as file:
-    code = file.read()
+    # If it's a directory that exists in both locations, merge them
+    if os.path.isdir(s) and os.path.isdir(d):
+        print(f"Merging directory: {item}")
+        # Copy contents from source to destination
+        for sub_item in os.listdir(s):
+            sub_s = os.path.join(s, sub_item)
+            sub_d = os.path.join(d, sub_item)
+            if os.path.isfile(sub_s):
+                shutil.copy2(sub_s, sub_d)
+                print(f"  Copied: {sub_item}")
+            elif os.path.isdir(sub_s):
+                shutil.copytree(sub_s, sub_d, dirs_exist_ok=True)
+                print(f"  Merged subdirectory: {sub_item}")
+    # If destination doesn't exist, just move it
+    elif not os.path.exists(d):
+        shutil.move(s, d)
+        print(f"Moved: {item}")
+    else:
+        print(f"Skipped (already exists): {item}")
+ 
+# Clean up the cloned repo directory
+shutil.rmtree(source_dir)
+     
+with open("app.py", "r") as file: 
+    code = file.read() 
     exec(code)