From: APTX <marek321@gmail.com>
Date: Fri, 26 Apr 2013 19:00:31 +0000 (+0200)
Subject: Set rename_error.
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=c831b17be636f552ab125cd3f1b91278535c6a54;p=localmylist.git

Set rename_error.
---

diff --git a/localmylist/renamehandler.cpp b/localmylist/renamehandler.cpp
index 4511579..a3c6ef5 100644
--- a/localmylist/renamehandler.cpp
+++ b/localmylist/renamehandler.cpp
@@ -117,8 +117,9 @@ void RenameHandler::handleRename()
 		if (newFile.exists())
 		{
 			fl.failedRename = true;
+			fl.renameError = tr("Rename: Failed to rename file <%1>. Destination <%2> exists.").arg(oldFile.filePath()).arg(newFileString);
 			db->setFileLocation(fl);
-			db->log(tr("Rename: Failed to rename file <%1>. Destination <%2> exists.").arg(oldFile.filePath()).arg(newFileString), 2);
+			db->log(fl.renameError, 2);
 			continue;
 		}
 
@@ -127,8 +128,9 @@ void RenameHandler::handleRename()
 			if (!QDir().mkpath(newFilePath))
 			{
 				fl.failedRename = true;
+				fl.renameError = tr("Rename: Failed to rename file <%1>. Destination path <%2> does not exist and could not be created.").arg(oldFile.filePath()).arg(newFile.canonicalPath());
 				db->setFileLocation(fl);
-				db->log(tr("Rename: Failed to rename file <%1>. Destination path <%2> does not exist and could not be created.").arg(oldFile.filePath()).arg(newFile.canonicalPath()), 2);
+				db->log(fl.renameError, 2);
 				continue;
 			}
 		}
@@ -137,8 +139,9 @@ void RenameHandler::handleRename()
 		if (!QFileInfo(newFilePath).isWritable())
 		{
 			fl.failedRename = true;
+			fl.renameError = tr("Rename: Failed to rename file <%1>. Destination directory <%2> is not writable.").arg(oldFile.canonicalFilePath()).arg(newFile.absolutePath());
 			db->setFileLocation(fl);
-			db->log(tr("Rename: Failed to rename file <%1>. Destination directory <%2> is not writable.").arg(oldFile.canonicalFilePath()).arg(newFile.absolutePath()), 2);
+			db->log(fl.renameError, 2);
 			continue;
 		}
 
@@ -154,8 +157,9 @@ void RenameHandler::handleRename()
 		if (!oldFile.isWritable())
 		{
 			fl.failedRename = true;
+			fl.renameError = tr("Rename: Failed to rename file <%1>. File is not writable.").arg(oldFile.canonicalFilePath());
 			db->setFileLocation(fl);
-			db->log(tr("Rename: Failed to rename file <%1>. File is not writable.").arg(oldFile.canonicalFilePath()), 2);
+			db->log(fl.renameError, 2);
 			continue;
 		}
 #endif
@@ -163,13 +167,15 @@ void RenameHandler::handleRename()
 		if (!QFile::rename(oldFile.canonicalFilePath(), newFileString))
 		{
 			fl.failedRename = true;
+			fl.renameError = tr("Rename: Failed to rename file <%1>. Failed to rename file to <%2>").arg(oldFile.canonicalFilePath()).arg(newFileString);
 			db->setFileLocation(fl);
-			db->log(tr("Rename: Failed to rename file <%1>. Failed to rename file to <%2>").arg(oldFile.canonicalFilePath()).arg(newFileString), 2);
+			db->log(fl.renameError, 2);
 			continue;
 		}
 
 		fl.path = newFileString;
 		fl.failedRename = false;
+		fl.renameError = "";
 		db->setFileLocation(fl);
 
 		db->log(tr("Rename: File <%1> was renamed to <%2>").arg(oldFile.canonicalFilePath()).arg(newFileString));