#include <QHBoxLayout>
#include <QChar>
+#include "dialog.h"
+
#include <math.h>
#include <errno.h>
#include <iostream>
{ \
response = FileOperator::NONE; \
\
- if (newFile.exists()) { \
+ while (response == FileOperator::NONE && newFile.exists()) { \
if (overwriteAll != FileOperator::NONE) { \
response = overwriteAll; \
} else { \
- bool dirOverDir = false; \
- if (newFile.isDir() && file.isDir()) dirOverDir = true; \
- emit showOverwritePrompt(this, newFile.absoluteFilePath(), dirOverDir); \
+ emit showOverwritePrompt(this, newFile.absoluteFilePath(), \
+ newFile.isDir() && file.isDir()); \
waitCond.wait(&mutex); \
+ \
+ if (response == FileOperator::NONE) { \
+ emit showInputFilenamePrompt(this, newFile, file.isDir()); \
+ waitCond.wait(&mutex); \
+ if (newNameFromDialog.size()) { \
+ newFile.setFile(newNameFromDialog); \
+ } \
+ } \
} \
} \
+ if (response == FileOperator::ASK) response = FileOperator::NONE; \
}
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
setLayout(layout);
+ qRegisterMetaType<QFileInfo>("QFileInfo");
}
const QString &fileName,
const bool dirOverDir)
{
- QMessageBox msgBox;
- msgBox.addButton(QMessageBox::Cancel);
- QAbstractButton *yesButton = msgBox.addButton(QMessageBox::Yes);
- QAbstractButton *yesToAllButton = msgBox.addButton(QMessageBox::YesToAll);
- QAbstractButton *noButton = msgBox.addButton(QMessageBox::No);
- QAbstractButton *noToAllButton = msgBox.addButton(QMessageBox::NoToAll);
- QAbstractButton *abortButton = msgBox.addButton(tr("Abort"), QMessageBox::DestructiveRole);
+ Dialog msgBox;
+ msgBox.addButtonFirst(QDialogButtonBox::Cancel);
+ QAbstractButton *yesButton = msgBox.addButtonFirst(QDialogButtonBox::Yes);
+ QAbstractButton *yesToAllButton = msgBox.addButtonFirst(QDialogButtonBox::YesToAll);
+ QAbstractButton *noButton = msgBox.addButtonSecond(QDialogButtonBox::No);
+ QAbstractButton *noToAllButton = msgBox.addButtonSecond(QDialogButtonBox::NoToAll);
+ QAbstractButton *abortButton = msgBox.addButtonSecond(tr("Abort"), QDialogButtonBox::DestructiveRole);
+ QAbstractButton *newNameButton = msgBox.addButtonFirst(tr("New Name"), QDialogButtonBox::AcceptRole);
QAbstractButton *askButton = 0;
+ QAbstractButton *skipDirButton = 0;
if (dirOverDir) {
msgBox.setText(tr("Directory %1 already exists. Overwrite the files inside?")
.arg(FileOperator::shortenPath(fileName)));
- askButton = msgBox.addButton(tr("Ask"), QMessageBox::AcceptRole);
+ askButton = msgBox.addButtonFirst(tr("Ask"), QDialogButtonBox::AcceptRole);
+ skipDirButton = msgBox.addButtonSecond(tr("Skip"), QDialogButtonBox::NoRole);
} else {
msgBox.setText(tr("File %1 already exists. Overwrite?").arg(FileOperator::shortenPath(fileName)));
}
msgBox.exec();
- if (msgBox.clickedButton() == abortButton) {
+ if (msgBox.clickedButton == abortButton) {
manipulator->setResponse(ABORT);
- } else if (msgBox.clickedButton() == yesButton) {
+ } else if (msgBox.clickedButton == yesButton) {
manipulator->setResponse(OVERWRITE);
- } else if (msgBox.clickedButton() == yesToAllButton) {
+ } else if (msgBox.clickedButton == yesToAllButton) {
manipulator->setResponse(OVERWRITE, true);
- } else if (msgBox.clickedButton() == noButton) {
+ } else if (msgBox.clickedButton == noButton) {
manipulator->setResponse(KEEP);
- } else if (msgBox.clickedButton() == noToAllButton) {
+ } else if (msgBox.clickedButton == noToAllButton) {
manipulator->setResponse(KEEP, true);
- } else if (msgBox.clickedButton() == askButton) {
- manipulator->setResponse(NONE, true);
+ } else if (msgBox.clickedButton == askButton) {
+ manipulator->setResponse(ASK);
+ } else if (msgBox.clickedButton == newNameButton) {
+ manipulator->setResponse(NONE);
+ } else if (msgBox.clickedButton == skipDirButton) {
+ manipulator->setResponse(SKIP_DIR);
}
}
+void FileOperator::showInputFilenamePrompt(FileManipulatorThread* manipulator,
+ const QFileInfo &file,
+ const bool dir)
+{
+ bool ok;
+ QString prompt, error;
+
+ if (dir) {
+ prompt = tr("Enter the new directory name.");
+ } else {
+ prompt = tr("Enter the new file name.");
+ }
+
+ manipulator->mutex.lock();
+
+ manipulator->newNameFromDialog = "";
+ QString text = file.fileName();
+
+
+ while (true) {
+ text = QInputDialog::getText(this, QString(), prompt + error, QLineEdit::Normal, text, &ok);
+
+ if (!ok) break;
+
+ error = "";
+ if (text.contains(QRegExp("[\"*/:<>?\\\\|]"))) {
+ error = "<small><br/><font color = 'red'>" + tr("The name cannot contain any of the following characters: ") +
+ "\"*/:<>?\\|</font></small>";
+ } else if (ok && !text.isEmpty()) {
+ QFileInfo info(file.path() + "/" + text);
+ manipulator->newNameFromDialog = info.absoluteFilePath();
+ break;
+ }
+ }
+
+ manipulator->mutex.unlock();
+ manipulator->waitCond.wakeAll();
+}
+
+
void FileOperator::remove(FileManipulatorThread* manipulator) {
manipulator->wait();
layout()->removeWidget(manipulator->progressBar);
this, SLOT(showErrorPrompt(FileManipulatorThread*, const QString&, const QString&, const int)));
connect(thread, SIGNAL(showOverwritePrompt(FileManipulatorThread*, const QString&, bool)),
this, SLOT(showOverwritePrompt(FileManipulatorThread*, const QString&, bool)));
+ connect(thread, SIGNAL(showInputFilenamePrompt(FileManipulatorThread*, const QFileInfo&, bool)),
+ this, SLOT(showInputFilenamePrompt(FileManipulatorThread*, const QFileInfo&, bool)));
connect(thread, SIGNAL(finished(FileManipulatorThread*)),
this, SLOT(remove(FileManipulatorThread*)));
connect(thread, SIGNAL(setBarSize(FileManipulatorThread*, unsigned int)),
connect(thread, SIGNAL(updateProgress(FileManipulatorThread*, int)),
this, SLOT(updateProgress(FileManipulatorThread*, int)));
- thread->progressBar->setValue(0);
-
layout()->addWidget(thread->progressBar);
thread->start(QThread::LowestPriority);
}
fileValue(0)
{
memset(ignoreAll, false, sizeof(ignoreAll));
- progressBar->setMaximum(0);
+ progressBar->setMaximum(1);
+ progressBar->setValue(0);
+ progressBar->setMinimum(0);
QFont barFont = progressBar->font();
barFont.setPointSize(12);
progressBar->setFont(barFont);
FileManipulatorThread::~FileManipulatorThread() {
- if (progressBar->value() < progressBar->maximum()) {
+ if (!abort && progressBar->value() < progressBar->maximum()) {
std::cout << "WARNING: deleting a progressbar which's value " << progressBar->value() <<
" has not reached maximum of " << progressBar->maximum() << std::endl;
}
<< " to " << dest.absolutePath().toStdString() << std::endl;
QString path(file.absoluteFilePath());
- QString newPath(dest.absolutePath() + "/" + file.fileName());
QFSFileEngine engine(path);
- QFSFileEngine newEngine(newPath);
- QFileInfo newFile(newPath);
+ QFileInfo newFile(dest.absolutePath() + "/" + file.fileName());
updateFile(path);
OVERWRITE_PROMPT(file, newFile)
}
- if (abort) return;
+ QString newPath(newFile.absoluteFilePath());
+ QFSFileEngine newEngine(newPath);
- if (response == FileOperator::KEEP) {
- updateProgress(fileSizeMap[path]);
- removeExcludeFiles.insert(path);
- return;
- }
+ if (abort) return;
if (file.isDir()) {
+ // save the overwrite response, because the response variable will get ovewritten in remove(...)
FileOperator::Response overwriteResponse = response;
if (newFile.exists() && !newFile.isDir()) {
+ // overwriting a file, so check for KEEP and handle it
+ if (response == FileOperator::KEEP) {
+ updateProgress(fileSizeMap[path]);
+ removeExcludeFiles.insert(path);
+ return;
+ }
+
+ // if it should not be kept, remove it and return on failure
if(!remove(newPath)) {
updateProgress(fileSizeMap[path]);
return;
}
+ // create new info since we deleted the file - is it needed?
newFile = QFileInfo(newPath);
+ } else {
+ // overwriting a directory - response KEEP means to keep the files inside,
+ // SKIP_DIR means to skip the dir completely
+ if (response == FileOperator::SKIP_DIR) {
+ updateProgress(fileSizeMap[path]);
+ removeExcludeFiles.insert(path);
+ return;
+ }
}
if (!newFile.exists()) {
tr("Error creating directory %1."), newPath)
}
+ // we've done the job with the dir, so update progress and recurse into the dir
updateProgress(1);
+ // change the dest for the recursion
QDir destBackup = dest;
dest = newPath;
+ // and set overwriteAll to the response we got a while ago
+ // because it applies to the files inside the dir
FileOperator::Response tmpResp = overwriteAll;
overwriteAll = overwriteResponse;
dest = destBackup;
} else {
+ if (response == FileOperator::KEEP) {
+ updateProgress(fileSizeMap[path]);
+ removeExcludeFiles.insert(path);
+ return;
+ }
+
SPECIAL_COPY_ERROR_PROMPT(engine.isSequential(), tr("Cannot copy sequential file %1."), path)
if (newFile.exists() && newFile.isDir()) {
SPECIAL_COPY_ERROR_PROMPT(!engine.open(QIODevice::ReadOnly), tr("Error reading file %1."), path)
- bool ignore = false;
+ bool ignore = false, newFileWritten = false;
while (!abort && !ignore) {
engine.seek(0);
fileValue = 0;
break;
}
+ newFileWritten = true;
+
bool error = false;
char block[BLOCK_SIZE];
qint64 bytes;
newEngine.close();
if (abort || ignore) {
- newEngine.remove();
+ if (newFileWritten) {
+ newEngine.remove();
+ }
} else {
ERROR_PROMPT(!newEngine.setPermissions(file.permissions()),
tr("Error setting permissions for file %1."), newPath)
for (int i = 0; i < files.size(); ++i) {
QString path = files[i].absoluteFilePath();
QFSFileEngine engine(path);
- QString newPath = dest.absolutePath() + "/" + files[i].fileName();
+ QFileInfo newFile(dest.absolutePath() + "/" + files[i].fileName());
updateFile(path);
- OVERWRITE_PROMPT(files[i], QFileInfo(newPath))
+ OVERWRITE_PROMPT(files[i], newFile)
- if (response == FileOperator::KEEP) {
- if (abort) break;
- updateProgress(1);
- continue;
+ // if we are owerwriting dir over a dir, we will get SKIP_DIR
+ // as a response from OVERWRITE_PROMT meaning we should skip it
+ // (KEEP would mean to keep the files inside)
+ if (files[i].isDir() && newFile.exists() && newFile.isDir()) {
+ if (response == FileOperator::SKIP_DIR) {
+ if (abort) break;
+ updateProgress(1);
+ removeExcludeFiles.insert(path);
+ continue;
+ }
+ } else {
+ if (response == FileOperator::KEEP) {
+ if (abort) break;
+ updateProgress(1);
+ removeExcludeFiles.insert(path);
+ continue;
+ }
}
+ QString newPath(newFile.absoluteFilePath());
+ QFSFileEngine newEngine(newPath);
+
while (!abort && !engine.rename(newPath)) {
// source and target are on different partitions
// this should happen on the first file, unless some are skipped by overwrite prompt
overwriteAll = tmpResp;
- ERROR_PROMPT(!engine.rmdir(path, false), tr("Error deleting directory %1."), path)
+ remove(files[i]);
break;
// source and target are nonmatching types(file and dir)
projects / case / blobdiff