Remove old data in settings before recovering from backup. Closes #9

SCP002 · Apr 1, 2022 · d5dd00e · d5dd00e
1 parent 17c424d
commit d5dd00e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/backup.go b/src/backup.go
@@ -155,6 +155,10 @@ func xteveRestore(archive string) (newWebURL string, err error) {
 		return
 	}
 
+	if err = os.RemoveAll(System.Folder.Config); err != nil {
+		ShowError(err, 1073)
+	}
+
 	// Extract the ZIP Archive into the Config Folder
 	err = extractZIP(archive, System.Folder.Config)
 	if err != nil {

diff --git a/src/data.go b/src/data.go
@@ -98,7 +98,7 @@ func updateServerSettings(request RequestStruct) (settings SettingsStruct, err e
 				}
 
 				if err != nil {
-					showWarning(1015)
+					ShowError(err, 1015)
 					value = os.TempDir() + string(os.PathSeparator)
 					err = checkFilePermission(value.(string))
 					if err != nil {

diff --git a/src/screen.go b/src/screen.go
@@ -274,6 +274,8 @@ func getErrMsg(errCode int) (errMsg string) {
 		errMsg = fmt.Sprintf("File could not be created")
 	case 1072:
 		errMsg = fmt.Sprintf("File not found")
+	case 1073:
+		errMsg = fmt.Sprintf("Can not remove old config folder before recover")
 
 	// Backup
 	case 1090: