-fixed move to burn dir to use the right directories

git-svn-id: file:///var/svn/repos2/shemov/trunk@424 f440f766-f032-0410-8965-dc7d17de2ca0

1 files changed, 9 insertions, 14 deletions

diff --git a/archiveviewwidget.cpp b/archiveviewwidget.cpp
index af27041..22a51f1 100644
--- a/archiveviewwidget.cpp
+++ b/archiveviewwidget.cpp
@@ -197,27 +197,22 @@ void ArchiveViewWidget::moveBurn(){
 		return;
 
 	}
-	QString destBase = QString("%1/%2").arg(burnDir).arg(tr("burn"));
-	QFileInfo dbi(destBase);
+	QFileInfo dbi(burnDir);
 	if(!dbi.exists()){
-		QDir bd(s.value("ui/selectstartup").toString());
-		bool success = bd.mkdir(tr("burn"));
-		if(!success){
-			QString msg = QString("Failed to create dir %1 in %2").arg(s.value("ui/selectstartup").toString()).arg(tr("burn"));
-			emit statusbarMessage(msg);
-			return;
-		}
+		QString msg = QString(tr("Directory %1 does not exist!")).arg(burnDir);
+		emit statusbarMessage(msg);
+		return;
 	}else{
 		if(!dbi.isDir()){
-			QString msg = QString("%1 exists but is not a directory").arg(destBase);
+			QString msg = QString("%1 exists but is not a directory").arg(burnDir);
 			emit statusbarMessage(msg);
 			return;
 		}
 	}
-	QString question = QString(tr("Really move selected files and covers to %1?")).arg(destBase);
+	QString question = QString(tr("Really move selected files and covers to %1?")).arg(burnDir);
 	int answer = QMessageBox::question(this, tr("Question"), question, QMessageBox::Yes | QMessageBox::No);
 	if(answer == QMessageBox::Yes){
-		QDir destDir(destBase);
+		QDir destDir(burnDir);
 		foreach(QModelIndex idx, sel){
 			QModelIndex real = mProxy->mapToSource(idx);
 			QString file = real.data(MovieModel::FullPathRole).toString();
@@ -235,7 +230,7 @@ void ArchiveViewWidget::moveBurn(){
 			QRegExp ws("\\s+");
 			destDirName.replace(ws, ".");
 			destDir.mkdir(destDirName);
-			QString finalDestDir = QString("%1/%2").arg(destBase).arg(destDirName);
+			QString finalDestDir = QString("%1/%2").arg(burnDir).arg(destDirName);
 			QString newFn = QString("%1/%2").arg(finalDestDir).arg(fi.fileName());
 			QFile::rename(file, newFn);
 			foreach(QVariant c, covers){
@@ -244,7 +239,7 @@ void ArchiveViewWidget::moveBurn(){
 				QFile::copy(c.toString(), newCover);
 			}
 		}
-		emit refreshDir(destBase);
+		emit refreshDir(burnDir);
 	}
 }