From 12c0d6b73f7995765c25163de90587b3ea2719cb Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 26 May 2016 10:22:09 +0200
Subject: [PATCH] makeDir

---
 qml/ProjectModel.qml        |  6 ++++--
 qml/js/NetworkDeployment.js | 29 +++++++++++++++++++++++------
 qml/js/ProjectModel.js      | 21 ++++++++++++++++++---
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/qml/ProjectModel.qml b/qml/ProjectModel.qml
index c7798b8..b7751f4 100644
--- a/qml/ProjectModel.qml
+++ b/qml/ProjectModel.qml
@@ -162,8 +162,10 @@ Item {
 		onAccepted: {
 			if (!fileIo.dirExists(newFolderDialog.path))
 			{
-				fileIo.makeDir(newFolderDialog.path)
-				folderAdded(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"))
diff --git a/qml/js/NetworkDeployment.js b/qml/js/NetworkDeployment.js
index 67e875e..2dc62aa 100644
--- a/qml/js/NetworkDeployment.js
+++ b/qml/js/NetworkDeployment.js
@@ -279,8 +279,12 @@ function copyFiles(path, target)
 				continue
 			var deployDir = target + dirs[i].fileName + "/"
 			if (!fileIo.dirExists(deployDir))
-				fileIo.makeDir(deployDir)
-			copyFiles(dirs[i].path, deployDir)
+			{
+				if (fileIo.makeDir(deployDir))
+					copyFiles(dirs[i].path, deployDir)
+				else
+					console.log('Unable to create package directory. Cannot create folder')
+			}
 		}
 	}
 }
@@ -299,10 +303,23 @@ 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))
+			copyFiles(projectModel.projectPath, wwwFolder)
+		else
+		{
+			console.log('cannot create ' + deploymentDir)
+			return
+		}
+	}
+	else
+	{
+		console.log('cannot create ' + wwwFolder)
+		return
+	}
+
 	//write deployment js
 	var deploymentJs =
 			"// Autogenerated by Mix\n" +
diff --git a/qml/js/ProjectModel.js b/qml/js/ProjectModel.js
index 5cf7cf2..ce60f80 100644
--- a/qml/js/ProjectModel.js
+++ b/qml/js/ProjectModel.js
@@ -284,7 +284,11 @@ function doCreateProject(title, path) {
 			alertMessageDialog.pop(qsTr("Directory already exists. Unable to continue."))
 			return
 		}
-		fileIo.makeDir(dirPath);
+		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";
@@ -345,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)
 	{
@@ -360,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