[sociald] Use libsocialcache for caching operations

This commit starts the migration work to libsocialcache for interaction with the social cache databases.
sailfishos · Sep 26, 2013 · 9cee456 · 9cee456
1 parent efb32c0
commit 9cee456
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 877 deletions.
diff --git a/rpm/sociald.spec b/rpm/sociald.spec
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(libkcalcoren-qt5)
 BuildRequires:  nemo-qml-plugin-notifications-qt5-devel
 BuildRequires:  libmeegotouchevents-qt5-devel
 BuildRequires:  buteo-syncfw-qt5-devel
+BuildRequires:  pkgconfig(socialcache)
 # for lupdate
 BuildRequires:  qt5-qttools-linguist
 Requires: sailfish-components-accounts-qt5 >= 0.0.43

diff --git a/src/facebook/facebookcalendartypesyncadaptor.h b/src/facebook/facebookcalendartypesyncadaptor.h
@@ -9,11 +9,11 @@
 #define FACEBOOKCALENDARTYPESYNCADAPTOR_H
 
 #include "facebookdatatypesyncadaptor.h"
-#include "databasemanipulationinterface.h"
+#include "internaldatabasemanipulationinterface.h"
 
 class FacebookCalendarTypeSyncAdaptor
         : public FacebookDataTypeSyncAdaptor
-        , private DatabaseManipulationInterface
+        , private InternalDatabaseManipulationInterface
 {
     Q_OBJECT
 

diff --git a/src/facebook/facebookimagesyncadaptor.cpp b/src/facebook/facebookimagesyncadaptor.cpp
diff --git a/src/facebook/facebookimagesyncadaptor.h b/src/facebook/facebookimagesyncadaptor.h
@@ -20,15 +20,12 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QSslError>
 
-#include <QtContacts/QContactManager>
-#include <QtContacts/QContactAbstractRequest>
-#include <QtContacts/QContactFetchRequest>
-#include <QtContacts/QContactFetchHint>
-#include <QtContacts/QContact>
+#include <socialcache/facebookimagesdatabase.h>
 
 class SyncService;
 
-class FacebookImageSyncAdaptor : public FacebookDataTypeSyncAdaptor
+class FacebookImageSyncAdaptor
+        : public FacebookDataTypeSyncAdaptor
 {
     Q_OBJECT
 
@@ -41,53 +38,31 @@ class FacebookImageSyncAdaptor : public FacebookDataTypeSyncAdaptor
 protected: // implementing FacebookDataTypeSyncAdaptor interface
     void purgeDataForOldAccounts(const QList<int> &oldIds);
     void beginSync(int accountId, const QString &accessToken);
+    void finalize();
 
 private:
     void requestData(int accountId, const QString &accessToken, const QString &continuationUrl,
                      const QString &fbUserId, const QString &fbAlbumId);
-    bool haveAlreadyCachedAlbum(const QString &fbAlbumId, const QDateTime &updatedTime);
-    bool haveAlreadyCachedImage(const QString &fbPhotoId, const QString &imageUrl, int accountId);
-    void cacheImage(const QString &fbPhotoId, const QString &fbAlbumId,
-                    const QString &fbUserId, const QString &createdTime,
-                    const QString &updatedTime, const QString &thumbnailUrl,
-                    const QString &imageUrl, const QString &photoName,
-                    int width, int height);
-    void possiblyAddNewUser(const QString &fbUserId, const QString &fbUserName,
-                            int accountId, const QString &accessToken);
-    void possiblyAddNewAlbum(const QString &fbAlbumId, const QString &fbUserId,
-                             const QString &fbUserName, const QString &createdTime,
-                             const QString &updatedTime, const QString &albumName,
-                             int photoCount, const QString &coverPhotoId,
-                             int accountId, const QString &accessToken);
-
-    QStringList queryDatabaseRow(const QString &fbPhotoId);
-    void updateAccountsTable(int accountId, const QString &fbUserId);
-    void purgeAccount(int accountId);
-
-    int dbUserVersion();
-    bool dbCreateTables();
-    bool dbDropTables();
+    bool haveAlreadyCachedImage(const QString &fbImageId, const QString &imageUrl, int accountId);
+    void possiblyAddNewUser(const QString &fbUserId, int accountId, const QString &accessToken);
 
 
 private Q_SLOTS:
     void albumsFinishedHandler();
-    void photosFinishedHandler();
+    void imagesFinishedHandler();
     void userFinishedHandler();
 
 private:
-    QSqlDatabase m_imgdb;
-
     // for server-side removal detection.
     void initRemovalDetectionLists();
     void clearRemovalDetectionLists();
-    QStringList photosInAlbum(const QString &fbAlbumId);
-    bool purgeAlbum(const QString &fbAlbumId);
-    bool purgePhoto(const QString &fbPhotoId);
-    void purgeDetectedRemovals();
+    // void purgeDetectedRemovals();
     QStringList m_cachedAlbumIds;
-    QStringList m_cachedPhotoIds;
+    QStringList m_cachedImageIds;
     QStringList m_serverAlbumIds;
-    QStringList m_serverPhotoIds;
+    QStringList m_serverImageIds;
+
+    FacebookImagesDatabase m_db;
 };
 
 #endif // FACEBOOKIMAGESYNCADAPTOR_H
diff --git a/src/databasemanipulationinterface.cpp → ...internaldatabasemanipulationinterface.cpp b/src/databasemanipulationinterface.cpp → ...internaldatabasemanipulationinterface.cpp
@@ -5,7 +5,7 @@
  **
  ****************************************************************************/
 
-#include "databasemanipulationinterface.h"
+#include "internaldatabasemanipulationinterface.h"
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtSql/QSqlQuery>
@@ -14,11 +14,11 @@
 #include "trace.h"
 #include "syncservice.h"
 
-DatabaseManipulationInterface::~DatabaseManipulationInterface()
+InternalDatabaseManipulationInterface::~InternalDatabaseManipulationInterface()
 {
 }
 
-bool DatabaseManipulationInterface::initDatabase(const QString &serviceName,
+bool InternalDatabaseManipulationInterface::initDatabase(const QString &serviceName,
                                                  const QString &dataType, const QString &baseDir,
                                                  const QString &dbFile, int userVersion)
 {
@@ -75,7 +75,7 @@ bool DatabaseManipulationInterface::initDatabase(const QString &serviceName,
     return true;
 }
 
-bool DatabaseManipulationInterface::createPragmaVersion(const QString &serviceName,
+bool InternalDatabaseManipulationInterface::createPragmaVersion(const QString &serviceName,
                                                         const QString &dataType, int version)
 {
     QSqlQuery query (db);
@@ -90,7 +90,7 @@ bool DatabaseManipulationInterface::createPragmaVersion(const QString &serviceNa
     return true;
 }
 
-int DatabaseManipulationInterface::dbUserVersion(const QString &serviceName,
+int InternalDatabaseManipulationInterface::dbUserVersion(const QString &serviceName,
                                                  const QString &dataType) const
 {
     const QString queryStr = QString("PRAGMA user_version");

diff --git a/src/databasemanipulationinterface.h → src/internaldatabasemanipulationinterface.h b/src/databasemanipulationinterface.h → src/internaldatabasemanipulationinterface.h
@@ -5,15 +5,15 @@
  **
  ****************************************************************************/
 
-#ifndef DATABASEMANIPULATIONINTERFACE_H
-#define DATABASEMANIPULATIONINTERFACE_H
+#ifndef INTERNALDATABASEMANIPULATIONINTERFACE_H
+#define INTERNALDATABASEMANIPULATIONINTERFACE_H
 
 #include <QtSql/QSqlDatabase>
 
-class DatabaseManipulationInterface
+class InternalDatabaseManipulationInterface
 {
 public:
-    virtual ~DatabaseManipulationInterface();
+    virtual ~InternalDatabaseManipulationInterface();
 protected:
     bool initDatabase(const QString &serviceName, const QString &dataType, const QString &baseDir,
                       const QString &dbFile, int userVersion);
@@ -25,4 +25,4 @@ class DatabaseManipulationInterface
     int dbUserVersion(const QString &serviceName, const QString &dataType) const;
 };
 
-#endif // DATABASEMANIPULATIONINTERFACE_H
+#endif // INTERNALDATABASEMANIPULATIONINTERFACE_H
diff --git a/src/socialnetworksyncadaptor.cpp b/src/socialnetworksyncadaptor.cpp
@@ -126,6 +126,15 @@ void SocialNetworkSyncAdaptor::checkAccounts(SyncService::DataType dataType, QLi
     }
 }
 
+/*!
+    \internal
+    Called when the semaphores decreased to 0, this method is used
+    to finalize something, like saving all data to a database.
+ */
+void SocialNetworkSyncAdaptor::finalize()
+{
+}
+
 /*!
     \internal
     Returns the last sync timestamp for the given service, account and data type.
@@ -570,6 +579,8 @@ void SocialNetworkSyncAdaptor::decrementSemaphore(int accountId)
     m_accountSyncSemaphores.insert(accountId, semaphoreValue);
 
     if (semaphoreValue == 0) {
+        finalize();
+
         // finished all outstanding sync requests for this account.
         // update the sync time in the global sociald database.
         updateLastSyncTimestamp(m_serviceName,

diff --git a/src/socialnetworksyncadaptor.h b/src/socialnetworksyncadaptor.h
@@ -63,6 +63,7 @@ class SocialNetworkSyncAdaptor : public QObject
     void enabledChanged();
 
 protected:
+    virtual void finalize();
     QDateTime lastSyncTimestamp(const QString &serviceName, const QString &dataType, const QString &accountId) const;
     bool updateLastSyncTimestamp(const QString &serviceName, const QString &dataType, const QString &accountId, const QDateTime &timestamp);
     QDateTime whenSyncedDatum(const QString &serviceName, const QString &datumIdentifier) const;

diff --git a/src/src.pro b/src/src.pro
@@ -12,7 +12,8 @@ PKGCONFIG += Qt5Contacts \
     nemonotifications-qt5 \
     buteosyncfw5 \
     libmkcal-qt5 \
-    libkcalcoren-qt5
+    libkcalcoren-qt5 \
+    socialcache
 
 DEFINES *= USING_QTPIM
 DEFINES *= BEGIN_CONTACTS_NAMESPACE=QT_BEGIN_NAMESPACE_CONTACTS
@@ -49,13 +50,13 @@ HEADERS += \
     $$PWD/syncservice.h \
     $$PWD/syncservice_p.h \
     $$PWD/trace.h \
-    $$PWD/databasemanipulationinterface.h
+    $$PWD/internaldatabasemanipulationinterface.h
 
 SOURCES += \
     $$PWD/buteosocialsync.cpp \
     $$PWD/socialnetworksyncadaptor.cpp \
     $$PWD/syncservice.cpp \
-    $$PWD/databasemanipulationinterface.cpp
+    $$PWD/internaldatabasemanipulationinterface.cpp
 
 MOC_DIR = $$PWD/../.moc
 OBJECTS_DIR = $$PWD/../.obj