GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1160:6701a5941352

Merge branch 'feature/KernelSciQlopCatalogu' into develop

trabillard -

r1160:6701a5941352

parent child

Context file:

r1160:6701a5941352

core/include/Catalogue/CatalogueController.h +26 -10

              #include <Common/spimpl.h>
+             #include <memory>
+             class DBCatalogue;
+             class DBEvent;
              Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueController)
              class DataSourceItem;
              class Variable;
              /**
-              * @brief The CatalogueController class aims to make the link between SciQlop and its plugins.
-              * This is the intermediate class that SciQlop has to use in the way to connect a data source.
-              * Please first use register method to initialize a plugin specified by its metadata name (JSON
-              * plugin source) then others specifics method will be able to access it. You can load a data source
-              * driver plugin then create a data source.
+              * @brief The CatalogueController class aims to handle catalogues and event using the CatalogueAPI
+              * library.
               */
              class SCIQLOP_CORE_EXPORT CatalogueController : public QObject {
                  Q_OBJECT
                  explicit CatalogueController(QObject *parent = 0);
                  virtual ~CatalogueController();
-             signals:
-                 /// Signal emitted when a variable is about to be deleted from SciQlop
-                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
+                 // DB
+                 QStringList getRepositories() const;
+                 void addDB(const QString &dbPath);
+                 void saveDB(const QString &destinationPath, const QString &repository);
+                 // Event
+                 bool createEvent(const QString &name);
+                 std::list<std::shared_ptr<DBEvent> > retrieveEvents(const QString &repository) const;
+                 std::list<std::shared_ptr<DBEvent> > retrieveAllEvents() const;
+                 void updateEvent(std::shared_ptr<DBEvent> event);
+                 void trashEvent(std::shared_ptr<DBEvent> event);
+                 void removeEvent(std::shared_ptr<DBEvent> event);
+                 void restore(QUuid eventId);
+                 void saveEvent(std::shared_ptr<DBEvent> event);
-                 /// Signal emitted when a data acquisition is requested on a range for a variable
-                 void rangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range);
+                 // Catalogue
+                 bool createCatalogue(const QString &name, QVector<QUuid> eventList);
+                 void getCatalogues(const QString &repository) const;
+                 void removeEvent(QUuid catalogueId, const QString &repository);
+                 void saveCatalogue(std::shared_ptr<DBEvent> event);
              public slots:
                  /// Manage init/end of the controller

core/src/Catalogue/CatalogueController.cpp +87 0

              #include <CatalogueDao.h>
+             #include <ComparaisonPredicate.h>
+             #include <CompoundPredicate.h>
+             #include <DBCatalogue.h>
+             #include <DBEvent.h>
+             #include <DBTag.h>
+             #include <IRequestPredicate.h>
              #include <QMutex>
              #include <QThread>
              Q_LOGGING_CATEGORY(LOG_CatalogueController, "CatalogueController")
+             namespace {
+             static QString REPOSITORY_WORK_SUFFIX = QString{"Work"};
+             }
              class CatalogueController::CatalogueControllerPrivate {
              public:
                  QMutex m_WorkingMutex;
                  CatalogueDao m_CatalogueDao;
+                 std::list<QString> m_RepositoryList;
              };
              CatalogueController::CatalogueController(QObject *parent)
                  this->waitForFinish();
              }
+             void CatalogueController::addDB(const QString &dbPath)
+             {
+                 QDir dbDir(dbPath);
+                 if (dbDir.exists()) {
+                     auto dirName = dbDir.dirName();
+                     if (std::find(impl->m_RepositoryList.cbegin(), impl->m_RepositoryList.cend(), dirName)
+                         != impl->m_RepositoryList.cend()) {
+                         qCCritical(LOG_CatalogueController())
+                             << tr("Impossible to addDB that is already loaded");
+                     }
+                     if (!impl->m_CatalogueDao.addDB(dbPath, dirName)) {
+                         qCCritical(LOG_CatalogueController())
+                             << tr("Impossible to addDB %1 from %2 ").arg(dirName, dbPath);
+                     }
+                     else {
+                         impl->m_RepositoryList.push_back(dirName);
+                     }
+                 }
+                 else {
+                     qCCritical(LOG_CatalogueController()) << tr("Impossible to addDB that not exists: ")
+                                                           << dbPath;
+                 }
+             }
+             void CatalogueController::saveDB(const QString &destinationPath, const QString &repository)
+             {
+                 if (!impl->m_CatalogueDao.saveDB(destinationPath, repository)) {
+                     qCCritical(LOG_CatalogueController())
+                         << tr("Impossible to saveDB %1 from %2 ").arg(repository, destinationPath);
+                 }
+             }
+             std::list<std::shared_ptr<DBEvent> >
+             CatalogueController::retrieveEvents(const QString &repository) const
+             {
+                 auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
+                 auto events = impl->m_CatalogueDao.getEvents(repository);
+                 for (auto event : events) {
+                     eventsShared.push_back(std::make_shared<DBEvent>(event));
+                 }
+                 return eventsShared;
+             }
+             std::list<std::shared_ptr<DBEvent> > CatalogueController::retrieveAllEvents() const
+             {
+                 auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
+                 for (auto repository : impl->m_RepositoryList) {
+                     eventsShared.splice(eventsShared.end(), retrieveEvents(repository));
+                 }
+                 return eventsShared;
+             }
              void CatalogueController::initialize()
              {
                  qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")
                                                     << QThread::currentThread();
                  impl->m_WorkingMutex.lock();
                  impl->m_CatalogueDao.initialize();
+                 auto defaultRepositoryLocation
+                     = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+                 QDir defaultRepositoryLocationDir;
+                 if (defaultRepositoryLocationDir.mkpath(defaultRepositoryLocation)) {
+                     defaultRepositoryLocationDir.cd(defaultRepositoryLocation);
+                     auto defaultRepository = defaultRepositoryLocationDir.absoluteFilePath(REPOSITORY_DEFAULT);
+                     qCInfo(LOG_CatalogueController())
+                         << tr("Persistant data loading from: ") << defaultRepository;
+                     this->addDB(defaultRepository);
+                 }
+                 else {
+                     qCWarning(LOG_CatalogueController())
+                         << tr("Cannot load the persistent default repository from ")
+                         << defaultRepositoryLocation;
+                 }
                  qCDebug(LOG_CatalogueController()) << tr("CatalogueController init END");
              }

General Comments 3

trabillard

|

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