GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1279:4e7a8f2af91d

Addd save methods. Fix bug with work repository suffix handling

perrinel -

r1279:4e7a8f2af91d

parent child

Context file:

r1279:4e7a8f2af91d

core/src/Catalogue/CatalogueController.cpp +42 -10

              namespace {
-             static QString REPOSITORY_WORK_SUFFIX = QString{"work"};
-             static QString REPOSITORY_TRASH_SUFFIX = QString{"trash"};
+             static QString REPOSITORY_WORK_SUFFIX = QString{"_work"};
+             static QString REPOSITORY_TRASH_SUFFIX = QString{"_trash"};
              }
              class CatalogueController::CatalogueControllerPrivate {
                  void copyDBtoDB(const QString &dbFrom, const QString &dbTo);
                  QString toWorkRepository(QString repository);
                  QString toSyncRepository(QString repository);
+                 void savAllDB();
+                 void saveEvent(std::shared_ptr<DBEvent> event, bool persist = true);
+                 void saveCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool persist = true);
              };
              CatalogueController::CatalogueController(QObject *parent)
              void CatalogueController::updateEvent(std::shared_ptr<DBEvent> event)
              {
-                 event->setRepository(impl->toSyncRepository(event->getRepository()));
+                 event->setRepository(impl->toWorkRepository(event->getRepository()));
                  impl->m_CatalogueDao.updateEvent(*event);
              }
              void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
              {
-                 impl->m_CatalogueDao.moveEvent(*event, impl->toSyncRepository(event->getRepository()), true);
+                 impl->saveEvent(event, true);
              }
              std::list<std::shared_ptr<DBCatalogue> >
              void CatalogueController::updateCatalogue(std::shared_ptr<DBCatalogue> catalogue)
              {
-                 catalogue->setRepository(impl->toSyncRepository(catalogue->getRepository()));
+                 catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
                  impl->m_CatalogueDao.updateCatalogue(*catalogue);
              }
              void CatalogueController::saveCatalogue(std::shared_ptr<DBCatalogue> catalogue)
              {
-                 impl->m_CatalogueDao.moveCatalogue(*catalogue,
-                                                    impl->toSyncRepository(catalogue->getRepository()), true);
+                 impl->saveCatalogue(catalogue, true);
              }
              void CatalogueController::saveAll()
                      // Save Event
                      auto events = this->retrieveEvents(repository);
                      for (auto event : events) {
-                         this->saveEvent(event);
+                         impl->saveEvent(event, false);
                      }
                      // Save Catalogue
                      auto catalogues = this->retrieveCatalogues(repository);
                      for (auto catalogue : catalogues) {
-                         this->saveCatalogue(catalogue);
+                         impl->saveCatalogue(catalogue, false);
                      }
                  }
+                 impl->savAllDB();
              }
              void CatalogueController::initialize()
              {
                  auto syncRepository = toSyncRepository(repository);
-                 return QString("%1_%2").arg(syncRepository, REPOSITORY_WORK_SUFFIX);
+                 return QString("%1%2").arg(syncRepository, REPOSITORY_WORK_SUFFIX);
              }
              QString CatalogueController::CatalogueControllerPrivate::toSyncRepository(QString repository)
                  }
                  return syncRepository;
              }
+             void CatalogueController::CatalogueControllerPrivate::savAllDB()
+             {
+                 for (auto repository : m_RepositoryList) {
+                     auto defaultRepositoryLocation
+                         = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+                     m_CatalogueDao.saveDB(defaultRepositoryLocation, repository);
+                 }
+             }
+             void CatalogueController::CatalogueControllerPrivate::saveEvent(std::shared_ptr<DBEvent> event,
+                                                                             bool persist)
+             {
+                 m_CatalogueDao.moveEvent(*event, toSyncRepository(event->getRepository()), true);
+                 if (persist) {
+                     savAllDB();
+                 }
+             }
+             void CatalogueController::CatalogueControllerPrivate::saveCatalogue(
+                 std::shared_ptr<DBCatalogue> catalogue, bool persist)
+             {
+                 m_CatalogueDao.moveCatalogue(*catalogue, toSyncRepository(catalogue->getRepository()), true);
+                 if (persist) {
+                     savAllDB();
+                 }
+             }

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages