Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: Use error phrases from c++utilities

This commit is contained in:
Martchus 2017-09-26 15:43:34 +02:00
parent 16854a110e
commit 044f20343c
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cli/application.cpp
View File

@ -116,10 +116,11 @@ int Application::exec(int argc, const char *const *argv)
const char *apiKeyArgValue = m_args.apiKey.firstValue();
if (!config.restore(configFile)) {
if (configFileArgValue) {
cerr << "Error: Unable to locate specified Syncthing config file \"" << configFileArgValue << "\"" << endl;
cerr << Phrases::Error << "Unable to locate specified Syncthing config file \"" << configFileArgValue << "\"" << Phrases::End
<< flush;
return -1;
} else if (!apiKeyArgValue) {
cerr << "Error: Unable to locate Syncthing config file and no API key specified" << endl;
cerr << Phrases::Error << "Unable to locate Syncthing config file and no API key specified" << Phrases::End << flush;
return -2;
}
}
@ -145,7 +146,8 @@ int Application::exec(int argc, const char *const *argv)
if (const char *certArgValue = m_args.certificate.firstValue()) {
m_settings.httpsCertPath = argToQString(certArgValue);
if (m_settings.httpsCertPath.isEmpty() || !m_settings.loadHttpsCert()) {
cerr << "Error: Unable to load specified certificate \"" << m_args.certificate.firstValue() << "\"" << endl;
cerr << Phrases::Error << "Unable to load specified certificate \"" << m_args.certificate.firstValue() << '\"' << Phrases::End
<< flush;
return -3;
}
}
@ -198,7 +200,7 @@ void Application::handleResponse()
QCoreApplication::quit();
}
} else {
cerr << "Error: Unexpected response" << endl;
cerr << Phrases::Error << "Unexpected response" << Phrases::End << flush;
QCoreApplication::exit(-4);
}
}
@ -209,11 +211,8 @@ void Application::handleError(
VAR_UNUSED(category)
VAR_UNUSED(networkError)
eraseLine(cout);
cerr << '\n';
setStyle(cerr, Color::Red, ColorContext::Foreground, TextAttribute::Bold);
cerr << "\rError: ";
resetStyle(cerr);
cerr << message.toLocal8Bit().data();
cerr << '\n' << '\r' << Phrases::Error;
cerr << message.toLocal8Bit().data() << Phrases::End;
const QUrl url(request.url());
if (!url.isEmpty()) {
cerr << "\nRequest: " << url.toString(QUrl::PrettyDecoded).toLocal8Bit().data();
@ -379,7 +378,8 @@ void Application::findRelevantDirsAndDevs(OperationType operationType)
if (const SyncthingDir *dir = m_connection.findDirInfo(argToQString(dirArg->values(i).front()), dummy)) {
m_relevantDirs.emplace_back(dir);
} else {
cerr << "Warning: Specified directory \"" << dirArg->values(i).front() << "\" does not exist and will be ignored" << endl;
cerr << Phrases::Warning << "Specified directory \"" << dirArg->values(i).front() << "\" does not exist and will be ignored"
<< Phrases::End;
}
}
}
@ -393,7 +393,8 @@ void Application::findRelevantDirsAndDevs(OperationType operationType)
if (dev) {
m_relevantDevs.emplace_back(dev);
} else {
cerr << "Warning: Specified device \"" << devArg->values(i).front() << "\" does not exist and will be ignored" << endl;
cerr << Phrases::Warning << "Specified device \"" << devArg->values(i).front() << "\" does not exist and will be ignored"
<< Phrases::End;
}
}
}
@ -425,7 +426,8 @@ bool Application::findPwd()
return true;
}
}
cerr << "Error: The current working directory \"" << pwd.toLocal8Bit().data() << "\" is not (part of) a Syncthing directory." << endl;
cerr << Phrases::Error << "The current working directory \"" << pwd.toLocal8Bit().data() << "\" is not (part of) a Syncthing directory.";
cerr << Phrases::End << flush;
QCoreApplication::exit(2);
return false;
}

2
cli/helper.h
View File

@ -61,7 +61,7 @@ inline void printProperty(const char *propName, bool value, const char *suffix =
printProperty(propName, value ? "yes" : "no", suffix, indentation);
}
template <typename NumberType, Traits::EnableIf<std::is_floating_point<NumberType>, std::is_integral<NumberType>>>
template <typename NumberType, Traits::EnableIfAny<std::is_floating_point<NumberType>, std::is_integral<NumberType>>...>
inline void printProperty(
const char *propName, const NumberType value, const char *suffix = nullptr, bool force = false, ApplicationUtilities::Indentation indentation = 3)
{

8
connector/syncthingconnectionmockhelpers.cpp
View File

@ -1,6 +1,7 @@
#include "./syncthingconnectionmockhelpers.h"
#include <c++utilities/conversion/stringbuilder.h>
#include <c++utilities/io/ansiescapecodes.h>
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/io/misc.h>
#include <c++utilities/tests/testutils.h>
@ -15,6 +16,7 @@
using namespace std;
using namespace IoUtilities;
using namespace EscapeCodes;
using namespace ConversionUtilities;
namespace Data {
@ -33,7 +35,7 @@ static string folderStatus;
static string folderStatus2;
static string connections;
static string events;
}
} // namespace TestData
/*!
* \brief Loads test files for mocked configuration from directory specified via environment variable TESTFILE_PATH.
@ -52,7 +54,7 @@ void setupTestData()
const char *testfilePath = getenv("TESTFILE_PATH");
if (!testfilePath || !*testfilePath) {
cerr << "Error: TESTFILE_PATH is not set; unable to initialize mock config." << endl;
cerr << Phrases::Error << "TESTFILE_PATH is not set; unable to initialize mock config." << Phrases::End << flush;
exit(-1);
}
@ -190,4 +192,4 @@ void MockedReply::emitFinished()
setFinished(true);
emit finished();
}
}
} // namespace Data

2
connector/syncthingconnectionmockhelpers.h
View File

@ -61,6 +61,6 @@ private:
const char *m_pos;
qint64 m_bytesLeft;
};
}
} // namespace Data
#endif // SYNCTHINGCONNECTIONMOCKHELPERS_H