diff --git a/kerfuffle/cliinterface.cpp b/kerfuffle/cliinterface.cpp index 2c47ccce..3fa55999 100644 --- a/kerfuffle/cliinterface.cpp +++ b/kerfuffle/cliinterface.cpp @@ -1,1122 +1,1124 @@ /* * ark -- archiver for the KDE project * * Copyright (C) 2009 Harald Hvaal * Copyright (C) 2009-2011 Raphael Kubo da Costa * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ( INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "cliinterface.h" #include "queries.h" #ifdef Q_OS_WIN # include #else # include # include #endif #include #include #include #include #include #include #include #include #include #include #include #include #include namespace Kerfuffle { CliInterface::CliInterface(QObject *parent, const QVariantList & args) : ReadWriteArchiveInterface(parent, args), m_process(0), m_testResult(true) { //because this interface uses the event loop setWaitForFinishedSignal(true); if (QMetaType::type("QProcess::ExitStatus") == 0) { qRegisterMetaType("QProcess::ExitStatus"); } } void CliInterface::cacheParameterList() { m_param = parameterList(); Q_ASSERT(m_param.contains(ExtractProgram)); Q_ASSERT(m_param.contains(ListProgram)); Q_ASSERT(m_param.contains(PreservePathSwitch)); Q_ASSERT(m_param.contains(FileExistsExpression)); Q_ASSERT(m_param.contains(FileExistsInput)); } CliInterface::~CliInterface() { Q_ASSERT(!m_process); } bool CliInterface::supportsParameter(CliInterfaceParameters param) { if (m_param.isEmpty()) cacheParameterList(); bool hasParam = false; if (m_param.contains(param)) { QVariant var = m_param.value(param); switch (var.type()) { case QVariant::StringList: hasParam = !var.toStringList().isEmpty(); break; case QVariant::String: hasParam = !var.toString().isEmpty(); break; case QVariant::Bool: hasParam = var.toBool(); break; default: break; } } return hasParam; } bool CliInterface::list() { cacheParameterList(); m_operationMode = List; QStringList args = m_param.value(ListArgs).toStringList(); substituteListVariables(args); if (!runProcess(m_param.value(ListProgram).toString(), args)) { failOperation(); return false; } return true; } bool CliInterface::copyFiles(const QList & files, const QString & destinationDirectory, ExtractionOptions options) { kDebug(); cacheParameterList(); m_operationMode = Copy; //start preparing the argument list QStringList args = m_param.value(ExtractArgs).toStringList(); //now replace the various elements in the list for (int i = 0; i < args.size(); ++i) { QString argument = args.at(i); kDebug() << "Processing argument " << argument; if (argument == QLatin1String("$Archive")) { args[i] = filename(); } if (argument == QLatin1String("$MultiThreadingSwitch")) { QString multiThreadingSwitch = m_param.value(MultiThreadingSwitch).toString(); bool multiThreading = options.value(QLatin1String("MultiThreadingEnabled")).toBool(); QString theReplacement; if (multiThreading == true) { theReplacement = multiThreadingSwitch; } if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$PreservePathSwitch")) { QStringList replacementFlags = m_param.value(PreservePathSwitch).toStringList(); Q_ASSERT(replacementFlags.size() == 2); bool preservePaths = options.value(QLatin1String("PreservePaths")).toBool(); QString theReplacement; if (preservePaths) { theReplacement = replacementFlags.at(0); } else { theReplacement = replacementFlags.at(1); } if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$PasswordSwitch")) { //if the PasswordSwitch argument has been added, we at least //assume that the format of the switch has been added as well Q_ASSERT(m_param.contains(PasswordSwitch)); //we will decrement i afterwards args.removeAt(i); //if we get a hint about this being a password protected archive, ask about //the password in advance. if ((options.value(QLatin1String("PasswordProtectedHint")).toBool()) && (password().isEmpty())) { kDebug() << "Password hint enabled, querying user"; Kerfuffle::PasswordNeededQuery query(filename()); userQuery(&query); query.waitForResponse(); if (query.responseCancelled()) { failOperation(); return false; } setPassword(query.password()); } QString pass = password(); if (!pass.isEmpty()) { QStringList theSwitch = m_param.value(PasswordSwitch).toStringList(); for (int j = 0; j < theSwitch.size(); ++j) { //get the argument part QString newArg = theSwitch.at(j); //substitute the $Path newArg.replace(QLatin1String("$Password"), pass); //put it in the arg list args.insert(i + j, newArg); ++i; } } --i; //decrement to compensate for the variable we replaced } if (argument == QLatin1String("$RootNodeSwitch")) { //if the RootNodeSwitch argument has been added, we at least //assume that the format of the switch has been added as well Q_ASSERT(m_param.contains(RootNodeSwitch)); //we will decrement i afterwards args.removeAt(i); QString rootNode; if (options.contains(QLatin1String("RootNode"))) { rootNode = options.value(QLatin1String("RootNode")).toString(); kDebug() << "Set root node " << rootNode; } if (!rootNode.isEmpty()) { QStringList theSwitch = m_param.value(RootNodeSwitch).toStringList(); for (int j = 0; j < theSwitch.size(); ++j) { //get the argument part QString newArg = theSwitch.at(j); //substitute the $Path newArg.replace(QLatin1String("$Path"), rootNode); //put it in the arg list args.insert(i + j, newArg); ++i; } } --i; //decrement to compensate for the variable we replaced } if (argument == QLatin1String("$Files")) { args.removeAt(i); for (int j = 0; j < files.count(); ++j) { args.insert(i + j, escapeFileName(files.at(j).toString())); ++i; } --i; } } kDebug() << "Setting current dir to " << destinationDirectory; QDir::setCurrent(destinationDirectory); if (!runProcess(m_param.value(ExtractProgram).toString(), args)) { failOperation(); return false; } - fixFileNameEncoding(destinationDirectory); + if ( options.value(QLatin1String("FixFileNameEncoding")).toBool() ) { + fixFileNameEncoding(destinationDirectory); + } return true; } void CliInterface::fixFileNameEncoding(const QString & destinationDirectory) { QDir destDir(destinationDirectory); destDir.setFilter(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::System); QStringList list = destDir.entryList(); for (int i = 0; i < list.size(); ++i) { QString encodingCorrectedString = autoConvertEncoding(list.at(i)); if (list.at(i) != encodingCorrectedString) { kDebug(1601) << "Renaming" << list.at(i) << "to" << encodingCorrectedString; QFile::rename(list.at(i), encodingCorrectedString); } } } bool CliInterface::addFiles(const QStringList & files, const CompressionOptions& options) { cacheParameterList(); m_operationMode = Add; const QString globalWorkDir = options.value(QLatin1String("GlobalWorkDir")).toString(); const QDir workDir = globalWorkDir.isEmpty() ? QDir::current() : QDir(globalWorkDir); if (!globalWorkDir.isEmpty()) { kDebug() << "GlobalWorkDir is set, changing dir to " << globalWorkDir; QDir::setCurrent(globalWorkDir); } //start preparing the argument list QStringList args = m_param.value(AddArgs).toStringList(); //now replace the various elements in the list for (int i = 0; i < args.size(); ++i) { const QString argument = args.at(i); kDebug() << "Processing argument " << argument; if (argument == QLatin1String("$CompressionLevelSwitch")) { QStringList compressionLevelSwitches = m_param.value(CompressionLevelSwitches).toStringList(); QString theReplacement = compressionLevelSwitches.at(options.value(QLatin1String("CompressionLevel"), 2).toInt()); if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$MultiThreadingSwitch")) { QString multiThreadingSwitch = m_param.value(MultiThreadingSwitch).toString(); bool multiThreading = options.value(QLatin1String("MultiThreadingEnabled")).toBool(); QString theReplacement; if (multiThreading == true) { theReplacement = multiThreadingSwitch; } if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$MultiPartSwitch")) { QString multiPartSwitch = m_param.value(MultiPartSwitch).toString(); int multiPartSize = options.value(QLatin1String("MultiPartSize")).toInt(); QString theReplacement; if (multiPartSize != 0) { theReplacement = multiPartSwitch; theReplacement.replace(QLatin1String("$MultiPartSize"), QString::number(multiPartSize)); } if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$PasswordSwitch")) { //if the PasswordSwitch argument has been added, we at least //assume that the format of the switch has been added as well Q_ASSERT(m_param.contains(PasswordSwitch)); //we will decrement i afterwards args.removeAt(i); //if we get a hint about this being a password protected archive, ask about //the password in advance. if ((options.value(QLatin1String("PasswordProtectedHint")).toBool()) && (password().isEmpty())) { kDebug() << "Password hint enabled, querying user"; Kerfuffle::PasswordNeededQuery query(filename()); userQuery(&query); query.waitForResponse(); if (query.responseCancelled()) { failOperation(); return false; } setPassword(query.password()); } QString pass = password(); if (!pass.isEmpty()) { QStringList theSwitch = m_param.value(PasswordSwitch).toStringList(); for (int j = 0; j < theSwitch.size(); ++j) { //get the argument part QString newArg = theSwitch.at(j); //substitute the $Path newArg.replace(QLatin1String("$Password"), pass); //put it in the arg list args.insert(i + j, newArg); ++i; } } --i; //decrement to compensate for the variable we replaced } if (argument == QLatin1String("$EncryptHeaderSwitch")) { QString encryptHeaderSwitch = m_param.value(EncryptHeaderSwitch).toString(); bool encryptHeader = options.value(QLatin1String("EncryptHeaderEnabled")).toBool(); QString theReplacement; if (encryptHeader == true) { theReplacement = encryptHeaderSwitch; } if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$EncryptionMethodSwitches")) { QStringList encryptionMethodSwitches = m_param.value(EncryptionMethodSwitches).toStringList(); QString encryptionMethod = options.value(QLatin1String("EncryptionMethod")).toString(); QString theReplacement; if (encryptionMethod == "AES256") { theReplacement = encryptionMethodSwitches.at(0); } if (encryptionMethod == "ZipCrypto") { theReplacement = encryptionMethodSwitches.at(1); } if (theReplacement.isEmpty()) { args.removeAt(i); --i; //decrement to compensate for the variable we removed } else { //but in this case we don't have to decrement, we just //replace it args[i] = theReplacement; } } if (argument == QLatin1String("$Archive")) { args[i] = filename(); } if (argument == QLatin1String("$Files")) { args.removeAt(i); for (int j = 0; j < files.count(); ++j) { // #191821: workDir must be used instead of QDir::current() // so that symlinks aren't resolved automatically // TODO: this kind of call should be moved upwards in the // class hierarchy to avoid code duplication const QString relativeName = workDir.relativeFilePath(files.at(j)); args.insert(i + j, relativeName); ++i; } --i; } } if (!runProcess(m_param.value(AddProgram).toString(), args)) { failOperation(); return false; } return true; } bool CliInterface::deleteFiles(const QList & files) { cacheParameterList(); m_operationMode = Delete; //start preparing the argument list QStringList args = m_param.value(DeleteArgs).toStringList(); //now replace the various elements in the list for (int i = 0; i < args.size(); ++i) { QString argument = args.at(i); kDebug() << "Processing argument " << argument; if (argument == QLatin1String("$Archive")) { args[i] = filename(); } else if (argument == QLatin1String("$Files")) { args.removeAt(i); for (int j = 0; j < files.count(); ++j) { args.insert(i + j, escapeFileName(files.at(j).toString())); ++i; } --i; } } m_removedFiles = files; if (!runProcess(m_param.value(DeleteProgram).toString(), args)) { failOperation(); return false; } return true; } bool CliInterface::testFiles(const QList & files, TestOptions options) { Q_UNUSED(options) kDebug(); cacheParameterList(); m_testResult = true; m_operationMode = Test; //start preparing the argument list QStringList args = m_param.value(TestArgs).toStringList(); //now replace the various elements in the list for (int i = 0; i < args.size(); ++i) { QString argument = args.at(i); kDebug() << "Processing argument " << argument; if (argument == QLatin1String("$Archive")) { args[i] = filename(); } if (argument == QLatin1String("$PasswordSwitch")) { //if the PasswordSwitch argument has been added, we at least //assume that the format of the switch has been added as well Q_ASSERT(m_param.contains(PasswordSwitch)); //we will decrement i afterwards args.removeAt(i); //if we get a hint about this being a password protected archive, ask about //the password in advance. if ((options.value(QLatin1String("PasswordProtectedHint")).toBool()) && (password().isEmpty())) { kDebug() << "Password hint enabled, querying user"; Kerfuffle::PasswordNeededQuery query(filename()); userQuery(&query); query.waitForResponse(); if (query.responseCancelled()) { failOperation(); return false; } setPassword(query.password()); } QString pass = password(); if (!pass.isEmpty()) { QStringList theSwitch = m_param.value(PasswordSwitch).toStringList(); for (int j = 0; j < theSwitch.size(); ++j) { //get the argument part QString newArg = theSwitch.at(j); //substitute the $Path newArg.replace(QLatin1String("$Password"), pass); //put it in the arg list args.insert(i + j, newArg); ++i; } } --i; //decrement to compensate for the variable we replaced } if (argument == QLatin1String("$Files")) { args.removeAt(i); for (int j = 0; j < files.count(); ++j) { args.insert(i + j, escapeFileName(files.at(j).toString())); ++i; } --i; } } if (!runProcess(m_param.value(TestProgram).toString(), args)) { failOperation(); return false; } return m_testResult; } bool CliInterface::runProcess(const QString& programName, const QStringList& arguments) { const QString programPath(KStandardDirs::findExe(programName)); if (programPath.isEmpty()) { error(i18nc("@info", "Failed to locate program %1 in PATH.", programName)); return false; } kDebug() << "Executing" << programPath << arguments; if (m_process) { m_process->waitForFinished(); delete m_process; } #ifdef Q_OS_WIN m_process = new KProcess(); #else m_process = new KPtyProcess(); m_process->setPtyChannels(KPtyProcess::StdinChannel); #endif m_process->setOutputChannelMode(KProcess::MergedChannels); m_process->setNextOpenMode(QIODevice::ReadWrite | QIODevice::Unbuffered | QIODevice::Text); m_process->setProgram(programPath, arguments); connect(m_process, SIGNAL(readyReadStandardOutput()), SLOT(readStdout()), Qt::DirectConnection); connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)), Qt::DirectConnection); m_stdOutData.clear(); m_process->start(); #ifdef Q_OS_WIN bool ret = m_process->waitForFinished(-1); #else QEventLoop loop; bool ret = (loop.exec(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents) == 0); #endif delete m_process; m_process = 0; return ret; } void CliInterface::processFinished(int exitCode, QProcess::ExitStatus exitStatus) { Q_UNUSED(exitCode) Q_UNUSED(exitStatus) kDebug(); //if the m_process pointer is gone, then there is nothing to worry //about here if (!m_process) { return; } if (m_operationMode == Delete) { foreach(const QVariant & v, m_removedFiles) { entryRemoved(v.toString()); } } //handle all the remaining data in the process readStdout(true); progress(1.0); if (m_operationMode == Add) { list(); return; } //and we're finished finished(true); } void CliInterface::failOperation() { kDebug(); doKill(); finished(false); } void CliInterface::readStdout(bool handleAll) { //when hacking this function, please remember the following: //- standard output comes in unpredictable chunks, this is why //you can never know if the last part of the output is a complete line or not //- console applications are not really consistent about what //characters they send out (newline, backspace, carriage return, //etc), so keep in mind that this function is supposed to handle //all those special cases and be the lowest common denominator Q_ASSERT(m_process); if (!m_process->bytesAvailable()) { //if process has no more data, we can just bail out return; } //if the process is still not finished (m_process is appearantly not //set to NULL if here), then the operation should definitely not be in //the main thread as this would freeze everything. assert this. Q_ASSERT(QThread::currentThread() != QApplication::instance()->thread()); QByteArray dd = m_process->readAllStandardOutput(); m_stdOutData += dd; QList lines = m_stdOutData.split('\n'); //The reason for this check is that archivers often do not end //queries (such as file exists, wrong password) on a new line, but //freeze waiting for input. So we check for errors on the last line in //all cases. bool foundErrorMessage = (checkForErrorMessage(QLatin1String(lines.last()), WrongPasswordPatterns) || checkForErrorMessage(QLatin1String(lines.last()), ExtractionFailedPatterns) || checkForPasswordPromptMessage(QLatin1String(lines.last())) || checkForFileExistsMessage(QLatin1String(lines.last()))); if (foundErrorMessage) { handleAll = true; } //this is complex, here's an explanation: //if there is no newline, then there is no guaranteed full line to //handle in the output. The exception is that it is supposed to handle //all the data, OR if there's been an error message found in the //partial data. if (lines.size() == 1 && !handleAll) { return; } if (handleAll) { m_stdOutData.clear(); } else { //because the last line might be incomplete we leave it for now //note, this last line may be an empty string if the stdoutdata ends //with a newline m_stdOutData = lines.takeLast(); } foreach(const QByteArray & line, lines) { if (!line.isEmpty()) { handleLine(QString::fromLocal8Bit(line)); } } } void CliInterface::handleLine(const QString& line) { if ((m_operationMode == Copy || m_operationMode == Add || m_operationMode == Test) && m_param.contains(CaptureProgress) && m_param.value(CaptureProgress).toBool()) { //read the percentage int pos = line.indexOf(QLatin1Char('%')); if (pos != -1 && pos > 1) { int percentage = line.mid(pos - 2, 2).toInt(); progress(float(percentage) / 100); return; } } if (m_operationMode == Copy) { if (checkForPasswordPromptMessage(line)) { kDebug() << "Found a password prompt"; Kerfuffle::PasswordNeededQuery query(filename()); userQuery(&query); query.waitForResponse(); if (query.responseCancelled()) { failOperation(); return; } setPassword(query.password()); const QString response(password() + QLatin1Char('\n')); writeToProcess(response.toLocal8Bit()); return; } if (checkForErrorMessage(line, WrongPasswordPatterns)) { kDebug() << "Wrong password!"; setPassword(QString()); error(i18n("Incorrect password.")); failOperation(); return; } if (checkForErrorMessage(line, ExtractionFailedPatterns)) { kDebug() << "Error in extraction!!"; error(i18n("Extraction failed because of an unexpected error.")); failOperation(); return; } if (handleFileExistsMessage(line)) { return; } } if (m_operationMode == List) { if (checkForPasswordPromptMessage(line)) { kDebug() << "Found a password prompt"; Kerfuffle::PasswordNeededQuery query(filename()); userQuery(&query); query.waitForResponse(); if (query.responseCancelled()) { failOperation(); return; } setPassword(query.password()); const QString response(password() + QLatin1Char('\n')); writeToProcess(response.toLocal8Bit()); return; } if (checkForErrorMessage(line, WrongPasswordPatterns)) { kDebug() << "Wrong password!"; error(i18n("Incorrect password.")); failOperation(); return; } if (checkForErrorMessage(line, ExtractionFailedPatterns)) { kDebug() << "Error in extraction!!"; error(i18n("Extraction failed because of an unexpected error.")); failOperation(); return; } if (handleFileExistsMessage(line)) { return; } readListLine(line); return; } if (m_operationMode == Test) { if (checkForPasswordPromptMessage(line)) { kDebug() << "Found a password prompt"; Kerfuffle::PasswordNeededQuery query(filename()); userQuery(&query); query.waitForResponse(); if (query.responseCancelled()) { failOperation(); return; } setPassword(query.password()); const QString response(password() + QLatin1Char('\n')); writeToProcess(response.toLocal8Bit()); return; } if (checkForErrorMessage(line, TestFailedPatterns) && checkForErrorMessage(line, WrongPasswordPatterns)) { m_testResult = false; error(i18n("Integrity check failed: Either the archive is broken or the password is incorrect.")); failOperation(); return; } if (checkForErrorMessage(line, TestFailedPatterns)) { m_testResult = false; error(i18n("Integrity check failed: The archive is broken.")); failOperation(); return; } if (checkForErrorMessage(line, WrongPasswordPatterns)) { kDebug() << "Wrong password!"; error(i18n("Incorrect password.")); failOperation(); return; } } } bool CliInterface::checkForPasswordPromptMessage(const QString& line) { const QString passwordPromptPattern(m_param.value(PasswordPromptPattern).toString()); if (passwordPromptPattern.isEmpty()) return false; if (m_passwordPromptPattern.isEmpty()) { m_passwordPromptPattern.setPattern(m_param.value(PasswordPromptPattern).toString()); } if (m_passwordPromptPattern.indexIn(line) != -1) { return true; } return false; } bool CliInterface::checkForFileExistsMessage(const QString& line) { if (m_existsPattern.isEmpty()) { m_existsPattern.setPattern(m_param.value(FileExistsExpression).toString()); } if (m_existsPattern.indexIn(line) != -1) { kDebug() << "Detected file existing!! Filename " << m_existsPattern.cap(1); return true; } return false; } bool CliInterface::handleFileExistsMessage(const QString& line) { if (!checkForFileExistsMessage(line)) { return false; } const QString filename = m_existsPattern.cap(1); Kerfuffle::OverwriteQuery query(QDir::current().path() + QLatin1Char('/') + filename); query.setNoRenameMode(true); userQuery(&query); kDebug() << "Waiting response"; query.waitForResponse(); kDebug() << "Finished response"; QString responseToProcess; const QStringList choices = m_param.value(FileExistsInput).toStringList(); if (query.responseOverwrite()) { responseToProcess = choices.at(0); } else if (query.responseSkip()) { responseToProcess = choices.at(1); } else if (query.responseOverwriteAll()) { responseToProcess = choices.at(2); } else if (query.responseAutoSkip()) { responseToProcess = choices.at(3); } else if (query.responseCancelled()) { if (choices.count() < 5) { // If the program has no way to cancel the extraction, we resort to killing it return doKill(); } responseToProcess = choices.at(4); } Q_ASSERT(!responseToProcess.isEmpty()); responseToProcess += QLatin1Char('\n'); writeToProcess(responseToProcess.toLocal8Bit()); return true; } bool CliInterface::checkForErrorMessage(const QString& line, int parameterIndex) { if (!m_param.contains(parameterIndex)) { return false; } foreach(const QString & rawPattern, m_param.value(parameterIndex).toStringList()) { if (QRegExp(rawPattern).indexIn(line) != -1) { return true; } } return false; } bool CliInterface::doKill() { if (m_process) { // Give some time for the application to finish gracefully if (!m_process->waitForFinished(5)) { m_process->kill(); } return true; } return false; } bool CliInterface::doSuspend() { return false; } bool CliInterface::doResume() { return false; } void CliInterface::substituteListVariables(QStringList& params) { for (int i = 0; i < params.size(); ++i) { const QString parameter = params.at(i); if (parameter == QLatin1String("$Archive")) { params[i] = filename(); } } } QString CliInterface::escapeFileName(const QString& fileName) const { return fileName; } void CliInterface::writeToProcess(const QByteArray& data) { Q_ASSERT(m_process); Q_ASSERT(!data.isNull()); kDebug() << "Writing" << data << "to the process"; #ifdef Q_OS_WIN m_process->write(data); #else m_process->pty()->write(data); #endif } QString CliInterface::autoConvertEncoding( const QString & fileName ) { QByteArray result( fileName.toLatin1() ); QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); KEncodingProber prober(KEncodingProber::CentralEuropean); KEncodingProber prober2(KEncodingProber::Universal); prober.feed(result); prober2.feed(result); QByteArray refinedEncoding; // fileName is probably in UTF-8 already. if (prober2.confidence() > 0.49) { refinedEncoding = prober2.encoding(); } else { refinedEncoding = prober.encoding(); } kDebug() << "KEncodingProber detected encodings: " << refinedEncoding << "for: " << fileName; // Workaround for CP850 support (which is frequently attributed to CP1251 by KEncodingProber instead) if (refinedEncoding == "windows-1251") { kDebug() << "Language: " << KGlobal::locale()->language(); if ( KGlobal::locale()->language() == "de" ) { // In case the user's language is German we refine the detection of KEncodingProber // by assuming that in a german environment the usage of serbian / macedonian letters // and special characters is less likely to happen than the usage of umlauts kDebug() << "fileName" << fileName; kDebug() << "toLatin: " << fileName.toLatin1(); // Check for case CP850 (Windows XP & Windows7) QString checkString = QTextCodec::codecForName("CP850")->toUnicode(fileName.toLatin1()); kDebug() << "String converted to CP850: " << checkString; if ( checkString.contains("ä") || // Equals lower quotation mark in CP1251 - unlikely to be used in filenames checkString.contains("ö") || // Equals quotation mark in CP1251 - unlikely to be used in filenames checkString.contains("Ö") || // Equals TM symbol - unlikely to be used in filenames checkString.contains("ü") || // Overlaps with "Gje" in the Macedonian alphabet checkString.contains("Ä") || // Overlaps with "Tshe" in the Serbian, Bosnian and Montenegrin alphabet checkString.contains("Ü") || // Overlaps with "Lje" in the Serbian and Montenegrin alphabet checkString.contains("ß") ) // Overlaps with "Be" in the cyrillic alphabet { refinedEncoding = "CP850"; kDebug() << "RefinedEncoding: " << refinedEncoding; } } } else if (refinedEncoding == "IBM855") { refinedEncoding = "IBM 850"; kDebug() << "Setting refinedEncoding to " << refinedEncoding; } else if (refinedEncoding == "IBM866") { refinedEncoding = "IBM 866"; kDebug() << "Setting refinedEncoding to " << refinedEncoding; } QTextCodec * codec = QTextCodec::codecForName(refinedEncoding); if (!codec) { kDebug() << "codecForName returned null, using codec ISO-8859-1 instead"; codec = QTextCodec::codecForName("ISO-8859-1"); } QString refinedString = codec->toUnicode(fileName.toLatin1()); return ( refinedString != fileName ) ? refinedString : fileName; } } #include "cliinterface.moc" diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp index dcdae4ad..5f86e3a8 100644 --- a/kerfuffle/jobs.cpp +++ b/kerfuffle/jobs.cpp @@ -1,363 +1,364 @@ /* * Copyright (c) 2007 Henrique Pinto * Copyright (c) 2008-2009 Harald Hvaal * Copyright (c) 2009-2010 Raphael Kubo da Costa * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ( INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "jobs.h" #include #include #include #include #include //#define DEBUG_RACECONDITION namespace Kerfuffle { class Job::Private : public QThread { public: Private(Job *job, QObject *parent = 0) : QThread(parent) , q(job) { connect(q, SIGNAL(result(KJob*)), SLOT(quit())); } virtual void run(); private: Job *q; }; void Job::Private::run() { q->doWork(); if (q->isRunning()) { exec(); } #ifdef DEBUG_RACECONDITION QThread::sleep(2); #endif } Job::Job(ReadOnlyArchiveInterface *interface, QObject *parent) : KJob(parent) , m_interface(interface) , m_isRunning(false) , d(new Private(this)) { static bool onlyOnce = false; if (!onlyOnce) { qRegisterMetaType >("QPair"); onlyOnce = true; } setCapabilities(KJob::Killable); } Job::~Job() { if (d->isRunning()) { d->wait(); } delete d; } bool Job::isRunning() const { return m_isRunning; } void Job::start() { m_isRunning = true; d->start(); } void Job::emitResult() { m_isRunning = false; KJob::emitResult(); } void Job::onError(const QString & message, const QString & details) { Q_UNUSED(details) setError(1); setErrorText(message); } void Job::onEntry(const ArchiveEntry & archiveEntry) { emit newEntry(archiveEntry); } void Job::onProgress(double value) { setPercent(static_cast(100.0*value)); } void Job::onInfo(const QString& info) { emit infoMessage(this, info); } void Job::onEntryRemoved(const QString & path) { emit entryRemoved(path); } void Job::onFinished(bool result) { kDebug() << result; m_interface->removeObserver(this); emitResult(); } void Job::onUserQuery(Query *query) { emit userQuery(query); } bool Job::doKill() { kDebug(); bool ret = m_interface->doKill(); if (!ret) { kDebug() << "Killing does not seem to be supported here."; } return ret; } ListJob::ListJob(ReadOnlyArchiveInterface *interface, QObject *parent) : Job(interface, parent) , m_isSingleFolderArchive(true) , m_isPasswordProtected(false) , m_extractedFilesSize(0) { connect(this, SIGNAL(newEntry(ArchiveEntry)), this, SLOT(onNewEntry(ArchiveEntry))); } void ListJob::doWork() { emit description(this, i18n("Loading archive...")); m_interface->registerObserver(this); bool ret = m_interface->list(); if (!m_interface->waitForFinishedSignal()) { m_interface->finished(ret); } } qlonglong ListJob::extractedFilesSize() const { return m_extractedFilesSize; } bool ListJob::isPasswordProtected() const { return m_isPasswordProtected; } bool ListJob::isSingleFolderArchive() const { return m_isSingleFolderArchive; } void ListJob::onNewEntry(const ArchiveEntry& entry) { m_extractedFilesSize += entry[ Size ].toLongLong(); m_isPasswordProtected |= entry [ IsPasswordProtected ].toBool(); if (m_isSingleFolderArchive) { const QString fileName(entry[FileName].toString()); const QString basePath(fileName.split(QLatin1Char( '/' )).at(0)); if (m_basePath.isEmpty()) { m_basePath = basePath; m_subfolderName = basePath; } else { if (m_basePath != basePath) { m_isSingleFolderArchive = false; m_subfolderName.clear(); } } } } QString ListJob::subfolderName() const { return m_subfolderName; } ExtractJob::ExtractJob(const QVariantList& files, const QString& destinationDir, ExtractionOptions options, ReadOnlyArchiveInterface *interface, QObject *parent) : Job(interface, parent) , m_files(files) , m_destinationDir(destinationDir) , m_options(options) { setDefaultOptions(); } void ExtractJob::doWork() { QString desc; if (m_files.count() == 0) { desc = i18n("Extracting all files"); } else { desc = i18np("Extracting one file", "Extracting %1 files", m_files.count()); } emit description(this, desc); m_interface->registerObserver(this); kDebug() << "Starting extraction with selected files:" << m_files << "Destination dir:" << m_destinationDir << "Options:" << m_options; bool ret = m_interface->copyFiles(m_files, m_destinationDir, m_options); if (!m_interface->waitForFinishedSignal()) { m_interface->finished(ret); } } void ExtractJob::setDefaultOptions() { ExtractionOptions defaultOptions; defaultOptions[QLatin1String("PreservePaths")] = false; defaultOptions[QLatin1String( "MultiThreadingEnabled") ] = false; + defaultOptions[QLatin1String( "FixFileNameEncoding") ] = true; ExtractionOptions::const_iterator it = defaultOptions.constBegin(); for (; it != defaultOptions.constEnd(); ++it) { if (!m_options.contains(it.key())) { m_options[it.key()] = it.value(); } } } QString ExtractJob::destinationDirectory() const { return m_destinationDir; } ExtractionOptions ExtractJob::extractionOptions() const { return m_options; } AddJob::AddJob(const QStringList& files, const CompressionOptions& options , ReadWriteArchiveInterface *interface, QObject *parent) : Job(interface, parent) , m_files(files) , m_options(options) { } void AddJob::doWork() { emit description(this, i18np("Adding a file", "Adding %1 files", m_files.count())); ReadWriteArchiveInterface *m_writeInterface = qobject_cast(m_interface); Q_ASSERT(m_writeInterface); m_writeInterface->registerObserver(this); bool ret = m_writeInterface->addFiles(m_files, m_options); if (!m_interface->waitForFinishedSignal()) { m_interface->finished(ret); } } DeleteJob::DeleteJob(const QVariantList& files, ReadWriteArchiveInterface *interface, QObject *parent) : Job(interface, parent) , m_files(files) { } void DeleteJob::doWork() { emit description(this, i18np("Deleting a file from the archive", "Deleting %1 files", m_files.count())); ReadWriteArchiveInterface *m_writeInterface = qobject_cast(m_interface); Q_ASSERT(m_writeInterface); m_writeInterface->registerObserver(this); int ret = m_writeInterface->deleteFiles(m_files); if (!m_interface->waitForFinishedSignal()) { m_interface->finished(ret); } } TestJob::TestJob(const QVariantList& files, const CompressionOptions& options, ReadOnlyArchiveInterface *interface, QObject *parent) : Job(interface, parent) , m_files(files) { Q_UNUSED(options) } void TestJob::doWork() { QString desc; if (m_files.count() == 0) { desc = i18n("Testing all files"); } else { desc = i18np("Testing one file", "Extracting %1 files", m_files.count()); } emit description(this, desc); m_interface->registerObserver(this); kDebug() << "Starting testing with selected files:" << m_files << "Options:" << m_options; bool ret = m_interface->testFiles(m_files, m_options); if (!m_interface->waitForFinishedSignal()) { m_interface->finished(ret); } } } // namespace Kerfuffle #include "jobs.moc" diff --git a/part/part.cpp b/part/part.cpp index 8be96b51..1cdf9e99 100644 --- a/part/part.cpp +++ b/part/part.cpp @@ -1,993 +1,996 @@ /* * ark -- archiver for the KDE project * * Copyright (C) 2007 Henrique Pinto * Copyright (C) 2008-2009 Harald Hvaal * Copyright (C) 2009 Raphael Kubo da Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include "part.h" #include "archivemodel.h" #include "archiveview.h" #include "arkviewer.h" #include "dnddbusinterface.h" #include "infopanel.h" #include "jobtracker.h" #include "kerfuffle/archive.h" #include "kerfuffle/createdialog.h" #include "kerfuffle/extractiondialog.h" #include "kerfuffle/jobs.h" #include "kerfuffle/settings.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include using namespace Kerfuffle; K_PLUGIN_FACTORY(Factory, registerPlugin();) K_EXPORT_PLUGIN(Factory("ark")) namespace Ark { Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args) : KParts::ReadWritePart(parent), m_model(new ArchiveModel(this)), m_splitter(0), m_previewDir(0), m_busy(false), m_jobTracker(0) { Q_UNUSED(args) setComponentData(Factory::componentData(), false); m_splitter = new QSplitter(Qt::Horizontal, parentWidget); setWidget(m_splitter); m_view = new ArchiveView; m_infoPanel = new InfoPanel(m_model); m_splitter->addWidget(m_view); m_splitter->addWidget(m_infoPanel); QList splitterSizes = ArkSettings::splitterSizes(); if (splitterSizes.isEmpty()) { splitterSizes.append(200); splitterSizes.append(100); } m_splitter->setSizes(splitterSizes); setupView(); setupActions(); connect(m_model, SIGNAL(loadingStarted()), this, SLOT(slotLoadingStarted())); connect(m_model, SIGNAL(loadingFinished(KJob*)), this, SLOT(slotLoadingFinished(KJob*))); connect(m_model, SIGNAL(droppedFiles(QStringList, QString)), this, SLOT(slotAddFiles(QStringList, QString))); connect(m_model, SIGNAL(error(QString, QString)), this, SLOT(slotError(QString, QString))); connect(this, SIGNAL(busy()), this, SLOT(setBusyGui())); connect(this, SIGNAL(ready()), this, SLOT(setReadyGui())); connect(this, SIGNAL(completed()), this, SLOT(setFileNameFromArchive())); m_statusBarExtension = new KParts::StatusBarExtension(this); new DndExtractAdaptor(this); QDBusConnection::sessionBus().registerObject(QLatin1String("/DndExtract"), this); setXMLFile(QLatin1String("ark_part.rc")); } Part::~Part() { updateSplitterSizes(); m_extractAction->menu()->deleteLater(); delete m_previewDir; m_previewDir = 0; } void Part::registerJob(KJob* job) { if (!m_jobTracker) { m_jobTracker = new JobTracker(widget()); m_statusBarExtension->addStatusBarItem(m_jobTracker->widget(0), 0, true); m_jobTracker->widget(job)->show(); } m_jobTracker->registerJob(job); emit busy(); connect(job, SIGNAL(result(KJob*)), this, SIGNAL(ready())); } // TODO: One should construct a KUrl out of localPath in order to be able to handle // non-local destinations (ie. trash:/ or a remote location) // See bugs #189322 and #204323. void Part::extractSelectedFilesTo(const QString& localPath) { kDebug() << "Extract to " << localPath; if (!m_model) { return; } if (m_view->selectionModel()->selectedRows().count() != 1) { m_view->selectionModel()->setCurrentIndex(m_view->currentIndex(), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); } if (m_view->selectionModel()->selectedRows().count() != 1) { return; } QVariant internalRoot; kDebug() << "valid " << m_view->currentIndex().parent().isValid(); if (m_view->currentIndex().parent().isValid()) { internalRoot = m_model->entryForIndex(m_view->currentIndex().parent()).value(InternalID); } if (internalRoot.isNull()) { //we have the special case valid parent, but the parent does not //actually correspond to an item in the archive, but an automatically //created folder. for now, we will just use the filename of the node //instead, but for plugins that rely on a non-filename value as the //InternalId, this WILL break things. TODO find a solution internalRoot = m_model->entryForIndex(m_view->currentIndex().parent()).value(FileName); } QList files = selectedFilesWithChildren(); if (files.isEmpty()) { return; } kDebug() << "selected files are " << files; Kerfuffle::ExtractionOptions options; options[QLatin1String("PreservePaths")] = true; if (!internalRoot.isNull()) { options[QLatin1String("RootNode")] = internalRoot; } options[QLatin1String("MultiThreadingEnabled")] = false; + options[QLatin1String("FixFileNameEncoding")] = true; ExtractJob *job = m_model->extractFiles(files, localPath, options); registerJob(job); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotExtractionDone(KJob*))); job->start(); } void Part::setupView() { m_view->setModel(m_model); m_view->setSortingEnabled(true); connect(m_view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(updateActions())); connect(m_view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(selectionChanged())); //TODO: fix an actual eventhandler connect(m_view, SIGNAL(itemTriggered(QModelIndex)), this, SLOT(slotPreview(QModelIndex))); connect(m_model, SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(adjustColumns())); } void Part::setupActions() { KToggleAction *showInfoPanelAction = new KToggleAction(i18nc("@action:inmenu", "Show information panel"), this); actionCollection()->addAction(QLatin1String("show-infopanel"), showInfoPanelAction); showInfoPanelAction->setChecked(m_splitter->sizes().at(1) > 0); connect(showInfoPanelAction, SIGNAL(triggered(bool)), this, SLOT(slotToggleInfoPanel(bool))); m_saveAsAction = KStandardAction::saveAs(this, SLOT(slotSaveAs()), actionCollection()); m_addAction = actionCollection()->addAction(QLatin1String("add")); m_addAction->setIcon(KIcon(QLatin1String("archive-insert"))); m_addAction->setText(i18n("&Add to archive")); m_addAction->setStatusTip(i18n("Click to add files and folders to the archive")); connect(m_addAction, SIGNAL(triggered(bool)), this, SLOT(slotAdd())); m_extractAction = actionCollection()->addAction(QLatin1String("extract")); m_extractAction->setText(i18n("E&xtract to...")); m_extractAction->setIcon(KIcon(QLatin1String("archive-extract"))); m_extractAction->setStatusTip(i18n("Click to open an extraction dialog, where you can choose to extract either all files or just the selected ones")); m_extractAction->setShortcut(QKeySequence(QLatin1String("Ctrl+E"))); connect(m_extractAction, SIGNAL(triggered(bool)), this, SLOT(slotExtractFiles())); m_testAction = actionCollection()->addAction(QLatin1String("test")); m_testAction->setText(i18n("T&est archive")); m_testAction->setIcon(KIcon(QLatin1String("document-edit-decrypt-verify"))); m_testAction->setStatusTip(i18n("Test archive for errors")); connect(m_testAction, SIGNAL(triggered(bool)), this, SLOT(slotTestArchive())); m_previewAction = actionCollection()->addAction(QLatin1String("preview")); m_previewAction->setText(i18nc("to preview a file inside an archive", "Pre&view")); m_previewAction->setIcon(KIcon(QLatin1String("document-preview"))); m_previewAction->setStatusTip(i18n("Click to preview the selected file")); connect(m_previewAction, SIGNAL(triggered(bool)), this, SLOT(slotPreview())); m_deleteAction = actionCollection()->addAction(QLatin1String("delete")); m_deleteAction->setIcon(KIcon(QLatin1String("archive-remove"))); m_deleteAction->setText(i18n("De&lete")); m_deleteAction->setShortcut(Qt::Key_Delete); m_deleteAction->setStatusTip(i18n("Click to delete the selected files")); connect(m_deleteAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteFiles())); m_renameAction = actionCollection()->addAction(QLatin1String("rename")); m_renameAction->setIcon(KIcon(QLatin1String("document-edit"))); m_renameAction->setText(i18n("&Rename")); m_renameAction->setStatusTip(i18n("Click to rename the selected files")); connect(m_renameAction, SIGNAL(triggered(bool)), this, SLOT(slotRenameFile())); updateActions(); } void Part::updateActions() { bool isWritable = m_model->archive() && (!m_model->archive()->isReadOnly()); m_saveAsAction->setEnabled(!isBusy() && m_model->archive()); m_addAction->setEnabled(!isBusy()); m_extractAction->setEnabled(!isBusy() && (m_model->rowCount() > 0)); m_testAction->setEnabled(!isBusy() && m_model->archive()); m_previewAction->setEnabled(!isBusy() && (m_view->selectionModel()->selectedRows().count() == 1) && isPreviewable(m_view->selectionModel()->currentIndex())); m_deleteAction->setEnabled(!isBusy() && (m_view->selectionModel()->selectedRows().count() > 0) && isWritable); m_renameAction->setEnabled(!isBusy() && (m_view->selectionModel()->selectedRows().count() == 1) && isWritable); } void Part::slotQuickExtractFiles(QAction *triggeredAction) { // #190507: triggeredAction->data.isNull() means it's the "Extract to..." // action, and we do not want it to run here if (!triggeredAction->data().isNull()) { kDebug() << "Extract to " << triggeredAction->data().toString(); const QString userDestination = triggeredAction->data().toString(); QString finalDestinationDirectory; const QString detectedSubfolder = detectSubfolder(); if (!isSingleFolderArchive()) { finalDestinationDirectory = userDestination + QDir::separator() + detectedSubfolder; QDir(userDestination).mkdir(detectedSubfolder); } else { finalDestinationDirectory = userDestination; } Kerfuffle::ExtractionOptions options; options[QLatin1String("PreservePaths")] = true; + options[QLatin1String("FixFileNameEncoding")] = true; QList files = selectedFiles(); ExtractJob *job = m_model->extractFiles(files, finalDestinationDirectory, options); registerJob(job); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotExtractionDone(KJob*))); job->start(); } } bool Part::isPreviewable(const QModelIndex& index) const { return index.isValid() && (!m_model->entryForIndex(index)[ IsDirectory ].toBool()); } void Part::selectionChanged() { m_infoPanel->setIndexes(m_view->selectionModel()->selectedRows()); } KAboutData* Part::createAboutData() { return new KAboutData("ark", 0, ki18n("ArkPart"), "3.0"); } bool Part::openFile() { QString localFile(localFilePath()); QFileInfo localFileInfo(localFile); const bool creatingNewArchive = arguments().metaData()[QLatin1String("createNewArchive")] == QLatin1String("true"); const QString archiveConflict = arguments().metaData().value(QLatin1String("archiveConflictHandling"), "rename"); if (localFileInfo.isDir()) { KMessageBox::error(NULL, i18nc("@info", "%1 is a directory.", localFile)); return false; } if (creatingNewArchive && localFileInfo.exists() && archiveConflict == "overwrite") { int overwrite = KMessageBox::warningContinueCancel(NULL, i18nc("@info", "The archive %1 already exists and will be overwritten.

Overwrite the archive?", localFile), i18nc("@title:window", "File Exists"), KGuiItem(i18n("Yes, overwrite"))); if (overwrite == KMessageBox::Cancel) { return false; } // remove the file, it will be recreated further down QFile file(localFileInfo.absoluteFilePath()); if (!localFileInfo.isWritable() || !file.remove()) { KMessageBox::sorry(NULL, i18nc("@info", "The archive %1 could not be overwritten", localFile), i18nc("@title:window", "Error Overwriting Archive")); return false; } } else if (creatingNewArchive && localFileInfo.exists() && archiveConflict == "rename") { QString basePath(localFileInfo.absolutePath()); QString name(localFileInfo.baseName()); name.remove(QRegExp("-[0-9]{2}$")); QString suffix(localFileInfo.suffix()); int counter = 0; while (localFileInfo.exists()) { counter++; localFileInfo.setFile(QString("%1/%2-%3.%4").arg(basePath, name, QString("%1").arg(counter, 2, 10, QLatin1Char('0')), suffix)); } int rename = KMessageBox::warningContinueCancel(NULL, i18nc("@info", "An archive %1 already exists.

The new archive will be renamed and saved as %2.

Rename the new archive?", localFile, localFileInfo.absoluteFilePath()), i18nc("@title:window", "File Exists"), KGuiItem(i18n("Yes, rename"))); if (rename == KMessageBox::Cancel) { return false; } setLocalFilePath(localFileInfo.absoluteFilePath()); localFile = localFileInfo.absoluteFilePath(); } else if (!creatingNewArchive && !localFileInfo.exists()) { KMessageBox::sorry(NULL, i18nc("@info", "The archive %1 was not found.", localFile), i18nc("@title:window", "Error Opening Archive")); return false; } Kerfuffle::Archive *archive = Kerfuffle::factory(localFile); if ((!archive) || ((creatingNewArchive) && (archive->isReadOnly()))) { QStringList mimeTypeList; QHash mimeTypes; if (creatingNewArchive) { mimeTypeList = Kerfuffle::supportedWriteMimeTypes(); } else { mimeTypeList = Kerfuffle::supportedMimeTypes(); } foreach(const QString & mime, mimeTypeList) { KMimeType::Ptr mimePtr(KMimeType::mimeType(mime)); if (mimePtr) { // Key = "application/zip", Value = "Zip Archive" mimeTypes[mime] = mimePtr->comment(); } } QStringList mimeComments(mimeTypes.values()); mimeComments.sort(); bool ok; QString item; if (creatingNewArchive) { item = KInputDialog::getItem(i18nc("@title:window", "Invalid Archive Type"), i18nc("@info", "Ark cannot create archives of the type you have chosen.Please choose another archive type below."), mimeComments, 0, false, &ok); } else { item = KInputDialog::getItem(i18nc("@title:window", "Unable to Determine Archive Type"), i18nc("@info", "Ark was unable to determine the archive type of the filename.Please choose the correct archive type below."), mimeComments, 0, false, &ok); } if ((!ok) || (item.isEmpty())) { return false; } archive = Kerfuffle::factory(localFile, mimeTypes.key(item)); } if (!archive) { KMessageBox::sorry(NULL, i18nc("@info", "Ark was not able to open the archive %1. No plugin capable of handling the file was found.", localFile), i18nc("@title:window", "Error Opening Archive")); return false; } KJob *job = m_model->setArchive(archive); registerJob(job); job->start(); m_infoPanel->setIndex(QModelIndex()); if (archive != 0 && arguments().metaData()[QLatin1String("showExtractDialog")] == QLatin1String("true")) { QTimer::singleShot(0, this, SLOT(slotExtractFiles())); } return (archive != 0); } bool Part::saveFile() { return true; } bool Part::isBusy() const { return m_busy; } void Part::slotLoadingStarted() { } void Part::slotLoadingFinished(KJob *job) { kDebug(); if (job->error()) { if (arguments().metaData()[QLatin1String("createNewArchive")] != QLatin1String("true")) { KMessageBox::sorry(NULL, i18nc("@info", "Loading the archive %1 failed with the following error: %2", localFilePath(), job->errorText()), i18nc("@title:window", "Error Opening Archive")); } } m_view->sortByColumn(0, Qt::AscendingOrder); m_view->expandToDepth(0); // After loading all files, resize the columns to fit all fields m_view->header()->resizeSections(QHeaderView::ResizeToContents); updateActions(); } void Part::setReadyGui() { kDebug(); QApplication::restoreOverrideCursor(); m_busy = false; m_view->setEnabled(true); updateActions(); } void Part::setBusyGui() { kDebug(); QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); m_busy = true; m_view->setEnabled(false); updateActions(); } void Part::setFileNameFromArchive() { const QString prettyName = url().fileName(); m_infoPanel->setPrettyFileName(prettyName); m_infoPanel->updateWithDefaults(); emit setWindowCaption(prettyName); } void Part::slotPreview() { slotPreview(m_view->selectionModel()->currentIndex()); } void Part::slotPreview(const QModelIndex & index) { if (!m_previewDir) { m_previewDir = new KTempDir(); } if (!isPreviewable(index)) { return; } const ArchiveEntry& entry = m_model->entryForIndex(index); if (!entry.isEmpty()) { Kerfuffle::ExtractionOptions options; options[QLatin1String("PreservePaths")] = true; ExtractJob *job = m_model->extractFile(entry[ InternalID ], m_previewDir->name(), options); registerJob(job); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotPreviewExtracted(KJob*))); job->start(); } } void Part::slotPreviewExtracted(KJob *job) { // FIXME: the error checking here isn't really working // if there's an error or an overwrite dialog, // the preview dialog will be launched anyway if (!job->error()) { const ArchiveEntry& entry = m_model->entryForIndex(m_view->selectionModel()->currentIndex()); QString fullNameInternal = m_previewDir->name() + QLatin1Char('/') + entry[InternalID].toString(); QString fullName = m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString(); if (fullNameInternal != fullName) { QFile::rename(fullNameInternal, fullName); } // Make sure a maliciously crafted archive with parent folders named ".." do // not cause the previewed file path to be located outside the temporary // directory, resulting in a directory traversal issue. fullName.remove(QLatin1String("../")); ArkViewer::view(fullName, widget()); } else { KMessageBox::error(widget(), job->errorString()); } setReadyGui(); } void Part::slotError(const QString& errorMessage, const QString& details) { if (details.isEmpty()) { KMessageBox::error(widget(), errorMessage); } else { KMessageBox::detailedError(widget(), errorMessage, details); } } bool Part::isSingleFolderArchive() const { return m_model->archive()->isSingleFolderArchive(); } QString Part::detectSubfolder() const { if (!m_model) { return QString(); } return m_model->archive()->subfolderName(); } void Part::slotExtractFiles() { if (!m_model) { return; } QWeakPointer dialog = new Kerfuffle::ExtractionDialog; if (m_view->selectionModel()->selectedRows().count() > 0) { dialog.data()->setShowSelectedFiles(true); } dialog.data()->setSingleFolderArchive(isSingleFolderArchive()); dialog.data()->setSubfolder(detectSubfolder()); dialog.data()->setCurrentUrl(QFileInfo(m_model->archive()->fileName()).path()); if (dialog.data()->exec()) { //this is done to update the quick extract menu updateActions(); QVariantList files; //if the user has chosen to extract only selected entries, fetch these //from the listview if (!dialog.data()->extractAllFiles()) { files = selectedFilesWithChildren(); } kDebug() << "Selected " << files; Kerfuffle::ExtractionOptions options; if (dialog.data()->preservePaths()) { options[QLatin1String("PreservePaths")] = true; } options[QLatin1String("FollowExtractionDialogSettings")] = true; + options[QLatin1String("FixFileNameEncoding")] = true; const QString destinationDirectory = dialog.data()->destinationDirectory().pathOrUrl(); ExtractJob *job = m_model->extractFiles(files, destinationDirectory, options); registerJob(job); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotExtractionDone(KJob*))); job->start(); } delete dialog.data(); } QList Part::selectedFilesWithChildren() { Q_ASSERT(m_model); QModelIndexList toIterate = m_view->selectionModel()->selectedRows(); for (int i = 0; i < toIterate.size(); ++i) { QModelIndex index = toIterate.at(i); for (int j = 0; j < m_model->rowCount(index); ++j) { QModelIndex child = m_model->index(j, 0, index); if (!toIterate.contains(child)) { toIterate << child; } } } QVariantList ret; foreach(const QModelIndex & index, toIterate) { const ArchiveEntry& entry = m_model->entryForIndex(index); if (entry.contains(InternalID)) { ret << entry[ InternalID ]; } } return ret; } QList Part::selectedFiles() { QStringList toSort; foreach(const QModelIndex & index, m_view->selectionModel()->selectedRows()) { const ArchiveEntry& entry = m_model->entryForIndex(index); toSort << entry[ InternalID ].toString(); } toSort.sort(); QVariantList ret; foreach(const QString & i, toSort) { ret << i; } return ret; } void Part::slotExtractionDone(KJob* job) { kDebug(); if (job->error()) { KMessageBox::error(widget(), job->errorString()); } else { ExtractJob *extractJob = qobject_cast(job); Q_ASSERT(extractJob); const bool followExtractionDialogSettings = extractJob->extractionOptions().value(QLatin1String("FollowExtractionDialogSettings"), false).toBool(); if (!followExtractionDialogSettings) { return; } if (ArkSettings::openDestinationFolderAfterExtraction()) { KUrl destinationDirectory(extractJob->destinationDirectory()); destinationDirectory.cleanPath(); KRun::runUrl(destinationDirectory, QLatin1String("inode/directory"), widget()); } if (ArkSettings::closeAfterExtraction()) { emit quit(); } } } void Part::adjustColumns() { kDebug(); m_view->header()->setResizeMode(0, QHeaderView::ResizeToContents); } void Part::slotAdd() { kDebug(); if (!m_model->archive()) { Kerfuffle::CreateDialog archiveDialog; if (archiveDialog.exec() != CreateDialog::Accepted) { return; } const KUrl saveFileUrl = archiveDialog.archiveUrl(); KParts::OpenUrlArguments openArgs; openArgs.metaData()[QLatin1String("createNewArchive")] = QLatin1String("true"); if (saveFileUrl.isEmpty()) { return; } CompressionOptions options = archiveDialog.options(); if (options.value("ArchiveConflicts").toInt() == 1) { openArgs.metaData()[QLatin1String("archiveConflictHandling")] = QLatin1String("overwrite"); } else { openArgs.metaData()[QLatin1String("archiveConflictHandling")] = QLatin1String("rename"); } setArguments(openArgs); bool created = openUrl(saveFileUrl); openArgs.metaData().remove(QLatin1String("showExtractDialog")); openArgs.metaData().remove(QLatin1String("createNewArchive")); openArgs.metaData().remove(QLatin1String("archiveConflictHandling")); if (!created) { return; } } // #264819: passing widget() as the parent will not work as expected. // KFileDialog will create a KFileWidget, which runs an internal // event loop to stat the given directory. This, in turn, leads to // events being delivered to widget(), which is a QSplitter, which // in turn reimplements childEvent() and will end up calling // QWidget::show() on the KFileDialog (thus showing it in a // non-modal state). // When KFileDialog::exec() is called, the widget is already shown // and nothing happens. KFileDialog fileDialog(KUrl("kfiledialog:///ArkAddFiles"), QString(), widget()->parentWidget()); fileDialog.setCaption(i18nc("@title:window", "Add")); fileDialog.setMode(KFile::Files | KFile::Directory | KFile::ExistingOnly); if (fileDialog.exec() != KFileDialog::Accepted) { return; } const QStringList filesToAdd = fileDialog.selectedFiles(); slotAddFiles(filesToAdd); } void Part::slotAddFiles(const QStringList& filesToAdd, const QString& path) { if (filesToAdd.isEmpty()) { return; } kDebug() << "Adding " << filesToAdd << " to " << path; kDebug() << "Warning, for now the path argument is not implemented"; QStringList cleanFilesToAdd(filesToAdd); for (int i = 0; i < cleanFilesToAdd.size(); ++i) { QString& file = cleanFilesToAdd[i]; if (QFileInfo(file).isDir()) { if (!file.endsWith(QLatin1Char('/'))) { file += QLatin1Char('/'); } } } CompressionOptions options; QString firstPath = cleanFilesToAdd.first(); if (firstPath.right(1) == QLatin1String("/")) { firstPath.chop(1); } firstPath = QFileInfo(firstPath).dir().absolutePath(); kDebug() << "Detected relative path to be " << firstPath; options[QLatin1String("GlobalWorkDir")] = firstPath; options[QLatin1String("CompressionLevel") ] = QVariant(4); options[QLatin1String("MultiThreadingEnabled") ] = false; options[QLatin1String("EncryptHeaderEnabled") ] = false; // options[QLatin1String( "EncryptionMethod")] = "AES256"; options[QLatin1String("PasswordProtectedHint") ] = false; options[QLatin1String("MultiPartSize") ] = 0; AddJob *job = m_model->addFiles(cleanFilesToAdd, options); if (!job) { return; } connect(job, SIGNAL(result(KJob*)), this, SLOT(slotAddFilesDone(KJob*))); registerJob(job); job->start(); } void Part::slotAddFilesDone(KJob* job) { kDebug(); if (job->error()) { KMessageBox::error(widget(), job->errorString()); } } void Part::slotDeleteFilesDone(KJob* job) { kDebug(); if (job->error()) { KMessageBox::error(widget(), job->errorString()); } } void Part::slotDeleteFiles() { kDebug(); const int reallyDelete = KMessageBox::questionYesNo(NULL, i18n("Deleting these files is not undoable. Are you sure you want to do this?"), i18nc("@title:window", "Delete files"), KStandardGuiItem::del(), KStandardGuiItem::cancel(), QString(), KMessageBox::Dangerous | KMessageBox::Notify); if (reallyDelete == KMessageBox::No) { return; } DeleteJob *job = m_model->deleteFiles(selectedFilesWithChildren()); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotDeleteFilesDone(KJob*))); registerJob(job); job->start(); } void Part::slotToggleInfoPanel(bool visible) { QList splitterSizes; if (visible) { splitterSizes = ArkSettings::splitterSizesWithBothWidgets(); } else { splitterSizes = m_splitter->sizes(); ArkSettings::setSplitterSizesWithBothWidgets(splitterSizes); splitterSizes[1] = 0; } m_splitter->setSizes(splitterSizes); updateSplitterSizes(); } void Part::updateSplitterSizes() { ArkSettings::setSplitterSizes(m_splitter->sizes()); ArkSettings::self()->writeConfig(); } void Part::slotSaveAs() { KUrl saveUrl = KFileDialog::getSaveUrl(KUrl(QLatin1String("kfiledialog:///ArkSaveAs/") + url().fileName()), QString(), widget()); if ((saveUrl.isValid()) && (!saveUrl.isEmpty())) { if (KIO::NetAccess::exists(saveUrl, KIO::NetAccess::DestinationSide, widget())) { int overwrite = KMessageBox::warningContinueCancel(widget(), i18nc("@info", "An archive named %1 already exists. Are you sure you want to overwrite it?", saveUrl.fileName()), QString(), KStandardGuiItem::overwrite()); if (overwrite != KMessageBox::Continue) { return; } } KUrl srcUrl = KUrl::fromPath(localFilePath()); if (!QFile::exists(localFilePath())) { if (url().isLocalFile()) { KMessageBox::error(widget(), i18nc("@info", "The archive %1 cannot be copied to the specified location. The archive does not exist anymore.", localFilePath())); return; } else { srcUrl = url(); } } KIO::Job *copyJob = KIO::file_copy(srcUrl, saveUrl, -1, KIO::Overwrite); if (!KIO::NetAccess::synchronousRun(copyJob, widget())) { KMessageBox::error(widget(), i18nc("@info", "The archive could not be saved as %1. Try saving it to another location.", saveUrl.pathOrUrl())); } } } void Part::slotTestArchive() { if (!m_model) { return; } kDebug(); TestJob *job = m_model->testFiles(selectedFilesWithChildren()); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotTestFilesDone(KJob*))); registerJob(job); job->start(); } void Part::slotTestArchiveDone(KJob* job) { kDebug(); if (!job->error()) { KMessageBox::information(widget(), "Testing complete: no issues found."); } else { KMessageBox::error(widget(), job->errorString()); } } void Part::slotRenameFile() { kError() << "This has not been implemented yet."; } } // namespace Ark