Skip to content

Commit

Permalink
Apply formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@SavenkovIgor
SavenkovIgor committed Feb 18, 2024
1 parent d89d448 commit a633f44
Show file tree
Hide file tree
Showing 59 changed files with 310 additions and 387 deletions.
16 changes: 8 additions & 8 deletions lib/CommonTools/include/CommonTools/Errors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ enum ErrorCodes {

namespace Errors {

inline const char* toChar(ErrorCodes code) {
inline const char* toChar(ErrorCodes code)
{
// clang-format off
switch(code) {
case ErrorCodes::GroupUuidInvalid: return "GroupUuidInvalid";
Expand Down Expand Up @@ -106,7 +107,8 @@ inline const char* toChar(ErrorCodes code) {
inline QString toQString(ErrorCodes code) { return {toChar(code)}; }
inline QString toQString(int code) { return toQString(static_cast<ErrorCodes>(code)); }

inline ErrorCodes fromChar(const char* enumName) {
inline ErrorCodes fromChar(const char* enumName)
{
std::string msg(enumName);

// clang-format off
Expand Down Expand Up @@ -147,17 +149,15 @@ inline ErrorCodes fromChar(const char* enumName) {
return ErrorCodes::UnknownError;
}

inline ErrorCodes fromQString(QString enumName) {
inline ErrorCodes fromQString(QString enumName)
{
auto str = enumName.toStdString();
return fromChar(str.c_str());
}

}
} // namespace Errors

inline const char* error_message(int code)
{
return Errors::toChar(static_cast<ErrorCodes>(code));
}
inline const char* error_message(int code) { return Errors::toChar(static_cast<ErrorCodes>(code)); }

namespace detail {
class DbErrorCodes_category : public std::error_category
Expand Down
22 changes: 9 additions & 13 deletions lib/CommonTools/include/CommonTools/HandyTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <CommonTools/Errors.h>

using UuidList = std::vector<QUuid>;
using UuidList = std::vector<QUuid>;

template<typename T>
using Opt = std::optional<T>;
Expand All @@ -30,7 +30,7 @@ class Result : public std::variant<T, ErrorCodes>
operator bool() const { return !std::holds_alternative<ErrorCodes>(*this); }
bool has_value() const { return !std::holds_alternative<ErrorCodes>(*this); }

T value() const { return std::get<T>(*this); }
T value() const { return std::get<T>(*this); }
ErrorCodes error() const { return std::get<ErrorCodes>(*this); }
};

Expand All @@ -44,13 +44,9 @@ class FutureWrapper

FutureWrapper(T&& value)
: mValue(std::move(value))
{
}
{}

auto then(const std::function<void(T)>& func) -> void
{
func(std::move(mValue));
}
auto then(const std::function<void(T)>& func) -> void { func(std::move(mValue)); }

private:
T mValue;
Expand All @@ -72,11 +68,11 @@ using FutureResult = QFuture<Result<RetType>>;
template<typename T>
static QFuture<T> toFuture(const std::function<T()>& func)
{
QPromise<T> promise;
promise.start();
promise.addResult(func());
promise.finish();
return promise.future();
QPromise<T> promise;
promise.start();
promise.addResult(func());
promise.finish();
return promise.future();
}
#endif

Expand Down
14 changes: 7 additions & 7 deletions lib/CommonTools/include/CommonTools/JsonTools.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ class JsonTools
}

// Container keys
constexpr static auto groupUuidsKey = "groupUuids";
constexpr static auto groupsKey = "groups";
constexpr static auto groupUuidsKey = "groupUuids";
constexpr static auto groupsKey = "groups";

constexpr static auto termUuidsKey = "termUuids";
constexpr static auto termsKey = "terms";
constexpr static auto oldTermsKey = "nodesList";
constexpr static auto termUuidsKey = "termUuids";
constexpr static auto termsKey = "terms";
constexpr static auto oldTermsKey = "nodesList";

// Common keys
constexpr static auto uuidKey = "uuid";
constexpr static auto lastEditKey = "lastEdit";
constexpr static auto uuidKey = "uuid";
constexpr static auto lastEditKey = "lastEdit";

// Group keys
constexpr static auto nameKey = "name";
Expand Down
25 changes: 8 additions & 17 deletions lib/CommonTools/include/CommonTools/Platform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,19 @@ class Platform
}

public:
consteval static bool isDesktop()
{
return isLinux() || isWindows() || isMacOs();
}
consteval static bool isDesktop() { return isLinux() || isWindows() || isMacOs(); }

consteval static bool isMobile()
{
return isAndroid() || isIos();
}
consteval static bool isMobile() { return isAndroid() || isIos(); }

consteval static bool isWeb()
{
return isWasm();
}
consteval static bool isWeb() { return isWasm(); }

consteval static bool isStaticDataStorage()
{
#ifdef STATIC_STORAGE
return true;
#else
return false;
#endif
#ifdef STATIC_STORAGE
return true;
#else
return false;
#endif
}

// clang-format off
Expand Down
2 changes: 1 addition & 1 deletion lib/Graph/include/Graph/Edge.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ class Edge
EdgeData mData;
};

}
} // namespace graph
4 changes: 2 additions & 2 deletions lib/Graph/include/Graph/Forest.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class Forest : public Graph<NodeT, EdgeT>
// Roots offset
int maxLevel = 0;

for (const auto&[_, level] : ret)
for (const auto& [_, level] : ret)
maxLevel = std::max(maxLevel, level);

for (const auto& root : rootNodes) {
Expand Down Expand Up @@ -351,4 +351,4 @@ class Forest : public Graph<NodeT, EdgeT>
EdgeList mWasteEdges; // Just redundant
};

}
} // namespace graph
13 changes: 6 additions & 7 deletions lib/StaticDataStorage/include/StaticDataStorage/StaticDataStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,26 @@

#pragma once

#include <memory>
#include <functional>
#include <memory>

#include <QMap>
#include <QFileInfoList>
#include <QMap>

#include <CommonTools/HandyTypes.h>

#include <TermDataInterface/DataStorageInterface.h>
#include <TermDataInterface/GroupSummary.h>
#include <TermDataInterface/TermData.h>
#include <TermDataInterface/StaticGroupData.h>

#include <TermDataInterface/TermData.h>

class StaticDataStorage : public DataStorageInterface
{
public:
StaticDataStorage();

static QFileInfoList files();
static QByteArray qrcFileData(const QString& filePath);
static QFileInfoList files();
static QByteArray qrcFileData(const QString& filePath);
static StaticGroupData prepareForInternalUse(StaticGroupData data);

int storageVersion() const final;
Expand All @@ -44,7 +43,7 @@ class StaticDataStorage : public DataStorageInterface
FutureResult<TermData> deleteTerm(const TermUuid& uuid) final;

private:
constexpr static auto dataFolderPath = ":/data/";
constexpr static auto dataFolderPath = ":/data/";
QMap<GroupUuid, StaticGroupData> mGroups;

QMap<GroupUuid, QDateTime> termsLastEdit() const;
Expand Down
26 changes: 12 additions & 14 deletions lib/StaticDataStorage/source/StaticDataStorage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "include/StaticDataStorage/StaticDataStorage.h"

#include <QMap>
#include <QDir>
#include <QMap>

StaticDataStorage::StaticDataStorage()
: DataStorageInterface()
Expand All @@ -13,7 +13,6 @@ StaticDataStorage::StaticDataStorage()

// Take all files from data folder with extension .json
for (const auto& fileInfo : files()) {

auto fileData = qrcFileData(fileInfo.absoluteFilePath());

auto group = StaticGroupData::from(fileData);
Expand Down Expand Up @@ -50,9 +49,9 @@ StaticGroupData StaticDataStorage::prepareForInternalUse(StaticGroupData data)
auto lastEdit = QDateTime::currentDateTime();

for (auto& term : data.terms) {
term.uuid = TermUuid::generate();
term.uuid = TermUuid::generate();
term.groupUuid = data.uuid.value();
term.lastEdit = lastEdit;
term.lastEdit = lastEdit;
}

return data;
Expand All @@ -62,15 +61,14 @@ int StaticDataStorage::storageVersion() const { return 1; }

FutureResult<GroupSummary> StaticDataStorage::group(const GroupUuid& uuid) const
{
return toFuture<Result<GroupSummary>>([this, &uuid] () { return mGroups.value(uuid); });
return toFuture<Result<GroupSummary>>([this, &uuid]() { return mGroups.value(uuid); });
}

FutureResult<GroupSummary::List> StaticDataStorage::groups() const
{
return toFuture<Result<GroupSummary::List>>([this] () -> GroupSummary::List {

return toFuture<Result<GroupSummary::List>>([this]() -> GroupSummary::List {
auto lastEdits = termsLastEdit();
auto groups = mGroups.values();
auto groups = mGroups.values();

// Sorting this structure
auto groupOrdering = [&lastEdits](const auto& g1, const auto& g2) {
Expand All @@ -95,13 +93,13 @@ FutureResult<GroupSummary> StaticDataStorage::addGroup([[maybe_unused]] const Gr
return toFuture<Result<GroupSummary>>([] { return ErrorCodes::UnknownError; });
}

FutureResult<GroupSummary> StaticDataStorage::updateGroup([[maybe_unused]]const GroupSummary& info)
FutureResult<GroupSummary> StaticDataStorage::updateGroup([[maybe_unused]] const GroupSummary& info)
{
qWarning("Not implemented");
return toFuture<Result<GroupSummary>>([] { return ErrorCodes::UnknownError; });
}

FutureResult<GroupSummary> StaticDataStorage::deleteGroup([[maybe_unused]]const GroupUuid& uuid)
FutureResult<GroupSummary> StaticDataStorage::deleteGroup([[maybe_unused]] const GroupUuid& uuid)
{
qWarning("Not implemented");
return toFuture<Result<GroupSummary>>([] { return ErrorCodes::UnknownError; });
Expand All @@ -113,7 +111,7 @@ FutureResult<TermData> StaticDataStorage::term(const QString& nodeName, const Gr
return toFuture<Result<TermData>>([] { return ErrorCodes::GroupUuidNotFound; });
}

return toFuture<Result<TermData>>([this, nodeName, uuid] () -> Result<TermData> {
return toFuture<Result<TermData>>([this, nodeName, uuid]() -> Result<TermData> {
auto term = mGroups.value(uuid).term(nodeName);
if (!term) {
return ErrorCodes::TermNotFound;
Expand All @@ -135,7 +133,7 @@ FutureResult<TermData::List> StaticDataStorage::terms(const GroupUuid& uuid) con
return toFuture<Result<TermData::List>>([] { return ErrorCodes::GroupUuidNotFound; });
}

return toFuture<Result<TermData::List>>([this, uuid] () -> Result<TermData::List> {
return toFuture<Result<TermData::List>>([this, uuid]() -> Result<TermData::List> {
if (!mGroups.contains(uuid)) {
return ErrorCodes::GroupUuidNotFound;
}
Expand All @@ -150,9 +148,9 @@ FutureResult<TermData> StaticDataStorage::addTerm([[maybe_unused]] const TermDat
return toFuture<Result<TermData>>([] { return ErrorCodes::UnknownError; });
}

FutureResult<TermData> StaticDataStorage::updateTerm([[maybe_unused]] const TermData& info,
FutureResult<TermData> StaticDataStorage::updateTerm([[maybe_unused]] const TermData& info,
[[maybe_unused]] DataStorageInterface::LastEditSource lastEditSource,
[[maybe_unused]] bool checkLastEdit)
[[maybe_unused]] bool checkLastEdit)
{
qWarning("Not implemented");
return toFuture<Result<TermData>>([] { return ErrorCodes::UnknownError; });
Expand Down
4 changes: 1 addition & 3 deletions lib/StaticDataStorage/test/StaticStorageTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ TEST(StaticStorageTest, DefinitionSimplified)
qWarning() << "Can't parse file:" << fileInfo.absoluteFilePath();
}

auto firstChar = [](const QString& str) {
return str.isEmpty() ? QChar() : str[0];
};
auto firstChar = [](const QString& str) { return str.isEmpty() ? QChar() : str[0]; };

for (const auto& term : group.value().terms) {
if (term.definition.isEmpty()) {
Expand Down
5 changes: 2 additions & 3 deletions lib/TermDataConnection/include/TermDataConnection/NetWrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
#include <QNetworkAccessManager>
#include <QNetworkReply>


class NetWrapper
{
public:
using ReplyCallback = std::function<void(QNetworkReply* reply)>;

NetWrapper() = default;
NetWrapper() = default;
~NetWrapper() = default;

void get(QUrl url, ReplyCallback callback) const;
Expand All @@ -21,5 +20,5 @@ class NetWrapper
void deleteResource(QUrl url, ReplyCallback callback) const;

private:
QScopedPointer<QNetworkAccessManager> manager {new QNetworkAccessManager()};
QScopedPointer<QNetworkAccessManager> manager{new QNetworkAccessManager()};
};
Loading

0 comments on commit a633f44

Please sign in to comment.