Fix: avoid deleting project folder

qml/Application.qml

@@ -541,6 +541,21 @@ ApplicationWindow {
 		Component.onCompleted: codeModel.setOptimizeCode(checked)
 	}
 
+
+	MessageDialog {
+		id: alertMessageDialog
+		icon: StandardIcon.Warning
+		function pop(text)
+		{
+			this.text = text
+			this.open()
+		}
+		onAccepted:
+		{
+			this.text = ""
+		}
+	}
+
 	Settings {
 		id: appSettings
 		property alias gasEstimation: gasEstimationAction.checked

qml/ProjectModel.qml

@@ -160,8 +160,15 @@ Item {
 		id: newFolderDialog
 		visible: false
 		onAccepted: {
-			fileIo.makeDir(newFolderDialog.path)
-			folderAdded(newFolderDialog.path)
+			if (!fileIo.dirExists(newFolderDialog.path))
+			{
+				if (fileIo.makeDir(newFolderDialog.path))
+					folderAdded(newFolderDialog.path)
+				else
+					alertMessageDialog.pop(qsTr("Error while creating folder"))
+			}
+			else
+				alertMessageDialog.pop(qsTr("Directory already exists"))
 		}
 	}
 

qml/js/NetworkDeployment.js

@@ -278,10 +278,37 @@ function copyFiles(path, target)
 			if (path === projectModel.projectPath && dirs[i].fileName === deploymentDialog.packageStep.folderName)
 				continue
 			var deployDir = target + dirs[i].fileName + "/"
-			fileIo.makeDir(deployDir)
-			copyFiles(dirs[i].path, deployDir)
+			if (!fileIo.dirExists(deployDir))
+			{
+				if (fileIo.makeDir(deployDir))
+				{
+					var ret = copyFiles(dirs[i].path, deployDir)
+					if (!ret.success)
+						return ret
+				}
+				else
+				{
+					var mes = qsTr('Unable to create package directory. Cannot create folder ') + deployDir
+					return {
+						success: false,
+						message: mes
+					}
+				}
+			}
+			else
+			{
+				var mes = qsTr("Unable to create directory. Directory already exists ") + deployDir
+				return {
+					success: false,
+					message: mes
+				}
+			}
 		}
 	}
+	return {
+		success: true,
+		message: ''
+	}
 }
 
 function packageDapp(addresses)
@@ -298,10 +325,35 @@ function packageDapp(addresses)
 
 	projectModel.deploymentDir = deploymentDir;
 	fileIo.deleteDir(deploymentDir)
-	fileIo.makeDir(deploymentDir);
-	var wwwFolder = deploymentDir + "/www/"
-	fileIo.makeDir(wwwFolder);
-	copyFiles(projectModel.projectPath, wwwFolder)
+	if (fileIo.makeDir(deploymentDir))
+	{
+		var wwwFolder = deploymentDir + "/www/"
+		if (fileIo.makeDir(wwwFolder))
+		{
+			var result = copyFiles(projectModel.projectPath, wwwFolder)
+			if (!result.success)
+			{
+				console.log(result.message)
+				deploymentError(result.message)
+				return
+			}
+		}
+		else
+		{
+			var mes = qsTr('cannot create ') + deploymentDir
+			console.log(mes)
+			deploymentError(mes)
+			return
+		}
+	}
+	else
+	{
+		var mes = qsTr('cannot create ') + wwwFolder
+		console.log(mes)
+		deploymementError(mes)
+		return
+	}
+
 	//write deployment js
 	var deploymentJs =
 			"// Autogenerated by Mix\n" +

qml/js/ProjectModel.js

@@ -279,7 +279,16 @@ function doCreateProject(title, path) {
 	closeProject(function() {
 		console.log("Creating project " + title + " at " + path);
 		var dirPath = path + "/" + title
-		fileIo.makeDir(dirPath);
+		if (fileIo.dirExists(dirPath))
+		{
+			alertMessageDialog.pop(qsTr("Directory already exists. Unable to continue."))
+			return
+		}
+		if (!fileIo.makeDir(dirPath))
+		{
+			console.log('Cannot create project folder. Project not created')
+			return
+		}
 		var projectFile = dirPath + "/" + projectFileName;
 		var indexFile = "index.html";
 		var contractsFile = "contract.sol";
@@ -340,7 +349,11 @@ function generateFileName(name, extension) {
 function regenerateCompilationResult()
 {
 	fileIo.deleteDir(compilationFolder)
-	fileIo.makeDir(compilationFolder)
+	if (!fileIo.makeDir(compilationFolder))
+	{
+		console.log("compilation folder not created")
+		return
+	}
 	var ctrJson = {}
 	for (var c in codeModel.contracts)
 	{
@@ -355,7 +368,14 @@ function regenerateCompilationResult()
 function saveContractCompilationResult(documentId)
 {
 	if (!fileIo.dirExists(compilationFolder))
-		fileIo.makeDir(compilationFolder)
+	{
+		if (!fileIo.makeDir(compilationFolder))
+		{
+			console.log("Contract compilation result not created.")
+			return
+		}
+	}
+
 	var date = new Date()
 	var ret = "/*\nGenerated by Mix\n" + date.toString() + "\n*/\n\n"
 	var newCompilationResult = false

src/FileIo.cpp

@@ -103,18 +103,20 @@ QString FileIo::pathFromUrl(QString const& _url)
 	return path;
 }
 
-void FileIo::makeDir(QString const& _url)
+bool FileIo::makeDir(QString const& _url)
 {
 	try
 	{
 		QDir dirPath(pathFromUrl(_url));
 		if (dirPath.exists())
-			dirPath.removeRecursively();
+			return false;
 		dirPath.mkpath(dirPath.path());
+		return true;
 	}
 	catch (...)
 	{
 		manageException();
+		return false;
 	}
 }
 

src/FileIo.h

@@ -51,7 +51,7 @@ class FileIo: public QObject
 public:
 	FileIo();
 	/// Create a directory if it does not exist. Signals on failure.
-	Q_INVOKABLE void makeDir(QString const& _url);
+	Q_INVOKABLE bool makeDir(QString const& _url);
 	/// Read file contents to a string. Signals on failure.
 	Q_INVOKABLE QString readFile(QString const& _url);
 	/// Returns file size