fix: Delete folder if --no-backup is passed

Zawala · May 19, 2022 · f7f7459 · f7f7459
1 parent 69e14e5
commit f7f7459
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/bench/app.py b/bench/app.py
@@ -179,13 +179,19 @@ def get(self):
 		)
 
 	@step(title="Archiving App {repo}", success="App {repo} Archived")
-	def remove(self):
+	def remove(self, no_backup: bool = False):
 		active_app_path = os.path.join("apps", self.name)
-		archived_path = os.path.join("archived", "apps")
-		archived_name = get_available_folder_name(f"{self.repo}-{date.today()}", archived_path)
-		archived_app_path = os.path.join(archived_path, archived_name)
-		log(f"App moved from {active_app_path} to {archived_app_path}")
-		shutil.move(active_app_path, archived_app_path)
+
+		if no_backup:
+			shutil.rmtree(active_app_path)
+			log(f"App deleted from {active_app_path}")
+		else:
+			archived_path = os.path.join("archived", "apps")
+			archived_name = get_available_folder_name(f"{self.repo}-{date.today()}", archived_path)
+			archived_app_path = os.path.join(archived_path, archived_name)
+
+			shutil.move(active_app_path, archived_app_path)
+			log(f"App moved from {active_app_path} to {archived_app_path}")
 
 	@step(title="Installing App {repo}", success="App {repo} Installed")
 	def install(

diff --git a/bench/bench.py b/bench/bench.py
@@ -312,8 +312,7 @@ def add(self, app: "App"):
 
 	def remove(self, app: "App", no_backup: bool = False):
 		app.uninstall()
-		if not no_backup:
-			app.remove()
+		app.remove(no_backup=no_backup)
 		super().remove(app.repo)
 
 	def append(self, app: "App"):