From 55a6c5300b2e7dd105a034aa3a22ae7097cf33a8 Mon Sep 17 00:00:00 2001
From: Gourieff <777@lovemet.ru>
Date: Tue, 17 Oct 2023 02:28:20 +0700
Subject: [PATCH] FIX: Deprecated folder renaming

Issue #129
---
 README.md                  |  2 +-
 README_RU.md               |  2 +-
 install.py                 | 14 +++++++++++++-
 scripts/reactor_version.py |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f81abc3..35a71ec 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
   <img src="example/ReActor_logo_red.png" alt="logo" width="180px"/>
     
-  ![Version](https://img.shields.io/badge/version-0.4.2-brightgreen?style=for-the-badge&labelColor=darkgreen)
+  ![Version](https://img.shields.io/badge/version-0.4.3_beta1-green?style=for-the-badge&labelColor=darkgreen)
   
   <table>
     <tr>
diff --git a/README_RU.md b/README_RU.md
index e44c962..1955c02 100644
--- a/README_RU.md
+++ b/README_RU.md
@@ -2,7 +2,7 @@
 
   <img src="example/ReActor_logo_red.png" alt="logo" width="180px"/>
     
-  ![Version](https://img.shields.io/badge/версия-0.4.2-brightgreen?style=for-the-badge&labelColor=darkgreen)
+  ![Version](https://img.shields.io/badge/версия-0.4.3_beta1-green?style=for-the-badge&labelColor=darkgreen)
   
   <table>
     <tr>
diff --git a/install.py b/install.py
index 7ad5192..627824b 100644
--- a/install.py
+++ b/install.py
@@ -17,8 +17,20 @@ req_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "requiremen
 
 models_dir_old = os.path.join(models_path, "roop")
 models_dir = os.path.join(models_path, "insightface")
+
+# Check the deprecated 'roop' folder
 if os.path.exists(models_dir_old):
-    os.rename(models_dir_old, models_dir)
+    if not os.listdir(models_dir_old) and (not os.listdir(models_dir) or not os.path.exists(models_dir)):
+        os.rename(models_dir_old, models_dir)
+    else:
+        import shutil
+        for file in os.listdir(models_dir_old):
+            shutil.move(os.path.join(models_dir_old, file), models_dir)
+        try:
+            os.rmdir(models_dir_old)
+        except Exception as e:
+            print(f"OSError: {e}")
+            
 model_url = "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx"
 model_name = os.path.basename(model_url)
 model_path = os.path.join(models_dir, model_name)
diff --git a/scripts/reactor_version.py b/scripts/reactor_version.py
index 6106c8c..4783963 100644
--- a/scripts/reactor_version.py
+++ b/scripts/reactor_version.py
@@ -1,5 +1,5 @@
 app_title = "ReActor"
-version_flag = "v0.4.2"
+version_flag = "v0.4.3-b1"
 
 from scripts.reactor_logger import logger, get_Run, set_Run