Merge branch 'master' into 0.7.0-test

Author: Nico-Duduf

new sync methods.txt

@@ -0,0 +1,64 @@
+tables by project
+
+-> fullsync : all tables only if project column is ""
+
+RamApplication
+RamFileType
+RamProject
+RamState
+RamTemplateAssetGroup
+RamTemplateStep
+RamUser
+
+-> projectSync : all tables but with project filter using project column
+
+-> in UI "full sync" = fullsync + current project sync
+
+-> quicksync : doesn't change
+
+
+/ok/ LOCAL data update methods
+/ok/ Server update
+/ok/ ldi: setProject
+/ok/ ldi: getProject
+/ok/ ldi: create with project
+/ok/ ldi: project filters on getters
+/ok/ Reimplement RamObject to set the project column (creation, update data)
+/ok/ on RamObjects storing project, remove project from data and use the column
+/ok/ Add project data to sync (server)
+/ok/ Add project data to sync (client)
+/ok/ Reimplement fullSync
+/ok/ Implement projectSync
+/ok/ RamServerInterface::downloadData only general tables
+/ok/ Server refuses sync in case of wrong app version
+/ok/ Pull missing uuids from server
+
+
+
+// Schedule removals not updated in ui on sync but on reboot
+// Delay loading objects in Models
+   > Instead of loading objects, add nullptrs to the list, and replace by the obj when first called
+   > all checks of the objs must be done with the data
+// RamAbstractObject data integrity checks (a function called on construct, ovrriden by children) calls invalidate() if data is not right
+   > Calls and LDI data integrity check
+// Full sync should always be synchronous to be sure everything is better
+// Refactor localdatainterface to create a new LocalDataManager class with static methods for queries on a specific db
+// Implement Sync by table (for fullSync and projectSync):
+   > table one by one, cache incoming data until we've got all tables (both on server side & client side)
+   > server::startSyncSession
+   > client: send tables one by one
+   > server::sync
+   > client: when all sent tables are retrieved or if timeout*numTables
+   > server::endSyncSession
+// Implement pagination, don't send/return more than 100 rows per table
+
+
+
+
+
+
+1- Download only the general data
+2- Pull objects only when needed (and delay in ramobjectmodel)
+3- sync :
+   - general data, all, send new, modified, receive new, modified
+   - project data, send new and modified, get modified. Pull new when needed (all objects are in the lists)

src/duqf-app/app-config.h

@@ -6,6 +6,8 @@
 #define CACHE_RAMOBJECT_DATA true
 #define CACHE_LOCAL_DATA true
 
+//#define DEBUG_ALL_INCOMING_DATA
+
 //#define FORCE_WELCOME_SCREEN
 
 #endif // APPCONFIG_H

src/mainwindow.cpp

@@ -349,8 +349,8 @@ void MainWindow::connectEvents()
     connect(ui_projectSettingsPage, SIGNAL(closeRequested()), this, SLOT(home()));
 
     // Other buttons
-    connect(actionSync, SIGNAL(triggered()), DBInterface::instance(),SLOT(sync()));
-    connect(actionFullSync, SIGNAL(triggered()), DBInterface::instance(),SLOT(fullSync()));
+    connect(actionSync, SIGNAL(triggered()), DBInterface::instance(),SLOT(quickSync()));
+    connect(actionFullSync, SIGNAL(triggered()), this,SLOT(fullSync()));
     connect(mainStack,SIGNAL(currentChanged(int)), this, SLOT(pageChanged(int)));
 
     // Misc
@@ -790,8 +790,13 @@ void MainWindow::setOnlineAction()
 {
     DBInterface::instance()->setOnline();
 
-    // Trigger a full sync
-    if (RamServerInterface::instance()->isOnline()) DBInterface::instance()->fullSync();
+    // Trigger a general sync
+    if (RamServerInterface::instance()->isOnline())
+    {
+        DBInterface::instance()->generalSync();
+        RamProject *proj = Ramses::instance()->currentProject();
+        if (proj) DBInterface::instance()->projectSync(proj->uuid());
+    }
 }
 
 void MainWindow::databaseSettingsAction()
@@ -1056,6 +1061,7 @@ void MainWindow::startSync()
 {
     ui_refreshButton->hide();
     mainStatusBar->showMessage(tr("Syncing..."));
+
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)

src/mainwindow.h

@@ -144,6 +144,7 @@ private slots:
     void finishSync();
     void startSync();
 
+
 protected:
     void closeEvent(QCloseEvent *event) override;
     void keyPressEvent(QKeyEvent *key) override;

src/pages/loginpage.cpp

@@ -111,8 +111,8 @@ void LoginPage::loginButton_clicked()
     }
     settings.endArray();
 
-    // Trigger a full sync
-    if (RamServerInterface::instance()->isOnline()) DBInterface::instance()->fullSync();
+    // Trigger a general sync
+    if (RamServerInterface::instance()->isOnline()) DBInterface::instance()->generalSync();
 }
 
 void LoginPage::userChanged(RamUser *u)

src/progressmanager.cpp

@@ -34,11 +34,13 @@ void ProgressManager::setTitle(const QString &t)
 void ProgressManager::setProgress(const int &p)
 {
     m_val = p;
+    qApp->processEvents();
     emit progress(p);
 }
 
 void ProgressManager::setMaximum(const int &m)
 {
+    qDebug() << "Progress max: " << m;
     m_maximum = m;
     emit maximum(m);
 }

src/progresspage.cpp

@@ -1,5 +1,7 @@
 #include "progresspage.h"
 
+#include "progressmanager.h"
+
 ProgressPage::ProgressPage(QWidget *parent) : QWidget(parent)
 {
     setupUi();
@@ -35,7 +37,7 @@ void ProgressPage::setupUi()
 
     l->addStretch();
 
-    m_titleLabel = new QLabel("", this);
+    m_titleLabel = new QLabel("Work in progress...", this);
     l->addWidget(m_titleLabel);
 
     m_progressBar = new ProgressBar(this);

src/progresspage.h

@@ -6,7 +6,6 @@
 #include <QProgressBar>
 #include <QLabel>
 
-#include "progressmanager.h"
 #include "progressbar.h"
 
 class ProgressPage : public QWidget

src/ramdatainterface/dbinterface.cpp

@@ -1,6 +1,9 @@
 #include "dbinterface.h"
+#include "duqf-app/app-config.h"
 #include "duqf-utils/guiutils.h"
 #include "progressmanager.h"
+#include "ramses.h"
+#include "datacrypto.h"
 
 DBInterface *DBInterface::_instance = nullptr;
 
@@ -71,9 +74,9 @@ bool DBInterface::contains(QString uuid, QString table)
     return m_ldi->contains(uuid, table);
 }
 
-void DBInterface::createObject(QString uuid, QString table, QString data)
+void DBInterface::createObject(QString uuid, QString table, QString data, QString projectUuid)
 {
-    m_ldi->createObject(uuid, table, data);
+    m_ldi->createObject(uuid, table, data, projectUuid);
 }
 
 QString DBInterface::objectData(QString uuid, QString table)
@@ -86,6 +89,16 @@ void DBInterface::setObjectData(QString uuid, QString table, QString data)
     m_ldi->setObjectData(uuid, table, data);
 }
 
+QString DBInterface::project(QString uuid, QString table)
+{
+    return m_ldi->project(uuid, table);
+}
+
+void DBInterface::setProject(QString uuid, QString table, QString projectUuid)
+{
+    m_ldi->setProject(uuid, table, projectUuid);
+}
+
 void DBInterface::removeObject(QString uuid, QString table)
 {
     m_ldi->removeObject(uuid, table);
@@ -105,7 +118,7 @@ void DBInterface::setUsername(QString uuid, QString username)
 {
     m_ldi->setUsername(uuid, username);
     // Setting the username must trigger an instant sync (if it's not new)
-    if (username.toLower() != "new") sync();
+    if (username.toLower() != "new") quickSync();
 }
 
 bool DBInterface::isUserNameAavailable(const QString &userName)
@@ -141,7 +154,8 @@ void DBInterface::setDataFile(const QString &file, bool ignoreUser)
 
         qDebug() << "Selected previous user: " << userUuid;
 
-        emit userChanged( userUuid );
+        // The user will be set AFTER login/setOnline
+        // emit userChanged( userUuid );
         setOnline(serverUuid);
 
         pm->setText(tr("Ready!"));
@@ -283,10 +297,12 @@ void DBInterface::acceptClean()
 
     resumeSync();
     // Full sync
-    fullSync();
+    generalSync();
+    RamProject *proj = Ramses::instance()->currentProject();
+    if (proj) projectSync(proj->uuid());
 }
 
-void DBInterface::sync()
+void DBInterface::quickSync()
 {
     if (m_syncSuspended) {
         log(tr("Sync is suspended!"), DuQFLog::Warning);

src/ramdatainterface/dbinterface.h

@@ -55,11 +55,14 @@ class DBInterface : public DuQFLoggerObject
     QSet<QString> tableUuids(QString table);
     bool contains(QString uuid, QString table);
 
-    void createObject(QString uuid, QString table, QString data);
+    void createObject(QString uuid, QString table, QString data, QString projectUuid = "");
 
     QString objectData(QString uuid, QString table);
     void setObjectData(QString uuid, QString table, QString data);
 
+    QString project(QString uuid, QString table);
+    void setProject(QString uuid, QString table, QString projectUuid);
+
     void removeObject(QString uuid, QString table);
     void restoreObject(QString uuid, QString table);
     bool isRemoved(QString uuid, QString table);