add dbus related stuff

wengxt · wengxt · commit f5e487c99a2b · 2012-03-23T01:49:54.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
 find_package(KDE4 REQUIRED)
 include_directories(${KDE4_INCLUDES})
+include_directories(${PROJECT_SOURCE_DIR}/lib)
+
 add_definitions(${KDE4_DEFINITIONS})
 find_package(QCA2 REQUIRED)
 find_package(QOAuth REQUIRED)
diff --git a/backend/dropbox/CMakeLists.txt b/backend/dropbox/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(${QT_QTCORE_INCLUDE_DIR}
-                    ${PROJECT_SOURCE_DIR}/lib
                     ${QOAuth_INCLUDE_DIR}
                     ${QT_QTGUI_INCLUDE_DIR}
                     ${QCA2_INCLUDE_DIR}
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
@@ -1 +1,26 @@
+find_package(PkgConfig REQUIRED)
 
+_pkgconfig_invoke("dbus-1" DBUS SESSION_BUS_SERVICES_DIR "" "--variable=session_bus_services_dir")
+
+set(daemon_SRCS
+    daemon.cpp
+    main.cpp
+    )
+
+set(daemon_MOC_HDRS
+    daemon.h
+    )
+
+qt4_wrap_cpp(
+    daemon_MOC_SRCS
+    ${daemon_MOC_HDRS}
+)
+
+add_executable(qcloud_daemon ${daemon_SRCS} ${daemon_MOC_SRCS})
+
+target_link_libraries(qcloud_daemon
+                      ${QT_QTCORE_LIBRARY}
+                      )
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.qcloud.daemon.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.qcloud.daemon.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.qcloud.daemon.service DESTINATION ${DBUS_SESSION_BUS_SERVICES_DIR})
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
@@ -0,0 +1,13 @@
+#include "daemon.h"
+
+namespace QCloud {
+Daemon::Daemon (int& argc, char** argv) : QCoreApplication (argc, argv)
+{
+
+}
+
+Daemon::~Daemon()
+{
+
+}
+}
diff --git a/daemon/daemon.h b/daemon/daemon.h
@@ -0,0 +1,10 @@
+#include <QCoreApplication>
+namespace QCloud {
+class Daemon : public QCoreApplication
+{
+    Q_OBJECT
+public:
+    Daemon (int& argc, char** argv);
+    virtual ~Daemon();
+};
+}
diff --git a/daemon/main.cpp b/daemon/main.cpp
@@ -0,0 +1,9 @@
+#include <QCoreApplication>
+#include "daemon.h"
+
+int main(int argc, char* argv[])
+{
+    QCloud::Daemon app(argc, argv);
+
+    return app.exec();
+}
diff --git a/daemon/org.qcloud.daemon.service.in b/daemon/org.qcloud.daemon.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.qcloud.daemon
+Exec=@CMAKE_INSTALL_PREFIX@/bin/qcloud-daemon
diff --git a/daemon/service.cpp b/daemon/service.cpp
@@ -0,0 +1,15 @@
+#include "service.h"
+
+namespace QCloud {
+
+Service::Service (QObject* parent) : Server (parent)
+{
+
+}
+
+Service::~Service()
+{
+
+}
+
+}
diff --git a/daemon/service.h b/daemon/service.h
@@ -0,0 +1,11 @@
+#include <QCoreApplication>
+#include "server.h"
+namespace QCloud {
+class Service : public Server
+{
+    Q_OBJECT
+public:
+    explicit Service (QObject* parent = 0);
+    virtual ~Service();
+};
+}
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(${QT_INCLUDE_DIR}
-                    ${PROJECT_SOURCE_DIR}/lib
                     ${QOAuth_INCLUDE_DIR}
                     ${QCA2_INCLUDE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
@@ -17,7 +16,7 @@ set(qcloud_SRCS
     client.cpp
     )
 
-set(qcloud_MOC_HDRS
+set(qcloud_HDRS
     ibackend.h
     oauthbackend.h
     authorizewidget.h
@@ -28,6 +27,8 @@ set(qcloud_MOC_HDRS
     client.h
     )
 
+set(qcloud_MOC_HDRS ${qcloud_HDRS} client_p.h)
+
 qt4_wrap_cpp(
     qcloud_MOC_SRCS
     ${qcloud_MOC_HDRS}
@@ -45,7 +46,7 @@ qt4_add_dbus_adaptor(qcloud_SRCS
 
 qt4_add_dbus_interface(qcloud_SRCS
     daemon.xml
-    org.qcloud.daemon
+    org.qcloud.Daemon
 )
 
 add_library(qcloud SHARED ${qcloud_SRCS} ${qcloud_MOC_SRCS} ${qcloud_UI_SRCS})
diff --git a/lib/client.cpp b/lib/client.cpp
@@ -1,9 +1,22 @@
 #include "client.h"
+#include "client_p.h"
 #include "org.qcloud.daemon.h"
 
 namespace QCloud {
 
-Client::Client(QObject* parent)
+Client::Private::Private(Client* client) : QObject(client)
+    ,m_connection(QDBusConnection::sessionBus())
+    ,m_daemon(new org::qcloud::Daemon("org.qcloud.Daemon", "/daemon", m_connection, this))
+{
+}
+
+
+Client::Private::~Private()
+{
+}
+
+Client::Client(QObject* parent) : QObject(parent)
+    ,d(new Private(this))
 {
 
 }
@@ -13,5 +26,24 @@ Client::~Client()
 
 }
 
+bool Client::isValid()
+{
+    return d->m_daemon->isValid();
+}
+
+QDBusPendingReply< bool > Client::addAccount (const QString& backend_name, const QString& user_name, const QDBusVariant& account_specific_data)
+{
+    return d->m_daemon->addAccount(backend_name, user_name, account_specific_data);
+}
+
+QDBusPendingReply< int > Client::sync (const QString& app_name)
+{
+    return d->m_daemon->sync(app_name);
+}
+
+QDBusPendingReply< int > Client::uploadFile (const QString& app_name, const QStringList& file_list)
+{
+    return d->m_daemon->uploadFile(app_name, file_list);
+}
 
 }
diff --git a/lib/client.h b/lib/client.h
@@ -1,13 +1,24 @@
 #ifndef QCLOUD_CLIENT_H
 #define QCLOUD_CLIENT_H
 #include <QObject>
+#include <QDBusConnection>
+#include <QDBusPendingReply>
 
 namespace QCloud {
+
 class Client : public QObject {
     Q_OBJECT
 public:
     explicit Client(QObject* parent = 0);
     virtual ~Client();
+    bool isValid();
+
+    QDBusPendingReply<bool> addAccount(const QString &backend_name, const QString &user_name, const QDBusVariant &account_specific_data);
+    QDBusPendingReply<int> sync(const QString &app_name);
+    QDBusPendingReply<int> uploadFile(const QString &app_name, const QStringList &file_list);
+protected:
+    class Private;
+    Private* d;
 };
 }
 
diff --git a/lib/client_p.h b/lib/client_p.h
@@ -0,0 +1,18 @@
+#include "client.h"
+
+class OrgQcloudDaemonInterface;
+
+namespace QCloud {
+
+class Client::Private : public QObject {
+    friend class Client;
+    Q_OBJECT
+public:
+    explicit Private (Client* parent = 0);
+    virtual ~Private();
+
+private:
+    QDBusConnection m_connection;
+    OrgQcloudDaemonInterface *m_daemon;
+};
+}
diff --git a/lib/daemon.xml b/lib/daemon.xml
@@ -1,5 +1,21 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> 
-<node> 
-    <interface name="org.qcloud.daemon"> 
-    </interface> 
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.qcloud.Daemon">
+        <method name="uploadFile">
+            <arg name="app_name" type="s" direction="in" />
+            <arg name="file_list" type="a(s)" direction="in" />
+            <arg name="sequence_number" type="i" direction="out" />
+            <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringList" />
+        </method>
+        <method name="sync">
+            <arg name="app_name" type="s" direction="in" />
+            <arg name="sequence_number" type="i" direction="out" />
+        </method>
+        <method name="addAccount">
+            <arg name="backend_name" type="s" direction="in" />
+            <arg name="user_name" type="s" direction="in" />
+            <arg name="account_specific_data" type="v" direction="in" />
+            <arg name="success" type="b" direction="out" />
+        </method>
+    </interface>
 </node>
diff --git a/lib/server.cpp b/lib/server.cpp
@@ -2,15 +2,20 @@
 #include "daemonadaptor.h"
 
 namespace QCloud {
+
 Server::Server(QObject* parent): QObject(parent)
+    ,m_session(QDBusConnection::sessionBus())
     ,m_adaptor(new DaemonAdaptor(this))
 {
-
+    m_session.registerObject("/daemon", this);
+    m_session.registerService("org.qcloud.daemon");
 }
 
 Server::~Server()
 {
-
+    m_session.unregisterService("org.qcloud.daemon");
+    m_session.unregisterObject("/daemon");
 }
 
+
 }
diff --git a/lib/server.h b/lib/server.h
@@ -1,15 +1,25 @@
 #ifndef QCLOUD_SERVER_H
 #define QCLOUD_SERVER_H
 #include <QObject>
+#include <QStringList>
+#include <QDBusConnection>
+#include <QDBusVariant>
+#include "qcloud_global.h"
 
 class DaemonAdaptor;
 namespace QCloud {
-class Server : public QObject {
+class ServerPrivate;
+class QCLOUD_EXPORT Server : public QObject {
     Q_OBJECT
 public:
     explicit Server(QObject* parent = 0);
     virtual ~Server();
+    virtual int uploadFile(const QString& app_name, const QStringList& file_list) = 0;
+    virtual int addAccount (const QString& backend_name, const QString& user_name, const QDBusVariant& account_specific_data) = 0;
+    virtual int sync (const QString& app_name) = 0;
 private:
+    Q_DISABLE_COPY(Server)
+    QDBusConnection m_session;
     DaemonAdaptor* m_adaptor;
 };
 }
diff --git a/network/general/CMakeLists.txt b/network/general/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${PROJECT_SOURCE_DIR}/lib)
-
 set(network_general_SRCS networkaccessmanager.cpp)
 
 set(network_general_MOC_HDRS
diff --git a/securestore/kwallet/CMakeLists.txt b/securestore/kwallet/CMakeLists.txt
@@ -1,9 +1,6 @@
-include_directories(${PROJECT_SOURCE_DIR}/lib ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
 set(securestore_kwallet_SRCS kwallet.cpp)
 
-set(securestore_kwallet_MOC_HDRS 
+set(securestore_kwallet_MOC_HDRS
     kwallet.h
     )
 
diff --git a/securestore/plain/CMakeLists.txt b/securestore/plain/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${PROJECT_SOURCE_DIR}/lib)
-
 set(securestore_plain_SRCS plainstore.cpp)
 
 set(securestore_plain_MOC_HDRS

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`include_directories(${QT_QTCORE_INCLUDE_DIR}`
`2`		`- ${PROJECT_SOURCE_DIR}/lib`
`3`	`2`	`${QOAuth_INCLUDE_DIR}`
`4`	`3`	`${QT_QTGUI_INCLUDE_DIR}`
`5`	`4`	`${QCA2_INCLUDE_DIR}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[D-BUS Service]`
	`2`	`+Name=org.qcloud.daemon`
	`3`	`+Exec=@CMAKE_INSTALL_PREFIX@/bin/qcloud-daemon`