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

Move status strings to connector backend

This commit is contained in:
Martchus 2017-02-20 18:00:42 +01:00
parent e7c03881f1
commit eab769b654
5 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cli/application.cpp
View File

@ -327,24 +327,7 @@ void Application::printStatus(const ArgumentOccurrence &)
setStyle(cout);
printProperty("Label", dir->label);
printProperty("Path", dir->path);
const char *status;
switch(dir->status) {
case SyncthingDirStatus::Idle:
status = "idle"; break;
case SyncthingDirStatus::Unshared:
status = "unshared"; break;
case SyncthingDirStatus::Scanning:
status = "scanning"; break;
case SyncthingDirStatus::Synchronizing:
status = "synchronizing"; break;
case SyncthingDirStatus::Paused:
status = "paused"; break;
case SyncthingDirStatus::OutOfSync:
status = "out of sync"; break;
default:
status = "unknown";
}
printProperty("Status", status);
printProperty("Status", statusString(dir->status));
printProperty("Last scan time", dir->lastScanTime);
printProperty("Last file time", dir->lastFileTime);
printProperty("Last file name", dir->lastFileName);
@ -377,26 +360,11 @@ void Application::printStatus(const ArgumentOccurrence &)
cout << dev->name.toLocal8Bit().data() << '\n';
setStyle(cout);
printProperty("ID", dev->id);
const char *status;
QString status;
if(dev->paused) {
status = "paused";
status = QStringLiteral("paused");
} else {
switch(dev->status) {
case SyncthingDevStatus::Disconnected:
status = "disconnected"; break;
case SyncthingDevStatus::OwnDevice:
status = "own device"; break;
case SyncthingDevStatus::Idle:
status = "idle"; break;
case SyncthingDevStatus::Synchronizing:
status = "synchronizing"; break;
case SyncthingDevStatus::OutOfSync:
status = "out of sync"; break;
case SyncthingDevStatus::Rejected:
status = "rejected"; break;
default:
status = "unknown";
}
status = statusString(dev->status);
}
printProperty("Status", status);
printProperty("Addresses", dev->addresses);

22
connector/syncthingdev.cpp
View File

@ -1,7 +1,27 @@
#include "./syncthingdev.h"
#include <QCoreApplication>
namespace Data {
QString statusString(SyncthingDevStatus status)
{
switch(status) {
case SyncthingDevStatus::Unknown:
return QCoreApplication::translate("SyncthingDevStatus", "unknown");
case SyncthingDevStatus::Disconnected:
return QCoreApplication::translate("SyncthingDevStatus", "disconnected");
case SyncthingDevStatus::OwnDevice:
return QCoreApplication::translate("SyncthingDevStatus", "own device");
case SyncthingDevStatus::Idle:
return QCoreApplication::translate("SyncthingDevStatus", "idle");
case SyncthingDevStatus::Synchronizing:
return QCoreApplication::translate("SyncthingDevStatus", "synchronizing");
case SyncthingDevStatus::OutOfSync:
return QCoreApplication::translate("SyncthingDevStatus", "out of sync");
case SyncthingDevStatus::Rejected:
return QCoreApplication::translate("SyncthingDevStatus", "rejected");
}
}
} // namespace Data

2
connector/syncthingdev.h
View File

@ -21,6 +21,8 @@ enum class SyncthingDevStatus
Rejected
};
QString statusString(SyncthingDevStatus status);
struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDev
{
SyncthingDev(const QString &id = QString(), const QString &name = QString());

21
connector/syncthingdir.cpp
View File

@ -4,12 +4,33 @@
#include <QStringBuilder>
#include <QJsonObject>
#include <QCoreApplication>
using namespace ChronoUtilities;
using namespace ConversionUtilities;
namespace Data {
QString statusString(SyncthingDirStatus status)
{
switch(status) {
case SyncthingDirStatus::Unknown:
return QCoreApplication::translate("SyncthingDirStatus", "unknown");
case SyncthingDirStatus::Idle:
return QCoreApplication::translate("SyncthingDirStatus", "idle");
case SyncthingDirStatus::Unshared:
return QCoreApplication::translate("SyncthingDirStatus", "unshared");
case SyncthingDirStatus::Scanning:
return QCoreApplication::translate("SyncthingDirStatus", "scanning");
case SyncthingDirStatus::Synchronizing:
return QCoreApplication::translate("SyncthingDirStatus", "synchronizing");
case SyncthingDirStatus::Paused:
return QCoreApplication::translate("SyncthingDirStatus", "paused");
case SyncthingDirStatus::OutOfSync:
return QCoreApplication::translate("SyncthingDirStatus", "out of sync");
}
}
/*!
* \brief Assigns the status from the specified status string.
* \returns Returns whether the status has actually changed.

2
connector/syncthingdir.h
View File

@ -23,6 +23,8 @@ enum class SyncthingDirStatus
OutOfSync
};
QString statusString(SyncthingDirStatus status);
struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDirError
{
SyncthingDirError(const QString &message, const QString &path) :