ondra/colnod-connector
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git synced 2026-07-12 12:00:37 +02:00
Code Issues Projects Releases Wiki Activity

prepering next step: process data

Browse Source
This commit is contained in:
Ondřej Fischer 2019-12-02 10:20:16 +01:00
parent ac8eff481d
commit 649b494682
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/colnod/colnodapi.cpp
View File

@ -39,7 +39,7 @@ void ColnodAPI::downloadData(const Timestamp &time)
if (!checkRequest(request)) { if (!checkRequest(request)) {
qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful"; qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful";
mValid = false; mValid = false;
emit downloadDataFinished(nullptr); emit downloadDataFinished(nullptr); // TODO: think about it, will the other if passed?
} }
else if (!checkResponse(request->responseData())) { else if (!checkResponse(request->responseData())) {
qWarning(colnod) << "Data from" << request->url() << "are invalid"; qWarning(colnod) << "Data from" << request->url() << "are invalid";

2
src/colnod/colnodapi.h
View File

@ -51,7 +51,7 @@ public:
ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, const QString &userName = "spaceti", const QString &password = "spaceti1"); ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, const QString &userName = "spaceti", const QString &password = "spaceti1");
void downloadData(const Timestamp &time); void downloadData(const Timestamp &time);
void processData(const std::shared_ptr<Data> &data); bool processData(const std::shared_ptr<Data> &data);
// New approach // New approach
std::shared_ptr<serversdk::Request> requestLogin(); std::shared_ptr<serversdk::Request> requestLogin();

11
src/colnod/syncmanager.cpp
View File

@ -49,10 +49,6 @@ bool SyncManager::startSynchronization()
qInfo(syncmanager) << equals; qInfo(syncmanager) << equals;
qInfo(syncmanager) << "SYNCHRONIZATION BEGIN"; qInfo(syncmanager) << "SYNCHRONIZATION BEGIN";
// TODO: solve this in prepare data
database->initNewTokens();
// GETTING DATA FROM DATABASE // GETTING DATA FROM DATABASE
auto databaseData = database->downloadData(); auto databaseData = database->downloadData();
if (!databaseData) { if (!databaseData) {
@ -82,7 +78,12 @@ bool SyncManager::startSynchronization()
return; return;
} }
// NOT FINISHED scolnod->processData(preparedData->colnodData); if (!colnod->processData(preparedData->colnodData)) {
qCritical(syncmanager) << "Not possible to upload data to colnod";
}
if (!database->processData(preparedData->databaseData)) {
qCritical(syncmanager) << "Not possible to upload data to database";
}
}); });
return true; return true;

7
src/colnod/syncmanager.h
View File

@ -30,7 +30,6 @@ private:
private: private:
void initNewToken(std::shared_ptr<Token> token); void initNewToken(std::shared_ptr<Token> token);
bool downloadData();
bool prepareData(); bool prepareData();
bool processData(); bool processData();
void updateLastUpdate(qint64 syncBegin); void updateLastUpdate(qint64 syncBegin);
@ -55,12 +54,6 @@ private:
serversdk::DatabaseManager dbMan; serversdk::DatabaseManager dbMan;
Timestamp mlastSync; Timestamp mlastSync;
std::shared_ptr<Data> colnodData;
std::shared_ptr<Data> databaseData;
std::shared_ptr<Data> colnodDataToProcess;
std::shared_ptr<Data> databaseDataToProcess;
int dataAmount = 0; int dataAmount = 0;
bool mDryMode; bool mDryMode;