michalks/colnod-connector
1
0
Fork 0
forked from ondra/colnod-connector
Code Issues Pull Requests Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Ondřej Fischer 2019-11-26 11:13:19 +01:00
parent 1784b33f7f
commit a9852b88c1
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/colnod/colnodapi.h
View File

@ -96,7 +96,7 @@ private:
QString mPassword; QString mPassword;
Timestamp mLastSync; Timestamp mLastSync;
bool mDryMode = false; bool mDryMode = false;
bool mValid = false; bool mValid = true;
std::shared_ptr<Data> mData; std::shared_ptr<Data> mData;

4
src/colnod/databaseapi.cpp
View File

@ -255,6 +255,10 @@ std::shared_ptr<Token> DatabaseAPI::getToken(const QString &id)
bool DatabaseAPI::isAlreadyDeleted(const QString &id) bool DatabaseAPI::isAlreadyDeleted(const QString &id)
{ {
auto token = getToken(id); auto token = getToken(id);
if (!token) {
qWarning(database) << "Token deleted in colnod doesn't exists in db, will be noted as already deleted in stats";
return true;
}
if (token->deleted()) if (token->deleted())
return true; return true;
return false; return false;

6
src/colnod/syncmanager.cpp
View File

@ -16,14 +16,14 @@ bool SyncManager::init()
connect(database.get(), &DatabaseAPI::error, [=](){ connect(database.get(), &DatabaseAPI::error, [=](){
QCoreApplication::exit(1); QCoreApplication::exit(1);
}); });
connect(colnod.get(), &ColnodAPI::error, [=](){
QCoreApplication::exit(1);
});
if (database->open()){ if (database->open()){
mlastSync.set_timestamp(database->getLastSync()); mlastSync.set_timestamp(database->getLastSync());
colnod = std::make_shared<ColnodAPI>(&reqMan, mlastSync.timestamp(), mDryMode); colnod = std::make_shared<ColnodAPI>(&reqMan, mlastSync.timestamp(), mDryMode);
connect(colnod.get(), &ColnodAPI::error, [=](){
QCoreApplication::exit(1);
});
// -1 --> some error with getting data from DB // -1 --> some error with getting data from DB
if (mlastSync.timestamp() >= 0){ if (mlastSync.timestamp() >= 0){

2
test/unitTests/complextest.cpp
View File

@ -173,6 +173,7 @@ int ComplexTest::getNumOfSubjects()
// subjectsRespSpy.wait(timeout); // subjectsRespSpy.wait(timeout);
// auto doc = getJsonDoc(subjectsResp->getJson()); // auto doc = getJsonDoc(subjectsResp->getJson());
// return doc.object()["items"].toArray().size(); // return doc.object()["items"].toArray().size();
return 0;
} }
int ComplexTest::getNumOfTokens() int ComplexTest::getNumOfTokens()
@ -183,6 +184,7 @@ int ComplexTest::getNumOfTokens()
// tokensRespSpy.wait(timeout); // tokensRespSpy.wait(timeout);
// auto doc = getJsonDoc(tokensResp->getJson()); // auto doc = getJsonDoc(tokensResp->getJson());
// return doc.object()["items"].toArray().size(); // return doc.object()["items"].toArray().size();
return 0;
} }
QJsonDocument ComplexTest::getJsonDoc(const QString &json) QJsonDocument ComplexTest::getJsonDoc(const QString &json)