Compare commits

..

25 Commits

Author SHA1 Message Date
3d92d3179f Merge branch 'feature/apiClienRefactoring' into develop 2026-05-09 11:36:53 +02:00
0feaf09d83 Auth token is stored in settings and deleted if a request is not authorized (with automatic re-login). Failed request need to be resend. 2026-05-08 14:44:40 +02:00
ceaf6b5fbd sendItem(...) & deleteItem(...) use the more generic send...Request(...) functions. (No merging of UUID of sent item into model and no deletion of local item yet.) 2026-05-04 08:16:48 +02:00
760c778c3b fetchItems() uses the more generic sendGetRequest function. 2026-05-03 09:44:32 +02:00
b1f7fbff8b Minor refactoring for API authentication. 2026-05-02 11:34:22 +02:00
b76523ec75 API authentication token is read from settings and set as bearer token. 2026-04-27 08:02:17 +02:00
178850e0bc Reordered GenericCore function implementations according to their declarations. 2026-04-22 16:55:45 +02:00
0a2b0d840b Added NUMBER_ROLES to metadata.h for use in GUI source code. 2026-04-08 17:23:05 +02:00
54d537dc9b Roles can now be declared read-only. First read-only role: IdRole 2026-04-02 09:37:36 +02:00
a9a4b39da1 Don't set missing model item values to default value from JSON object. 2026-03-14 09:29:43 +01:00
5b62f9461b CSV import has now support for optional columns. 2026-03-12 10:37:12 +01:00
5530aff2f3 Converting saveItems() into a public slot to be invokable from QML. 2026-03-09 15:44:51 +01:00
c1ee2135df TableModel::setData can now be called for column 0 with different roles to edit. (Doesn't rely on Qt::EditRole and RoleForColumn in all cases) 2026-03-09 07:46:28 +01:00
a6648b7d1e Added "display" as role name. (For the QML UI) 2026-03-05 12:30:43 +01:00
dbfaee27dc Added messagehandler.h (moved from widgets UI project). 2026-03-03 18:56:39 +01:00
f392efb54f Added static GET_HEADER_FOR_COLUMN(const int column) function. 2026-03-02 16:25:01 +01:00
057bd244bd Added type roles to the calculation if an item is equal to the given item values. 2026-03-01 11:37:00 +01:00
c9d67ff2cc In TableModel::data(...): Default to ModelItem::data(...) for non user facing roles too. 2026-03-01 11:35:26 +01:00
13dc22de9f Add type roles to the model sorting capabilities. 2026-03-01 11:34:06 +01:00
e68b446407 A new role doesn't have to be added to TableModel::data(...) anymore. 2026-03-01 11:33:08 +01:00
6fc3ffc537 Added missing type role to TableModel::data(...). 2026-03-01 11:25:57 +01:00
f694e0e5ed Further refactoring after the addition of the type role. 2026-03-01 11:11:46 +01:00
becde8c794 Added type role and column & refactored the JsonParser in the process. 2026-03-01 10:59:34 +01:00
1db5d9022a Hotfix: Using the correct member variable for the model tester of the proxy model in Release compilation. 2026-02-04 11:52:09 +01:00
cf55adc34e Bumped version to 0.3.0. 2026-02-04 11:28:08 +01:00
18 changed files with 723 additions and 200 deletions

View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.16)
set(TARGET_APP "GenericCore")
project(${TARGET_APP} VERSION 0.2.0 LANGUAGES CXX)
project(${TARGET_APP} VERSION 0.3.0 LANGUAGES CXX)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
@ -38,6 +38,7 @@ add_library(${TARGET_APP} STATIC
network/apiroutes.h
# 3rd party libraries
../3rdParty/rapidcsv/src/rapidcsv.h
utils/messagehandler.h
)
include_directories(${CMAKE_CURRENT_BINARY_DIR})

View File

@ -45,6 +45,7 @@ QList<ModelItemValues> FileHandler::getItemValuesFromCSVFile(const QString& file
QFile file;
file.setFileName(filePath);
if (file.exists()) {
// TODO inform UI on CSV import errors
result = CsvParser::getItemsFromCSVFile(filePath);
}
return result;

View File

@ -40,4 +40,48 @@ void SettingsHandler::saveSettings(QVariantMap settingMap, QString group) {
settings.sync();
}
void SettingsHandler::deleteSettings(QStringList keys, QString group) {
qInfo() << "deleting settings...";
QSettings settings;
if (!group.isEmpty()) {
qDebug() << "starting group:" << group;
settings.beginGroup(group);
}
foreach (QString key, keys) {
qDebug() << "removing:" << key;
settings.remove(key);
}
if (!group.isEmpty()) {
settings.endGroup();
}
settings.sync();
}
QVariantMap SettingsHandler::getChangeset(QVariantMap newSettings, QString group) {
const QVariantMap oldSettings = getSettings(group);
QVariantMap result;
for (QVariantMap::const_iterator iter = newSettings.begin(); iter != newSettings.end(); ++iter) {
qDebug() << iter.key() << iter.value();
QString key = iter.key();
QVariant newValue = iter.value();
QVariant oldValue = oldSettings.value(key);
if (oldValue == newValue) {
qInfo() << "oldValue == newValue -> ignoring...";
} else {
const QString debugString =
QString("oldValue != newValue -> adding '%1' to changeset...").arg(key);
qInfo() << debugString;
result.insert(key, newValue);
}
}
return result;
}
SettingsHandler::SettingsHandler() {}

View File

@ -7,6 +7,9 @@ class SettingsHandler {
public:
static QVariantMap getSettings(QString group = "");
static void saveSettings(QVariantMap settingMap, QString group = "");
static void deleteSettings(QStringList keys, QString group = "");
static QVariantMap getChangeset(QVariantMap newSettings, QString group = "");
private:
SettingsHandler();

View File

@ -52,7 +52,11 @@ bool CsvParser::isCsvCompatible(const rapidcsv::Document& doc) {
qInfo() << "Checking CSV document for compatiblity...";
const std::vector<std::string> columnNames = doc.GetColumnNames();
for (const QString& headerName : GET_HEADER_NAMES()) {
bool isHeaderNameFound = false;
if (OPTIONAL_CSV_HEADERS.contains(headerName)) {
/// no need to have a column for the optional values
continue;
}
/// these column must be found in CSV document
if (std::find(columnNames.begin(), columnNames.end(), headerName) != columnNames.end()) {
qDebug() << QString("Header found in column names: %1").arg(headerName);
} else {
@ -86,14 +90,13 @@ QHash<QString, std::vector<std::string>> CsvParser::extractColumnValues(
const rapidcsv::Document& doc) {
QHash<QString, std::vector<std::string>> columnValueMap;
for (const QString& columnName : headerNames) {
// TODO add support for optional columns
// if (optionalCsvHeaderNames.contains(columnName)) {
// const std::vector<std::string> columnNames = doc.GetColumnNames();
// int columnIdx = doc.GetColumnIdx(columnName.toStdString());
// if (columnIdx == -1) {
// continue;
// }
// }
if (OPTIONAL_CSV_HEADERS.contains(columnName)) {
const std::vector<std::string> columnNames = doc.GetColumnNames();
int columnIdx = doc.GetColumnIdx(columnName.toStdString());
if (columnIdx == -1) {
continue;
}
}
const std::vector<std::string> columnValues =
doc.GetColumn<std::string>(columnName.toStdString());
columnValueMap.insert(columnName, columnValues);
@ -127,6 +130,10 @@ QVariant CsvParser::parseItemValue(const int role, const std::string& valueStrin
if (STRING_ROLES.contains(role)) {
/// string values
result = QString::fromStdString(valueString);
} else if (TYPE_ROLES.contains(role)) {
/// type values
// TODO validate string is allowed
result = QString::fromStdString(valueString);
} else if (INT_ROLES.contains(role)) {
/// int values

View File

@ -43,24 +43,7 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
QJsonObject rootObject;
QJsonArray itemArray;
for (const ModelItemValues& itemValues : itemValuesList) {
QJsonObject itemObject;
QListIterator<UserRoles> i(USER_FACING_ROLES);
while (i.hasNext()) {
const UserRoles role = i.next();
const QString roleName = ROLE_NAMES.value(role);
const QVariant value = itemValues.value(role);
if (STRING_ROLES.contains(role)) {
itemObject.insert(roleName, value.toString());
} else if (INT_ROLES.contains(role)) {
itemObject.insert(roleName, value.toInt());
} else if (DOUBLE_ROLES.contains(role)) {
itemObject.insert(roleName, value.toDouble());
} else {
qCritical() << QString("Can't find data type for role %1!!!").arg(role);
}
}
QJsonObject itemObject = itemValuesToJsonObject(itemValues);
itemArray.append(itemObject);
}
@ -70,6 +53,51 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
return jsonDoc.toJson(QJsonDocument::Compact);
}
QJsonObject JsonParser::itemValuesToJsonObject(const ModelItemValues& itemValues) {
QJsonObject result;
// TODO add dates (entry, modification, end)
const UserRoles idRole = IdRole;
const QJsonValue idValue = extractJsonValue(itemValues, idRole);
if (!idValue.isNull()) {
const QString idRoleName = ROLE_NAMES.value(idRole);
result.insert(idRoleName, idValue);
}
QListIterator<UserRoles> i(USER_FACING_ROLES);
while (i.hasNext()) {
const UserRoles role = i.next();
const QJsonValue jsonValue = extractJsonValue(itemValues, role);
const QString roleName = ROLE_NAMES.value(role);
result.insert(roleName, jsonValue);
}
return result;
}
QByteArray JsonParser::userCredentialsToJsonDocument(const QString email, const QString password) {
QJsonDocument jsonDoc;
QJsonObject rootObject;
QJsonObject userObject;
userObject.insert("email", email);
userObject.insert("password", password);
rootObject.insert("user", userObject);
jsonDoc.setObject(rootObject);
return jsonDoc.toJson(QJsonDocument::Compact);
}
QVariant JsonParser::getValueFromJson(const QByteArray& jsonData,
const QString key,
const QString objectName) {
QJsonDocument doc = QJsonDocument::fromJson(jsonData);
QJsonObject rootObject = doc.object();
QJsonObject userObject = rootObject.value(objectName).toObject();
return userObject.value(key);
}
JsonParser::JsonParser() {}
QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString& objectName) {
@ -94,12 +122,16 @@ ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonOb
values.insert(keyValuePair.first, keyValuePair.second);
}
QListIterator<UserRoles> i(USER_FACING_ROLES);
while (i.hasNext()) {
const UserRoles role = i.next();
for (auto iter = itemJsonObject.constBegin(), end = itemJsonObject.constEnd(); iter != end;
++iter) {
const QString roleName = iter.key();
if (ROLE_NAMES.values().contains(roleName)) {
const int role = ROLE_NAMES.key(roleName.toLatin1());
std::pair<int, QVariant> keyValuePair = getKeyValuePair(itemJsonObject, role);
values.insert(keyValuePair.first, keyValuePair.second);
}
}
return values;
}
@ -112,8 +144,28 @@ pair<int, QVariant> JsonParser::getKeyValuePair(const QJsonObject& itemJsonObjec
result = jsonValue.toInt();
} else if (DOUBLE_ROLES.contains(role)) {
result = jsonValue.toDouble();
} else if (TYPE_ROLES.contains(role)) {
result = jsonValue.toString();
} else {
qCritical() << QString("Cant find data type of role %1!!!").arg(role);
}
return pair<int, QVariant>(role, result);
}
QJsonValue JsonParser::extractJsonValue(const ModelItemValues& itemValues, const int role) {
QJsonValue result;
const QString roleName = ROLE_NAMES.value(role);
const QVariant value = itemValues.value(role);
if (STRING_ROLES.contains(role)) {
result = value.toString();
} else if (INT_ROLES.contains(role)) {
result = value.toInt();
} else if (DOUBLE_ROLES.contains(role)) {
result = value.toDouble();
} else if (TYPE_ROLES.contains(role)) {
result = value.toString();
} else {
qCritical() << QString("Can't find data type for role %1!!!").arg(role);
}
return result;
}

View File

@ -18,6 +18,12 @@ class JsonParser {
const QString& rootValueName = "");
static QByteArray itemValuesListToJson(const QList<ModelItemValues>& itemValuesList,
const QString& objectName = "");
static QJsonObject itemValuesToJsonObject(const ModelItemValues& itemValues);
static QByteArray userCredentialsToJsonDocument(const QString email, const QString password);
static QVariant getValueFromJson(const QByteArray& jsonData,
const QString key,
const QString objectName = "");
private:
explicit JsonParser();
@ -26,6 +32,8 @@ class JsonParser {
static ModelItemValues jsonObjectToItemValues(const QJsonObject& itemJsonObject);
static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role);
static QJsonValue extractJsonValue(const ModelItemValues& itemValues, const int role);
};
#endif // JSONPARSER_H

View File

@ -14,6 +14,7 @@
#include "constants.h"
#include "data/filehandler.h"
#include "data/settingshandler.h"
#include "formats/jsonparser.h"
#include "model/generalsortfiltermodel.h"
#include "model/metadata.h"
#include "model/tablemodel.h"
@ -39,7 +40,7 @@ GenericCore::GenericCore() {
m_modelUndoStack = new QUndoStack(this);
setupModels();
setupServerConfiguration();
setupServerCommunication();
}
GenericCore::~GenericCore() { qDebug() << "Destroying core..."; }
@ -98,6 +99,67 @@ std::shared_ptr<GeneralSortFilterModel> GenericCore::getSortFilterModel() const
return m_sortFilterModel;
}
void GenericCore::importCSVFile(const QString& filePath) {
qInfo() << "importing items from CSV...";
qDebug() << "filePath:" << filePath;
const QList<ModelItemValues> itemValuesList = FileHandler::getItemValuesFromCSVFile(filePath);
if (itemValuesList.isEmpty()) {
qDebug() << "No items found. Doing nothing...";
displayStatusMessage("No items found in CSV file. Either empty or not compatible.");
return;
}
// qDebug() << "CSV file content:" << itemValuesList;
m_mainModel->insertItems(m_mainModel->rowCount(), itemValuesList);
const QString messageString =
QString(tr("Imported %1 item(s) from CSV file.")).arg(itemValuesList.size());
displayStatusMessage(messageString);
}
bool GenericCore::exportCSVFile(const QString& filePath) {
qInfo() << "exporting items to CSV...";
qDebug() << "filePath:" << filePath;
const QList<QStringList> itemsAsStringLists = m_mainModel->getItemsAsStringLists();
return FileHandler::exportToCSVFile(itemsAsStringLists, filePath);
}
QVariantMap GenericCore::getSettings(QString group) const {
return SettingsHandler::getSettings(group);
}
void GenericCore::applySettings(QVariantMap settingMap, QString group) {
const QVariantMap changeset = SettingsHandler::getChangeset(settingMap, group);
if (changeset.isEmpty()) {
return;
}
if (group == "Server") {
const bool urlChanged = changeset.contains("url");
const bool emailChanged = changeset.contains("email");
const bool passwordChanged = changeset.contains("password");
if (urlChanged || emailChanged || passwordChanged) {
if (!changeset.contains("authToken")) {
qInfo() << "Account settings changed, but no new token present. Deleting old token...";
SettingsHandler::deleteSettings({"authToken"}, "Server");
}
}
}
SettingsHandler::saveSettings(settingMap, group);
if (group == "Server") {
applyServerConfiguration();
}
}
bool GenericCore::isSyncServerSetup() const {
if (m_serverCommunicator) {
return true;
} else {
return false;
}
}
/**
* Save items to default file (in standard location).
* @brief GenericCore::saveItems Saves item fo file.
@ -115,48 +177,32 @@ void GenericCore::saveItems() {
}
}
void GenericCore::importCSVFile(const QString& filePath) {
qInfo() << "importing items from CSV...";
qDebug() << "filePath:" << filePath;
const QList<ModelItemValues> itemValuesList = FileHandler::getItemValuesFromCSVFile(filePath);
// TODO inform UI on errors
if (itemValuesList.isEmpty()) {
qDebug() << "No items found. Doing nothing...";
return;
}
// qDebug() << "CSV file content:" << itemValuesList;
m_mainModel->insertItems(m_mainModel->rowCount(), itemValuesList);
void GenericCore::onLoginSuccessful(const QByteArray jsonData) {
emit displayStatusMessage("Login successful.");
qInfo() << "Storing auth token...";
QString token = JsonParser::getValueFromJson(jsonData, "token", "user").toString();
SettingsHandler::saveSettings({{"authToken", token}}, "Server");
applyServerConfiguration();
}
bool GenericCore::exportCSVFile(const QString& filePath) {
qInfo() << "exporting items to CSV...";
qDebug() << "filePath:" << filePath;
const QList<QStringList> itemsAsStringLists = m_mainModel->getItemsAsStringLists();
return FileHandler::exportToCSVFile(itemsAsStringLists, filePath);
void GenericCore::onLoginFailure(const QString errorString) {
emit displayStatusMessage(QString("Error: %1").arg(errorString));
}
QVariantMap GenericCore::getSettings(QString group) const {
return SettingsHandler::getSettings(group);
}
void GenericCore::applySettings(QVariantMap settingMap, QString group) {
SettingsHandler::saveSettings(settingMap, group);
if (group == "Server") {
setupServerConfiguration();
}
}
bool GenericCore::isSyncServerSetup() const {
if (m_serverCommunicator) {
return true;
void GenericCore::onNotAuthorized(const QString /*path*/) {
const QVariantMap serverSettings = SettingsHandler::getSettings("Server");
const QString tokenValue = serverSettings.value("authToken").toString();
if (!tokenValue.isEmpty()) {
SettingsHandler::deleteSettings({"authToken"}, "Server");
displayStatusMessage("Not authorized! Deleted token. Please retry.");
} else {
return false;
displayStatusMessage("Not authorized! But no token was present. Please check your settings.");
}
applyServerConfiguration();
}
void GenericCore::onSendItemTriggered(const QByteArray& jsonData) {
m_serverCommunicator->postItems(jsonData);
m_serverCommunicator->sendItem(jsonData);
}
void GenericCore::onItemsFetched(const QByteArray jsonData) {
@ -170,20 +216,20 @@ void GenericCore::onItemsFetchFailure(const QString errorString) {
emit displayStatusMessage(QString("Error: %1").arg(errorString));
}
void GenericCore::onPostRequestSuccessful(const QByteArray responseData) {
void GenericCore::onSendItemSuccessful(const QByteArray responseData) {
const QString message = m_mainModel->updateItemsFromJson(responseData);
emit displayStatusMessage(message);
}
void GenericCore::onPostRequestFailure(const QString errorString) {
void GenericCore::onSendItemFailure(const QString errorString) {
emit displayStatusMessage(QString("Error: %1").arg(errorString));
}
void GenericCore::onDeleteRequestSuccessful(const QByteArray responseData) {
void GenericCore::onDeleteItemSuccessful(const QByteArray responseData) {
qWarning() << "TODO: Process success response!!!";
}
void GenericCore::onDeleteRequestFailure(const QString errorString) {
void GenericCore::onDeleteItemFailure(const QString errorString) {
qWarning() << "TODO: Process error response!!!";
}
@ -200,7 +246,7 @@ void GenericCore::setupModels() {
#else
m_mainModelTester = make_unique<QAbstractItemModelTester>(
m_mainModel.get(), QAbstractItemModelTester::FailureReportingMode::Warning);
m_modelTester = make_unique<QAbstractItemModelTester>(
m_proxyModelTester = make_unique<QAbstractItemModelTester>(
m_sortFilterModel.get(), QAbstractItemModelTester::FailureReportingMode::Warning);
#endif
@ -244,28 +290,37 @@ QString GenericCore::getMaintenanceToolFilePath() const {
return filePath;
}
void GenericCore::setupServerConfiguration() {
void GenericCore::setupServerCommunication() {
m_serverCommunicator = make_unique<ServerCommunicator>(this);
/// request connections
connect(this, &GenericCore::fetchItemsFromServer, m_serverCommunicator.get(),
&ServerCommunicator::fetchItems);
connect(this, &GenericCore::postItemToServer, this, &GenericCore::onSendItemTriggered);
connect(this, &GenericCore::sendItemToServer, m_serverCommunicator.get(),
&ServerCommunicator::sendItem);
connect(this, &GenericCore::deleteItemFromServer, m_serverCommunicator.get(),
&ServerCommunicator::deleteItem);
/// response connections
connect(m_serverCommunicator.get(), &ServerCommunicator::loginSuccessful, this,
&GenericCore::onLoginSuccessful);
connect(m_serverCommunicator.get(), &ServerCommunicator::loginFailure, this,
&GenericCore::onLoginFailure);
connect(m_serverCommunicator.get(), &ServerCommunicator::notAuthorized, this,
&GenericCore::onNotAuthorized);
connect(m_serverCommunicator.get(), &ServerCommunicator::itemsFetched, this,
&GenericCore::onItemsFetched);
connect(m_serverCommunicator.get(), &ServerCommunicator::itemsFetchFailure, this,
&GenericCore::onItemsFetchFailure);
connect(m_serverCommunicator.get(), &ServerCommunicator::postRequestSuccessful, this,
&GenericCore::onPostRequestSuccessful);
connect(m_serverCommunicator.get(), &ServerCommunicator::postRequestFailure, this,
&GenericCore::onPostRequestFailure);
connect(m_serverCommunicator.get(), &ServerCommunicator::deleteRequestSuccessful, this,
&GenericCore::onDeleteRequestSuccessful);
connect(m_serverCommunicator.get(), &ServerCommunicator::deleteRequestFailure, this,
&GenericCore::onDeleteRequestFailure);
connect(m_serverCommunicator.get(), &ServerCommunicator::sendItemSuccessful, this,
&GenericCore::onSendItemSuccessful);
connect(m_serverCommunicator.get(), &ServerCommunicator::sendItemFailure, this,
&GenericCore::onSendItemFailure);
connect(m_serverCommunicator.get(), &ServerCommunicator::deleteItemSuccessful, this,
&GenericCore::onDeleteItemSuccessful);
connect(m_serverCommunicator.get(), &ServerCommunicator::deleteItemFailure, this,
&GenericCore::onDeleteItemFailure);
applyServerConfiguration();
}
@ -273,9 +328,14 @@ void GenericCore::setupServerConfiguration() {
void GenericCore::applyServerConfiguration() {
const QVariantMap serverSettings = SettingsHandler::getSettings("Server");
const QString urlValue = serverSettings.value("url").toString();
if (!urlValue.isEmpty()) {
if (urlValue.isEmpty()) {
SettingsHandler::deleteSettings({"authToken"}, "Server");
} else {
/// urlValue in NOT empty
const QString emailValue = serverSettings.value("email").toString();
const QString passwordValue = serverSettings.value("password").toString();
m_serverCommunicator->setServerConfiguration(urlValue, emailValue, passwordValue);
const QString authTokenValue = serverSettings.value("authToken").toString();
m_serverCommunicator->setServerConfiguration(urlValue, emailValue, passwordValue,
authTokenValue);
}
}

View File

@ -29,7 +29,6 @@ class GenericCore : public QObject {
std::shared_ptr<TableModel> getModel() const;
std::shared_ptr<GeneralSortFilterModel> getSortFilterModel() const;
void saveItems();
void importCSVFile(const QString& filePath);
bool exportCSVFile(const QString& filePath);
@ -38,18 +37,25 @@ class GenericCore : public QObject {
bool isSyncServerSetup() const;
public slots:
void saveItems();
void onLoginSuccessful(const QByteArray jsonData);
void onLoginFailure(const QString errorString);
void onNotAuthorized(const QString /*path*/);
void onSendItemTriggered(const QByteArray& jsonData);
void onItemsFetched(const QByteArray jsonData);
void onItemsFetchFailure(const QString errorString);
void onPostRequestSuccessful(const QByteArray responseData);
void onPostRequestFailure(const QString errorString);
void onDeleteRequestSuccessful(const QByteArray responseData);
void onDeleteRequestFailure(const QString errorString);
void onSendItemSuccessful(const QByteArray responseData);
void onSendItemFailure(const QString errorString);
void onDeleteItemSuccessful(const QByteArray responseData);
void onDeleteItemFailure(const QString errorString);
signals:
void displayStatusMessage(QString message);
void fetchItemsFromServer();
void postItemToServer(const QByteArray& jsonData);
void sendItemToServer(const QByteArray& jsonData);
void deleteItemFromServer(const QString& id);
private:
@ -66,7 +72,7 @@ class GenericCore : public QObject {
/// Network communication
std::unique_ptr<ServerCommunicator> m_serverCommunicator;
void setupServerConfiguration();
void setupServerCommunication();
void applyServerConfiguration();
};

View File

@ -27,6 +27,7 @@ QString GeneralSortFilterModel::getUuid(const QModelIndex& itemIndex) const {
return data(itemIndex, IdRole).toString();
}
// NEXT remove when deprecated
QByteArray GeneralSortFilterModel::jsonDataForServer(const QModelIndex& proxyIndex) {
const QModelIndex sourceIndex = mapToSource(proxyIndex);
return m_tableModel->jsonDataForServer(sourceIndex);
@ -59,6 +60,12 @@ bool GeneralSortFilterModel::lessThan(const QModelIndex& source_left,
const QString rightString = rightData.toString();
return m_collator.compare(leftString, rightString) > 0;
}
const bool isType = TYPE_ROLES.contains(role);
if (isType) {
const QString leftString = leftData.toString();
const QString rightString = rightData.toString();
return m_collator.compare(leftString, rightString) > 0;
}
const bool isInt = INT_ROLES.contains(role);
if (isInt) {
const int leftInt = leftData.toInt();

View File

@ -13,6 +13,7 @@ enum UserRoles {
NameRole = Qt::UserRole + 1,
DescriptionRole,
InfoRole,
TypeRole,
AmountRole,
FactorRole,
/// Non user facing
@ -24,15 +25,27 @@ enum UserRoles {
static UserRoles DEFAULT_ROLE = NameRole;
// TODO ?rename USER_FACING_ROLES -> MAIN_ROLES ?
static QList<UserRoles> USER_FACING_ROLES = {NameRole, DescriptionRole, InfoRole, AmountRole,
FactorRole};
static QList<UserRoles> USER_FACING_ROLES = {NameRole, DescriptionRole, InfoRole, TypeRole,
AmountRole, FactorRole, IdRole};
static QList<UserRoles> READ_ONLY_ROLES = {IdRole};
static QHash<int, QByteArray> ROLE_NAMES = {
{NameRole, "name"}, {DescriptionRole, "description"}, {InfoRole, "info"},
{AmountRole, "amount"}, {FactorRole, "factor"}, {ToStringRole, "ToString"},
{IdRole, "id"}};
{NameRole, "name"}, {DescriptionRole, "description"},
{InfoRole, "info"}, {TypeRole, "type"},
{AmountRole, "amount"}, {FactorRole, "factor"},
{ToStringRole, "ToString"}, {IdRole, "id"},
{Qt::DisplayRole, "display"}, {Qt::EditRole, "edit"}};
static QList<UserRoles> STRING_ROLES = {NameRole, DescriptionRole, InfoRole, IdRole};
static QList<UserRoles> INT_ROLES = {AmountRole};
static QList<UserRoles> DOUBLE_ROLES = {FactorRole};
static QList<UserRoles> NUMBER_ROLES = INT_ROLES + DOUBLE_ROLES;
static const QList<UserRoles> TYPE_ROLES = {TypeRole};
static const QList<QString> TYPES = {"A", "B", "C", ""};
static const QStringList OPTIONAL_CSV_HEADERS = {"description", "info"};
/// JSON keys
static const QString ITEMS_KEY_STRING = "items";
@ -42,7 +55,7 @@ static const QString ITEM_KEY_STRING = "item";
static const QString ITEMS_FILE_NAME = ITEMS_KEY_STRING + ".json";
/// functions
static int GET_ROLE_FOR_COLUMN(const int column) {
static UserRoles GET_ROLE_FOR_COLUMN(const int column) {
switch (column) {
case 0:
return NameRole;
@ -54,17 +67,26 @@ static int GET_ROLE_FOR_COLUMN(const int column) {
return InfoRole;
break;
case 3:
return AmountRole;
return TypeRole;
break;
case 4:
return AmountRole;
break;
case 5:
return FactorRole;
break;
case 6:
return IdRole;
break;
default:
qWarning() << QString("No role found for column %1! Returning 'NameRole'...").arg(column);
return NameRole;
break;
}
}
static int GET_COLUMN_FOR_ROLE(const UserRoles role) { return USER_FACING_ROLES.indexOf(role); }
static QList<QString> GET_HEADER_NAMES() {
QList<QString> result;
for (const UserRoles& role : USER_FACING_ROLES) {
@ -74,4 +96,10 @@ static QList<QString> GET_HEADER_NAMES() {
return result;
}
static QString GET_HEADER_FOR_COLUMN(const int column) {
const UserRoles role = GET_ROLE_FOR_COLUMN(column);
const QString headerName = ROLE_NAMES.value(role);
return headerName;
}
#endif // METADATA_H

View File

@ -1,10 +1,11 @@
#include "modelitem.h"
#include "metadata.h"
#include <QJsonObject>
#include <QJsonValue>
#include "../formats/jsonparser.h"
#include "metadata.h"
ModelItem::ModelItem(const ModelItemValues values)
: m_values(values) {}
@ -66,29 +67,6 @@ QString ModelItem::toString() const {
}
QJsonObject ModelItem::toJsonObject() const {
QJsonObject itemObject;
// TODO add UUID and dates (entry, modification, end)
const UserRoles idRole = IdRole;
QVariant idValue = data(idRole);
if (!idValue.isNull()) {
const QString idRoleName = ROLE_NAMES.value(idRole);
itemObject.insert(idRoleName, idValue.toString());
}
QListIterator<UserRoles> i(USER_FACING_ROLES);
while (i.hasNext()) {
const UserRoles role = i.next();
const QString roleName = ROLE_NAMES.value(role);
const QVariant value = data(role);
if (STRING_ROLES.contains(role)) {
itemObject.insert(roleName, value.toString());
} else if (INT_ROLES.contains(role)) {
itemObject.insert(roleName, value.toInt());
} else if (DOUBLE_ROLES.contains(role)) {
itemObject.insert(roleName, value.toDouble());
} else {
qCritical() << QString("Cant find data type of role %1!!!").arg(role);
}
}
QJsonObject itemObject = JsonParser::itemValuesToJsonObject(m_values);
return itemObject;
}

View File

@ -40,10 +40,19 @@ TableModel::TableModel(QUndoStack* undoStack, QObject* parent)
, m_undoStack(undoStack) {}
Qt::ItemFlags TableModel::flags(const QModelIndex& index) const {
Qt::ItemFlags result = QAbstractTableModel::flags(index);
if (!index.isValid()) {
return QAbstractTableModel::flags(index);
return result;
}
return Qt::ItemIsEditable | QAbstractTableModel::flags(index);
const int column = index.column();
const int roleForColumn = GET_ROLE_FOR_COLUMN(column);
/// roles which aren't editable by the user
if (READ_ONLY_ROLES.contains(roleForColumn)) {
return result;
}
return result | Qt::ItemIsEditable;
}
QHash<int, QByteArray> TableModel::roleNames() const { return ROLE_NAMES; }
@ -78,19 +87,15 @@ QVariant TableModel::data(const QModelIndex& index, int role) const {
case Qt::DisplayRole:
case Qt::EditRole:
return m_items.at(row)->data(roleForColumn);
case NameRole:
case DescriptionRole:
case InfoRole:
case AmountRole:
case FactorRole:
case IdRole:
return m_items.at(row)->data(role);
case ToStringRole:
return m_items.at(row)->toString();
case ToJsonRole:
return m_items.at(row)->toJsonObject();
case IdRole:
return m_items.at(row)->data(role);
default:
return m_items.at(row)->data(role);
}
return QVariant();
}
@ -108,10 +113,9 @@ QVariant TableModel::headerData(int section, Qt::Orientation orientation, int ro
}
bool TableModel::setData(const QModelIndex& index, const QVariant& value, int role) {
if (role == Qt::EditRole && checkIndex(index)) {
const int column = index.column();
const int roleForColumn = GET_ROLE_FOR_COLUMN(column);
return setItemData(index, {{roleForColumn, value}});
if (checkIndex(index)) {
const int adjustedRole = getAppropriateRoleForIndex(index, role);
return setItemData(index, {{adjustedRole, value}});
}
return false;
}
@ -307,12 +311,6 @@ QMap<int, QVariant> TableModel::onlyChangedValues(const QModelIndex& index,
const QVariant oldValue = index.data(role);
// TODO check if role is a editable role?
if (oldValue != newValue) {
bool emptyValueIsEqualToZero = isEmptyValueEqualToZero(role);
if (emptyValueIsEqualToZero && oldValue == QVariant() && newValue == 0) {
qDebug() << "oldValue:" << oldValue << "& newValue:" << newValue
<< "mean the same. Ignoring...";
continue;
}
qDebug() << "oldValue:" << oldValue << "!= newValue:" << newValue;
result.insert(role, newValue);
} else {
@ -332,9 +330,26 @@ bool TableModel::isEmptyValueEqualToZero(const int role) const {
}
}
int TableModel::getAppropriateRoleForIndex(const QModelIndex& index, const int role) const {
/// cases:
/// 1. Qt::DisplayRole, Qt::EditRole
/// -> get role for column
/// 2. other roles
/// -> use role as given
const int column = index.column();
const int roleForColumn = GET_ROLE_FOR_COLUMN(column);
switch (role) {
case Qt::DisplayRole:
case Qt::EditRole:
return roleForColumn;
break;
default:
return role;
break;
}
}
QModelIndex TableModel::searchItemIndex(const ModelItemValues givenItemValues) const {
// iterate over indexes to search item : see searchItem(...);
// for (const shared_ptr<ModelItem>& item : m_items) {
for (int row = 0; row < rowCount(); ++row) {
qDebug() << "Processing item at row" << row << "...";
QModelIndex itemIndex = index(row, 0);
@ -373,6 +388,10 @@ bool TableModel::isItemEqualToItemValues(const QModelIndex& itemIndex,
if (valueOfItem.toString() != givenValue.toString()) {
return false;
}
} else if (TYPE_ROLES.contains(role)) {
if (valueOfItem.toString() != givenValue.toString()) {
return false;
}
} else if (INT_ROLES.contains(role)) {
if (valueOfItem.toInt() != givenValue.toInt()) {
return false;

View File

@ -71,6 +71,7 @@ class TableModel : public QAbstractTableModel {
QMap<int, QVariant> onlyChangedValues(const QModelIndex& index,
const QMap<int, QVariant>& roleValueMap) const;
bool isEmptyValueEqualToZero(const int role) const;
int getAppropriateRoleForIndex(const QModelIndex& index, const int role) const;
QModelIndex searchItemIndex(const ModelItemValues givenItemValues) const;
bool isItemEqualToItemValues(const QModelIndex& itemIndex,
const ModelItemValues givenItemValues) const;

View File

@ -7,6 +7,8 @@
static const QString apiPrefix = "/api/";
static const QString ROUTE_LOG_IN = apiPrefix + "log_in";
static const QString ROUTE_ITEMS = apiPrefix + "items";
#endif // APIROUTES_H

View File

@ -6,6 +6,8 @@
#include <QJsonObject>
#include <QRestReply>
#include "../formats/jsonparser.h"
using namespace Qt::StringLiterals;
ServerCommunicator::ServerCommunicator(QObject* parent)
@ -36,71 +38,186 @@ void ServerCommunicator::setUrl(const QUrl& url) {
emit urlChanged();
}
void ServerCommunicator::fetchItems() {
/// Set up a GET request
m_restManager->get(m_serviceApi->createRequest(ROUTE_ITEMS), this, [this](QRestReply& reply) {
if (reply.isSuccess()) {
qInfo() << "Fetching items successful.";
const QJsonDocument doc = reply.readJson().value();
emit itemsFetched(doc.toJson());
} else {
if (reply.hasError()) {
const QString errorString = reply.errorString();
qCritical() << "ERROR:" << errorString;
emit itemsFetchFailure(errorString);
} else {
int statusCode = reply.httpStatus();
qCritical() << "ERROR:" << statusCode;
emit itemsFetchFailure(QString::number(statusCode));
emit itemsFetchFailure(QString("HTTP status code: %1").arg(statusCode));
}
}
});
}
void ServerCommunicator::postItems(const QByteArray& jsonData) {
QNetworkReply* reply = m_restManager->post(m_serviceApi->createRequest(ROUTE_ITEMS), jsonData);
QObject::connect(reply, &QNetworkReply::finished, [=]() {
if (reply->error() == QNetworkReply::NoError) {
QByteArray responseData = reply->readAll();
const QString message = QString("POST successful! Response: %1").arg(responseData);
qInfo() << message;
emit postRequestSuccessful(responseData);
} else {
const QString message = QString("Error: %1").arg(reply->errorString());
qDebug() << message;
emit postRequestFailure(message);
}
reply->deleteLater();
});
}
void ServerCommunicator::deleteItem(const QString& id) {
const QString deleteRoute = QString("%1/%2").arg(ROUTE_ITEMS, id);
QNetworkReply* reply = m_restManager->deleteResource(m_serviceApi->createRequest(deleteRoute));
QObject::connect(reply, &QNetworkReply::finished, [=]() {
if (reply->error() == QNetworkReply::NoError) {
QByteArray responseData = reply->readAll();
const QString message = QString("DELETE successful! Response: %1").arg(responseData);
qInfo() << message;
emit deleteRequestSuccessful(responseData);
} else {
const QString message = QString("Error: %1").arg(reply->errorString());
qDebug() << message;
emit deleteRequestFailure(message);
}
reply->deleteLater();
});
}
void ServerCommunicator::setServerConfiguration(const QString url,
const QString email,
const QString password) {
const QString password,
const QString authToken) {
setUrl(url);
m_email = email;
m_password = password;
m_authToken = authToken;
if (authToken.isEmpty()) {
if (validLoginCredentials()) {
const QByteArray userCredentials =
JsonParser::userCredentialsToJsonDocument(m_email, m_password);
sendPostRequest(ROUTE_LOG_IN, userCredentials);
}
} else {
/// authToken not empty:
m_serviceApi->setBearerToken(authToken.toLatin1());
}
}
void ServerCommunicator::fetchItems() { sendGetRequest(ROUTE_ITEMS); }
void ServerCommunicator::sendItem(const QByteArray& jsonData) {
sendPostRequest(ROUTE_ITEMS, jsonData);
}
void ServerCommunicator::deleteItem(const QString& id) {
const QString path = QString("%1/%2").arg(ROUTE_ITEMS, id);
sendDeleteRequest(path);
}
bool ServerCommunicator::validLoginCredentials() {
if (url().isEmpty()) {
return false;
}
if (m_email.isEmpty()) {
return false;
}
if (m_password.isEmpty()) {
return false;
}
return true;
}
void ServerCommunicator::sendGetRequest(const QString& path) {
// TODO check for valid path, instead of emptiness
if (path.isEmpty()) {
qDebug() << "Empty path -> Not sending a request.";
return;
}
const QNetworkRequest request = m_serviceApi->createRequest(path);
m_restManager->get(request, this, [this, path](QRestReply& reply) {
if (reply.isSuccess()) {
qInfo() << "Request successful.";
const QJsonDocument doc = reply.readJson().value();
onGetReplySuccessful(path, doc);
} else {
if (reply.hasError()) {
const QString errorString = reply.errorString();
qWarning() << "Network error:" << errorString;
onGetReplyFailure(path, errorString);
} else {
int statusCode = reply.httpStatus();
qWarning() << "Request not successful:" << statusCode;
if (statusCode == 401) {
notAuthorized(path);
} else {
onGetReplyFailure(path, QString("HTTP status code: %1").arg(statusCode));
}
}
}
});
}
void ServerCommunicator::onGetReplySuccessful(const QString& path, const QJsonDocument doc) {
if (path == ROUTE_ITEMS) {
emit itemsFetched(doc.toJson());
} else {
qWarning() << "Can't match request path:" << path;
}
}
void ServerCommunicator::onGetReplyFailure(const QString& path, const QString errorString) {
if (path == ROUTE_ITEMS) {
emit itemsFetchFailure(errorString);
} else {
qWarning() << "Can't match request path:" << path;
}
}
void ServerCommunicator::sendPostRequest(const QString& path, const QByteArray data) {
const QNetworkRequest request = m_serviceApi->createRequest(path);
m_restManager->post(request, data, this, [this, path](QRestReply& reply) {
if (reply.isSuccess()) {
int statusCode = reply.httpStatus();
qInfo() << "Request successful. Status code:" << statusCode;
const QJsonDocument doc = reply.readJson().value();
onPostReplySuccessful(path, doc);
} else {
if (reply.hasError()) {
const QString errorString = reply.errorString();
qWarning() << "Network error:" << errorString;
onPostReplyFailure(path, errorString);
} else {
int statusCode = reply.httpStatus();
qWarning() << "Request not successful:" << statusCode;
qInfo() << "Content:" << reply.readJson();
if (statusCode == 401) {
notAuthorized(path);
} else {
onPostReplyFailure(path, QString("HTTP status code: %1").arg(statusCode));
}
}
}
});
}
void ServerCommunicator::onPostReplySuccessful(const QString& path, const QJsonDocument doc) {
if (path == ROUTE_ITEMS) {
emit sendItemSuccessful(doc.toJson());
} else if (path == ROUTE_LOG_IN) {
qCritical() << "Login success:" << doc.toJson(QJsonDocument::Compact);
emit loginSuccessful(doc.toJson(QJsonDocument::Compact));
} else {
qWarning() << "Can't match request path:" << path;
}
}
void ServerCommunicator::onPostReplyFailure(const QString& path, const QString errorString) {
if (path == ROUTE_ITEMS) {
emit sendItemFailure(errorString);
} else if (path == ROUTE_LOG_IN) {
qCritical() << "Login failure:" << errorString;
emit loginFailure(errorString);
} else {
qWarning() << "Can't match request path:" << path;
}
}
void ServerCommunicator::sendDeleteRequest(const QString& path) {
const QNetworkRequest request = m_serviceApi->createRequest(path);
m_restManager->deleteResource(request, this, [this, path](QRestReply& reply) {
if (reply.isSuccess()) {
qInfo() << "Request successful.";
const QJsonDocument doc = reply.readJson().value();
onDeleteReplySuccessful(path, doc);
} else {
if (reply.hasError()) {
const QString errorString = reply.errorString();
qWarning() << "Network error:" << errorString;
onDeleteReplyFailure(path, errorString);
} else {
int statusCode = reply.httpStatus();
qWarning() << "Request not successful:" << statusCode;
if (statusCode == 401) {
notAuthorized(path);
} else {
onDeleteReplyFailure(path, QString("HTTP status code: %1").arg(statusCode));
}
}
}
});
}
void ServerCommunicator::onDeleteReplySuccessful(const QString& path, const QJsonDocument doc) {
if (path.startsWith(ROUTE_ITEMS)) {
emit deleteItemSuccessful(doc.toJson());
} else {
qWarning() << "Can't match request path:" << path;
}
}
void ServerCommunicator::onDeleteReplyFailure(const QString& path, const QString errorString) {
if (path.startsWith(ROUTE_ITEMS)) {
emit deleteItemFailure(errorString);
} else {
qWarning() << "Can't match request path:" << path;
}
}

View File

@ -16,22 +16,33 @@ class ServerCommunicator : public QObject {
QUrl url() const;
void setUrl(const QUrl& url);
void setServerConfiguration(const QString url, const QString email, const QString password);
void setServerConfiguration(const QString url,
const QString email,
const QString password,
const QString authToken);
public slots:
void fetchItems();
void postItems(const QByteArray& jsonData);
void sendItem(const QByteArray& jsonData);
void deleteItem(const QString& id);
// NEXT editItem(const QByteArray& jsonData)
signals:
void urlChanged();
void loginSuccessful(const QByteArray responseData);
void loginFailure(const QString errorString);
void notAuthorized(const QString path);
void itemsFetched(const QByteArray jsonDoc);
void itemsFetchFailure(const QString errorString);
void postRequestSuccessful(const QByteArray responseData);
void postRequestFailure(const QString errorString);
void deleteRequestSuccessful(const QByteArray responseData);
void deleteRequestFailure(const QString errorString);
void sendItemSuccessful(const QByteArray responseData);
void sendItemFailure(const QString errorString);
void deleteItemSuccessful(const QByteArray responseData);
void deleteItemFailure(const QString errorString);
private:
QNetworkAccessManager m_netManager;
@ -40,7 +51,21 @@ class ServerCommunicator : public QObject {
QString m_email;
QString m_password;
// QString m_authToken;
QString m_authToken;
bool validLoginCredentials();
void sendGetRequest(const QString& path);
void onGetReplySuccessful(const QString& path, const QJsonDocument doc);
void onGetReplyFailure(const QString& path, const QString errorString);
void sendPostRequest(const QString& path, const QByteArray data);
void onPostReplySuccessful(const QString& path, const QJsonDocument doc);
void onPostReplyFailure(const QString& path, const QString errorString);
void sendDeleteRequest(const QString& path);
void onDeleteReplySuccessful(const QString& path, const QJsonDocument doc);
void onDeleteReplyFailure(const QString& path, const QString errorString);
};
#endif // SERVERCOMMUNICATOR_H

164
utils/messagehandler.h Normal file
View File

@ -0,0 +1,164 @@
#ifndef MESSAGEHANDLER_H
#define MESSAGEHANDLER_H
/**
* Color and formatting codes
* @see: http://misc.flogisoft.com/bash/tip_colors_and_formatting
*/
#include <QObject>
// qSetMessagePattern("%{file}(%{line}): %{message}");
// qSetMessagePattern("%{type}(%{line}):\t%{message}");
// qSetMessagePattern("%{type}%{file}(%{line}):\t%{message}");
void consoleHandlerColoredVerbose(QtMsgType type,
const QMessageLogContext& context,
const QString& msg) {
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtDebugMsg:
// fprintf(stderr, "\033[1;30mDebug: (%s:%u, %s) \t%s\n\033[0m", context.file,
// context.line, context.function, localMsg.constData()); // bold
fprintf(stderr, "\033[107;30mDebug: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
break;
case QtInfoMsg:
fprintf(stderr, "\033[107;32mInfo: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
break;
case QtWarningMsg:
fprintf(stderr, "\033[43;30mWarning: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
break;
case QtCriticalMsg:
fprintf(stderr, "\033[41;30mCritical: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
break;
case QtFatalMsg:
fprintf(stderr, "\033[41;30mFatal: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
abort();
}
}
void consoleHandlerColoredVerboseInDarkTheme(QtMsgType type,
const QMessageLogContext& context,
const QString& msg) {
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtDebugMsg:
// fprintf(stderr, "\033[1;30mDebug: (%s:%u, %s) \t%s\n\033[0m", context.file,
// context.line, context.function, localMsg.constData()); // bold
fprintf(stderr, "\033[107;37mDebug: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
break;
case QtInfoMsg:
fprintf(stderr, "\033[107;32mInfo: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
break;
case QtWarningMsg:
fprintf(stderr, "\033[43;30mWarning: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
break;
case QtCriticalMsg:
fprintf(stderr, "\033[41;30mCritical: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
break;
case QtFatalMsg:
fprintf(stderr, "\033[41;30mFatal: (%s:%u, %s) \t%s\n\033[0m", context.file, context.line,
context.function, localMsg.constData());
abort();
}
}
void consoleHandlerColored(QtMsgType type, const QMessageLogContext& context, const QString& msg) {
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtDebugMsg:
fprintf(stderr, "\033[1;30mDebug: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
break;
case QtInfoMsg:
fprintf(stderr, "\033[0;30mInfo: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
break;
case QtWarningMsg:
fprintf(stderr, "\033[1;33mWarning: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
break;
case QtCriticalMsg:
fprintf(stderr, "\033[31mCritical: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
break;
case QtFatalMsg:
fprintf(stderr, "\033[31mFatal: (%s:%u) \t%s\n\033[0m", context.file, context.line,
localMsg.constData());
abort();
}
}
void myMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg) {
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtDebugMsg:
fprintf(stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line,
context.function);
break;
case QtInfoMsg:
fprintf(stderr, "Info: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line,
context.function);
break;
case QtWarningMsg:
fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line,
context.function);
break;
case QtCriticalMsg:
fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file,
context.line, context.function);
break;
case QtFatalMsg:
fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line,
context.function);
abort();
}
}
#ifdef Q_OS_ANDROID
#include <android/log.h>
const char* const applicationName = "Pensieve";
void androidMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg) {
QString report = msg;
if (context.file && !QString(context.file).isEmpty()) {
report += " in file ";
report += QString(context.file);
report += " line ";
report += QString::number(context.line);
}
if (context.function && !QString(context.function).isEmpty()) {
report += +" function ";
report += QString(context.function);
}
const char* const local = report.toLocal8Bit().constData();
switch (type) {
case QtDebugMsg:
__android_log_write(ANDROID_LOG_DEBUG, applicationName, local);
break;
case QtInfoMsg:
__android_log_write(ANDROID_LOG_INFO, applicationName, local);
break;
case QtWarningMsg:
__android_log_write(ANDROID_LOG_WARN, applicationName, local);
break;
case QtCriticalMsg:
__android_log_write(ANDROID_LOG_ERROR, applicationName, local);
break;
case QtFatalMsg:
default:
__android_log_write(ANDROID_LOG_FATAL, applicationName, local);
abort();
}
}
#endif
#endif // MESSAGEHANDLER_H