Merge lp:~kalikiana/u1db-qt/syncWithU1 into lp:u1db-qt

[Cris Dywan]

Make sync with U1 and authentication possible

This branch incorporates:
- Improvemed error handling. HTTP status codes, U1Db JSON errors and JSON validation all end up in sync_output as errors now.
- Rewritten example including both test and live server, editable notes and credentials test UI.
- New target syntax: "uri" is sufficient to define local and remote targets with IP or hostname and optional port. Notably it's no longer required to know the IP.
- Code unification between Database and Synchronizer for getting the replica_id.

Progress: 100%
- Caveat: New data isn't pushed to the remote, this is bug 1273688.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/31
    FAILURE: http://jenkins.qa.ubuntu.com/job/u1db-qt-quantal-amd64-ci/31/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/31/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/32/rebuild

review: Approve (continuous-integration)

[lp:~kalikiana/u1db-qt/syncWithU1]

119. By Cris Dywan on 2014-02-18

Merge lp:u1db-qt

120. By Cris Dywan on 2014-02-18

Fix synchronize property/ signal/ methods

121. By Cris Dywan on 2014-02-18

sync_output should be called syncOutput

122. By Cris Dywan on 2014-02-18

Reset synchronize after success/ error or if nothing happened

123. By Cris Dywan on 2014-02-18

Add message to syncOutput if no targets were specified

124. By Cris Dywan on 2014-02-18

Reset synchronize if URI is invalid

125. By Cris Dywan on 2014-02-18

Add unit tests for Synchronizer target syntax

126. By Cris Dywan on 2014-02-20

Introduce Server based on Request for sync unit tests

127. By Cris Dywan on 2014-02-20

Implement 5 minute timeout in Request

Unmerged revisions

127. By Cris Dywan on 2014-02-20

Implement 5 minute timeout in Request

126. By Cris Dywan on 2014-02-20

Introduce Server based on Request for sync unit tests

125. By Cris Dywan on 2014-02-18

Add unit tests for Synchronizer target syntax

124. By Cris Dywan on 2014-02-18

Reset synchronize if URI is invalid

123. By Cris Dywan on 2014-02-18

Add message to syncOutput if no targets were specified

122. By Cris Dywan on 2014-02-18

Reset synchronize after success/ error or if nothing happened

121. By Cris Dywan on 2014-02-18

sync_output should be called syncOutput

120. By Cris Dywan on 2014-02-18

Fix synchronize property/ signal/ methods

119. By Cris Dywan on 2014-02-18

Merge lp:u1db-qt

118. By Cris Dywan on 2014-01-28

Implement networkRequest signal to handle credentials correctly

=== modified file 'debian/control'
--- debian/control	2014-01-22 13:14:22 +0000
+++ debian/control	2014-02-20 14:57:43 +0000
@@ -65,6 +65,8 @@
 Section: doc
 Architecture: all
 Depends: libu1db-qt5-3 (>= ${source:Version}),
+         qtdeclarative5-ubuntuone1.0,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin,
          ${misc:Depends},
 Description: Qt5 binding and QtQuick2 plugin for U1DB - examples
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).

=== renamed file 'examples/u1db-qt-example-6/u1db-qt-example-6.qdoc' => 'documentation/u1db-qt-example-6.qdoc'
=== renamed directory 'examples/u1db-qt-example-6' => 'examples/notes-cloud'
=== renamed file 'examples/u1db-qt-example-6/u1db-qt-example-6.qml' => 'examples/notes-cloud/notes-cloud.qml'
--- examples/u1db-qt-example-6/u1db-qt-example-6.qml	2013-08-09 10:42:18 +0000
+++ examples/notes-cloud/notes-cloud.qml	2014-02-20 14:57:43 +0000
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * Authors:
- *  Kevin Wright <[e-mail]>
+ *  Christian Dywan <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -20,154 +20,273 @@
 import QtQuick 2.0
 import U1db 1.0 as U1db
 import Ubuntu.Components 0.1
-
-
-Item {
-
-        width: units.gu(45)
-        height: units.gu(80)
-
-        U1db.Database {
-            id: aDatabase
-            path: "aDatabase6"
-        }
-
-       U1db.Document {
-            id: aDocument1
-            database: aDatabase
-            docId: 'helloworld'
-            create: true
-            contents:{"hello": { "world": [ { "message": "Hello World" } ] } }
-
-        }
-
-       U1db.Index{
-           database: aDatabase
-           id: by_helloworld
-           expression: ["hello.world.message"]
-       }
-
-       U1db.Query{
-           id: aQuery
-           index: by_helloworld
-           query: [{"message":"Hel*"}]
-       }
-
-       U1db.Synchronizer{
-           id: aSynchronizer
-           source: aDatabase
-           targets: [{remote:true},
-               {remote:true,
-                   ip:"127.0.0.1",
-                   port: 7777,
-                   name:"example1.u1db",
-                   resolve_to_source:true},
-               {remote:"OK"}]
-           synchronize: false
-       }
-
-    MainView {
-
-        id: u1dbView
-        width: units.gu(45)
-        height: units.gu(80)
-        anchors.top: parent.top;
-
-        Tabs {
-            id: tabs
+import UbuntuOne 1.0
+import Ubuntu.Components.Popups 0.1
+
+MainView {
+    applicationName: "com.ubuntu.developer.foobar.notes-cloud"
+
+    width: units.gu(50)
+    height: units.gu(75)
+
+    /*
+        Notes database for both local and remote data
+    */
+    U1db.Database {
+        id: db
+        path: inMemory.checked ? ":memory:" : filename
+        property string filename: "notes.db"
+    }
+    U1db.Document {
+        id: doc
+        database: db
+        docId: 'text'
+        create: true
+        defaults: { "notes": "Lorem ipsum" }
+    }
+
+    /*
+        Use this to reset switches and indicator to avoid "broken" appearance
+        when error would be too fast to see anything happen at all
+    */
+    Timer {
+        id: smoothReset
+        interval: 900
+
+        onRunningChanged: {
+            testSyncActive.enabled = !liveSyncActive.checked
+            liveSyncActive.enabled = !testSyncActive.checked
+            syncIndicator.running = testSync.synchronize || liveSync.synchronize || running
+        }
+
+        onTriggered: {
+            running = false
+            testSyncActive.checked = testSync.synchronize
+            liveSyncActive.checked = liveSync.synchronize
+        }
+    }
+
+    function fillLabel(server, syncOutput) {
+        var prettyOutput = '%1'.arg(server)
+        for (var i in syncOutput)
+            prettyOutput += '\n%1'.arg(syncOutput[i].message_value)
+        syncLabel.text = prettyOutput
+    }
+
+    /*
+      U1 Sync
+    */
+    U1db.Synchronizer {
+        id: testSync
+        source: db
+        targets: [ {
+            uri: "http://127.0.0.1:7777/" + db.filename,
+            resolve_to_source: true,
+            // Legacy syntax
+            ip: "127.0.0.1",
+            port: 7777,
+            name: db.filename,
+            remote: true,
+        }, ]
+        synchronize: false
+        onSynchronizeChanged: smoothReset.start()
+        onSyncOutputChanged: fillLabel(targets[0].uri, syncOutput)
+    }
+
+    U1db.Server {
+        port: 7777
+        onNetworkRequest: writeContents('HTTP/1.0 404 Not Found\r\nContent-Type: text/html\r\nContent-Length: 8\r\nNot found\r\n')
+    }
+
+
+    U1db.Synchronizer {
+        id: liveSync
+        source: db
+        targets: [ {
+            uri: "https://u1db.one.ubuntu.com/~/notes-cloud-" + db.path,
+            resolve_to_source: true,
+        }, ]
+        synchronize: false
+        onNetworkRequest: {
+            request.handled = true
+            u1credservice.onUrlSigned.connect(onUrlSigned.bind(request, request))
+            u1credservice.onUrlSigningError.connect(onUrlSigningError.bind(request, request))
+            u1credservice.signUrl(request.uri, request.method)
+        }
+        function onUrlSigned(request, signedUrl) {
+            u1credservice.onUrlSigned.disconnect(onUrlSigned.bind(request, request))
+            u1credservice.onUrlSigningError.disconnect(onUrlSigningError.bind(request, request))
+            request.authorization = signedUrl
+            request.send()
+        }
+        function onUrlSigningError(request, errorMessage) {
+            u1credservice.onUrlSigned.disconnect(onUrlSigned.bind(request, request))
+            u1credservice.onUrlSigningError.disconnect(onUrlSigningError.bind(request, request))
+            request.cancel()
+        }
+        onSynchronizeChanged: smoothReset.start()
+        onSyncOutputChanged: fillLabel(targets[0].uri, syncOutput)
+    }
+
+    UbuntuOneCredentialsService {
+        id: u1credservice
+        onCredentialsFound: {
+            statusLabel.text = i18n.tr('Credentials found')
+        }
+        onCredentialsNotFound: {
+            statusLabel.text = i18n.tr('No account credentials found')
+        }
+        onCredentialsDeleted: {
+            statusLabel.text = i18n.tr('Clear credentials successfully')
+        }
+        onUrlSigned: {
+            statusLabel.text = i18n.tr('Signed URL: %1').arg(signedUrl)
+        }
+        onUrlSigningError: {
+            statusLabel.text = i18n.tr('Error signing: %1').arg(errorMessage)
+        }
+
+        onLoginOrRegisterSuccess: {
+            statusLabel.text = i18n.tr('Login successful')
+        }
+        onLoginOrRegisterError: {
+            statusLabel.text = i18n.tr('Login failed')
+        }
+        onTwoFactorAuthRequired: {
+            statusLabel.text = i18n.tr('Two Factor Auth required')
+        }
+    }
+
+    /*
+        UI: Login credentials
+    */
+
+        Component {
+            id: loginPopCom
+            Popover {
+                id: loginPop
+                Column {
+                    anchors.centerIn: parent
+                    spacing: units.gu(1)
+                    Label {
+                        text: i18n.tr('Please fill in your credentails')
+                    }
+                    TextField {
+                        id: email
+                        placeholderText: i18n.tr('email')
+                    }
+                    TextField {
+                        id: pass
+                        placeholderText: i18n.tr('password')
+                    }
+                    TextField {
+                        id: two
+                        inputMethodHints: Qt.ImhHiddenText
+                        placeholderText: i18n.tr('two-factor code')
+                    }
+                    Button {
+                        text: i18n.tr('Confirm')
+                        onClicked: u1credservice.login(email.text, pass.text, two.text)
+                    }
+                }
+            }
+        }
+
+    /*
+        UI: Creds/ sync results, notes input
+    */
+    Page {
+
+        title: i18n.tr("Notes in the Cloud")
+
+        Item {
+            anchors.margins: units.gu(1)
             anchors.fill: parent
 
-            Tab {
-                objectName: "Tab1"
-
-                title: i18n.tr("Hello U1Db!")
-
-                page: Page {
-                    id: helloPage
-
-                    Rectangle {
-                         width: units.gu(45)
-                         height: units.gu(40)
-                         anchors.top: parent.top;
-                         border.width: 1
-
-                         Text {
-                             id: sourceLabel
-                             anchors.top: parent.top;
-                             font.bold: true
-                             text: "aDatabase6 Contents"
-                         }
-
-                        ListView {
-                            id: sourceListView
-                            width: units.gu(45)
-                            height: units.gu(35)
-                            anchors.top: sourceLabel.bottom;
-                            model: aQuery
-
-                            delegate: Text {
-                                wrapMode: Text.WordWrap
-                                x: 6; y: 77
-                                text: {
-                                    text: "(" + index + ") '" + contents.message + "'"
-                                }
-                            }
-                        }
-
-
-                    }
-
-                   Rectangle {
-                       id: lowerRectangle
-                       width: units.gu(45)
-                       height: units.gu(35)
-                       anchors.bottom: parent.bottom;
-                       border.width: 1
-
-                       Text {
-                           id: errorsLabel
-                           anchors.top: parent.top;
-                           font.bold: true
-                           text: "Log:"
-                       }
-
-                       ListView {
-
-                           parent: lowerRectangle
-                           width: units.gu(45)
-                           height: units.gu(30)
-                           anchors.top: errorsLabel.bottom;
-                           model: aSynchronizer
-                           delegate:Text {
-                                width: units.gu(40)
-                                anchors.left: parent.left
-                                anchors.right: parent.right
-                                wrapMode: Text.WordWrap
-                                text: {
-                                    text: sync_output
-                                }
-                            }
-                        }
-
-                       Button{
-                           parent: lowerRectangle
-                           anchors.bottom: parent.bottom;
-                           text: "Sync"
-                           onClicked: aSynchronizer.synchronize = true
-                           anchors.left: parent.left
-                           anchors.right: parent.right
-
-                       }
-
-                   }
-                }
-
-            }
-
+            Column {
+                id: col
+                spacing: units.gu(1)
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                TextArea {
+                    id: statusLabel
+                    text: i18n.tr('N/A')
+                    readOnly: true
+                    autoSize: true
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                }
+
+                Row {
+                    spacing: units.gu(1)
+                    Button {
+                        text: i18n.tr('Verify creds')
+                        onClicked: u1credservice.checkCredentials()
+                    }
+                    Button {
+                        text: i18n.tr('Clear creds')
+                        onClicked: {
+                            statusLabel.text = i18n.tr('N/A')
+                            u1credservice.invalidateCredentials()
+                        }
+                    }
+                    Button {
+                        id: loginButton
+                        text: i18n.tr('Login')
+                        onClicked: PopupUtils.open(loginPopCom, loginButton)
+                    }
+                    ActivityIndicator {
+                        id: syncIndicator
+                    }
+                }
+
+                TextArea {
+                    id: syncLabel
+                    text: i18n.tr('No sync target enabled')
+                    readOnly: true
+                    autoSize: true
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                }
+
+                Row {
+                    spacing: units.gu(1)
+                    Label {
+                        text: i18n.tr('Test')
+                    }
+
+                    Switch {
+                        id: testSyncActive
+                        onClicked: testSync.synchronize = true
+                    }
+                    Label {
+                        text: i18n.tr('U1')
+                    }
+                    Switch {
+                        id: liveSyncActive
+                        onClicked: liveSync.synchronize = true
+                    }
+                    Label {
+                        text: i18n.tr('Memory')
+                    }
+                    Switch {
+                        id: inMemory
+                    }
+                }
+
+            }
+
+            TextArea {
+                text: doc.contents.notes
+                onFocusChanged: doc.contents = { "notes": text }
+                anchors.margins: units.gu(1)
+                anchors.top: col.bottom
+                anchors.bottom: parent.bottom
+                anchors.left: parent.left
+                anchors.right: parent.right
+            }
         }
-
     }
-
 }
-
-

=== modified file 'modules/U1db/plugin.cpp'
--- modules/U1db/plugin.cpp	2013-05-02 19:52:10 +0000
+++ modules/U1db/plugin.cpp	2014-02-20 14:57:43 +0000
@@ -22,6 +22,7 @@
 #include "index.h"
 #include "query.h"
 #include "synchronizer.h"
+#include "server.h"
 #include "plugin.h"
 #include <qqml.h>
 
@@ -34,5 +35,6 @@
     qmlRegisterType<Index>(uri, 1, 0, "Index");
     qmlRegisterType<Query>(uri, 1, 0, "Query");
     qmlRegisterType<Synchronizer>(uri, 1, 0, "Synchronizer");
+    qmlRegisterType<Server>(uri, 1, 0, "Server");
 }
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-08-08 10:11:39 +0000
+++ src/CMakeLists.txt	2014-02-20 14:57:43 +0000
@@ -7,6 +7,8 @@
     index.cpp
     query.cpp
     synchronizer.cpp
+    request.cpp
+    server.cpp
     )
 
 # Generated files
@@ -16,6 +18,8 @@
     moc_index.cpp
     moc_query.cpp
     moc_synchronizer.cpp
+    moc_request.cpp
+    moc_server.cpp
     )
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${U1DB_QT_GENERATED}")
 
@@ -54,7 +58,7 @@
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
 
-install(FILES global.h database.h document.h index.h query.h synchronizer.h
+install(FILES global.h database.h document.h index.h query.h synchronizer.h request.h
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 

=== modified file 'src/database.cpp'
--- src/database.cpp	2014-02-17 16:52:42 +0000
+++ src/database.cpp	2014-02-20 14:57:43 +0000
@@ -156,6 +156,16 @@
                 return setError(QString("Failed to read internal schema: FileError %1").arg(file.error()));
         }
     }
+
+    // index_storage is read by the python sqlite implementation
+    // it wasn't set in in earlier u1db-qt versions so always check it
+    QSqlQuery query(m_db.exec(
+        "SELECT value FROM u1db_config WHERE name = 'index_storage'"));
+    if (!query.next())
+        query.prepare("INSERT INTO u1db_config VALUES ('index_storage', 'expand referenced')");
+        if (!query.exec())
+            return setError(QString("Failed to set index storage: %1\n%2").arg(m_db.lastError().text()).arg(query.lastQuery()));
+
     return true;
 }
 

=== modified file 'src/database.h'
--- src/database.h	2014-01-24 11:13:35 +0000
+++ src/database.h	2014-02-20 14:57:43 +0000
@@ -63,6 +63,7 @@
     void updateSyncLog(bool insert, QString uid, QString generation, QString transaction_id);
     QList<QString> listTransactionsSince(int generation);
     QMap<QString,QVariant> getSyncLogInfo(QMap<QString,QVariant> lastSyncInformation, QString uid, QString prefix);
+    QString getReplicaUid();
 
 Q_SIGNALS:
     void pathChanged(const QString& path);
@@ -81,7 +82,6 @@
     QSqlDatabase m_db;
     QString m_error;
 
-    QString getReplicaUid();
     bool isInitialized();
     bool initializeIfNeeded(const QString& path=":memory:");
     bool setError(const QString& error);

=== added file 'src/request.cpp'
--- src/request.cpp	1970-01-01 00:00:00 +0000
+++ src/request.cpp	2014-02-20 14:57:43 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDebug>
+
+#include "request.h"
+#include "private.h"
+
+QT_BEGIN_NAMESPACE_U1DB
+
+Request::Request(const QString& uri, const QString& method, QObject *parent) :
+    QObject(parent), m_uri(uri), m_method(method), m_handled(false)
+{
+    m_request = QNetworkRequest (QUrl (uri));
+
+    /* QNetworkManager doesn't time out in all cases */
+    m_timer.start(5 * 60000); // 5 * 60 seconds
+    connect(&m_timer, &QTimer::timeout, this, &Request::timeout);
+}
+
+void Request::timeout()
+{
+    disconnect(&m_timer, &QTimer::timeout, this, &Request::timeout);
+    cancel("Timeout after 5 minutes");
+}
+
+QString Request::getUri()
+{
+    return m_uri;
+}
+
+void Request::setUri(const QString& uri)
+{
+    m_uri = uri;
+    m_request.setUrl(uri);
+}
+
+QString Request::getMethod()
+{
+    return m_method;
+}
+
+void Request::setMethod(const QString& method)
+{
+    m_method = method;
+}
+
+bool Request::getHandled()
+{
+    return m_handled;
+}
+
+void Request::setHandled(bool handled)
+{
+    m_handled = handled;
+}
+
+QString Request::getAuthorization()
+{
+    return m_authorization;
+}
+
+void Request::setAuthorization(const QString& authorization)
+{
+    m_authorization = authorization;
+}
+
+QT_END_NAMESPACE_U1DB
+
+#include "moc_request.cpp"
+

=== added file 'src/request.h'
--- src/request.h	1970-01-01 00:00:00 +0000
+++ src/request.h	2014-02-20 14:57:43 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef U1DB_REQUEST_H
+#define U1DB_REQUEST_H
+
+#include <QtCore/QObject>
+#include <QVariant>
+#include <QMetaType>
+#include <QtNetwork>
+#include <QNetworkAccessManager>
+
+
+#include "global.h"
+
+QT_BEGIN_NAMESPACE_U1DB
+
+class Q_DECL_EXPORT Request : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString uri READ getUri WRITE setUri)
+    Q_PROPERTY(QString method READ getMethod WRITE setMethod)
+    Q_PROPERTY(bool handled READ getHandled WRITE setHandled)
+    Q_PROPERTY(QString authorization READ getAuthorization WRITE setAuthorization)
+
+public:
+    Request(const QString& uri, const QString& method, QObject* parent = 0);
+
+    QString getUri();
+    void setUri(const QString& uri);
+    QString getMethod();
+    void setMethod(const QString& method);
+    bool getHandled();
+    void setHandled(bool handled);
+    QString getAuthorization();
+    void setAuthorization(const QString& authorization);
+
+    // FIXME private
+    QNetworkRequest m_request;
+
+Q_SIGNALS:
+
+    void send();
+    void cancel(const QString& reason=QString());
+
+private:
+    //Q_DISABLE_COPY(Request)
+    QString m_uri;
+    QString m_method;
+    bool m_handled;
+    QString m_authorization;
+    QTimer m_timer;
+
+    void timeout();
+};
+
+QT_END_NAMESPACE_U1DB
+
+
+#endif // U1DB_REQUEST_H
+
+

=== added file 'src/server.cpp'
--- src/server.cpp	1970-01-01 00:00:00 +0000
+++ src/server.cpp	2014-02-20 14:57:43 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDebug>
+
+#include "server.h"
+#include "private.h"
+
+QT_BEGIN_NAMESPACE_U1DB
+
+Server::Server(QTcpServer *parent) :
+    QTcpServer(parent), m_port(-1)
+{
+    connect(this, &QTcpServer::acceptError, this, &Server::acceptError);
+}
+
+void Server::acceptError(QAbstractSocket::SocketError socketError)
+{
+    qDebug() << socketError << m_socket->errorString();
+}
+
+int Server::getPort()
+{
+    return m_port;
+}
+
+void Server::setPort(int port)
+{
+    if (port == m_port)
+        return;
+
+    if (isListening())
+        close ();
+
+    // port 0 means random, that's why we take the value after the call
+    listen(QHostAddress::Any, port);
+    m_port = serverPort();
+}
+
+void Server::incomingConnection(qintptr socket)
+{
+    m_socket = new QTcpSocket(this);
+    connect(m_socket, &QIODevice::readyRead, this, &Server::readClient);
+    connect(m_socket, &QAbstractSocket::disconnected, this, &Server::discardClient);
+}
+
+void Server::readClient()
+{
+    if (!m_socket->canReadLine())
+        return;
+    QString line(m_socket->readLine());
+    // GET /foo/bar HTTP/1.1
+    QStringList tokens(line.split(" "));
+    QString method(tokens.at(0));
+    QString uri(tokens.at(1));
+    Request* request = new Request(uri, method);
+    Q_EMIT networkRequest(request);
+}
+
+void Server::discardClient()
+{
+    m_socket->deleteLater();
+}
+
+void Server::writeContents (const QString& output)
+{
+    QTextStream os(m_socket);
+    os.setAutoDetectUnicode(true);
+    os << output;
+    m_socket->close();
+    if (m_socket->state() == QTcpSocket::UnconnectedState)
+        delete m_socket;
+}
+
+QT_END_NAMESPACE_U1DB
+
+#include "moc_server.cpp"
+

=== added file 'src/server.h'
--- src/server.h	1970-01-01 00:00:00 +0000
+++ src/server.h	2014-02-20 14:57:43 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef U1DB_SERVER_H
+#define U1DB_SERVER_H
+
+#include <QtCore/QObject>
+#include <QVariant>
+#include <QMetaType>
+#include <QtNetwork>
+#include <QNetworkAccessManager>
+#include <QTcpServer>
+
+
+#include "global.h"
+#include "request.h"
+
+QT_BEGIN_NAMESPACE_U1DB
+
+class Q_DECL_EXPORT Server : public QTcpServer {
+    Q_OBJECT
+    Q_PROPERTY(int port READ getPort WRITE setPort)
+
+public:
+    Server(QTcpServer* parent = 0);
+
+    int getPort();
+    void setPort(int port);
+
+    Q_INVOKABLE void writeContents(const QString& output);
+
+Q_SIGNALS:
+    void networkRequest(Request* request);
+
+private:
+    //Q_DISABLE_COPY(Server)
+    int m_port;
+    QTcpSocket* m_socket;
+
+    void acceptError(QAbstractSocket::SocketError socketError);
+    void incomingConnection(qintptr socket);
+    void readClient();
+    void discardClient();
+};
+
+QT_END_NAMESPACE_U1DB
+
+
+#endif // U1DB_SERVER_H
+
+

=== modified file 'src/synchronizer.cpp'
--- src/synchronizer.cpp	2013-11-25 13:22:07 +0000
+++ src/synchronizer.cpp	2014-02-20 14:57:43 +0000
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * Authors:
  *  Kevin Wright <[e-mail]>
+ *  Christian Dywan <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -111,7 +112,8 @@
 Synchronizer::Synchronizer(QObject *parent) :
     QAbstractListModel(parent), m_synchronize(false), m_source(NULL)
 {
-    QObject::connect(this, &Synchronizer::syncChanged, this, &Synchronizer::onSyncChanged);
+    QObject::connect(this, &Synchronizer::synchronizeChanged, this, &Synchronizer::onSynchronizeChanged);
+    QObject::connect(this, &Synchronizer::syncOutputChanged, this, &Synchronizer::onSyncOutputChanged);
 }
 
 /*!
@@ -229,16 +231,73 @@
  * \property Synchronizer::synchronize
  */
 
-void Synchronizer::setSync(bool synchronize)
+void Synchronizer::setSynchronize(bool synchronize)
 {
 
     if (m_synchronize == synchronize)
         return;
 
     m_synchronize = synchronize;
-    Q_EMIT syncChanged(synchronize);
-}
-
+    Q_EMIT synchronizeChanged(synchronize);
+}
+
+void Synchronizer::sendNetworkRequest(QNetworkAccessManager* manager, const QString& uri, QString method)
+{
+    Request* _request = new Request(uri, method);
+    _request->m_request.setOriginatingObject(manager);
+
+    connect(_request, &Request::send, this, &Synchronizer::networkRequestSent);
+    connect(_request, &Request::cancel, this, &Synchronizer::networkRequestCancelled);
+    connect(this, &Synchronizer::networkRequest, this, &Synchronizer::networkRequestEmitted);
+    Q_EMIT networkRequest(_request);
+}
+
+void Synchronizer::networkRequestEmitted(Request* _request)
+{
+    if (!_request->getHandled())
+        Q_EMIT _request->send();
+}
+
+void Synchronizer::networkRequestSent()
+{
+    Request* _request = qobject_cast<Request *>(QObject::sender());
+    QNetworkRequest request = _request->m_request;
+
+    if (!_request->getAuthorization().isEmpty())
+        request.setRawHeader(QStringLiteral("Authorization").toUtf8(),
+            _request->getAuthorization().toUtf8());
+
+    /* Validate here, otherwise QUrl is empty, finished won't be called */
+    QNetworkAccessManager* manager = qobject_cast<QNetworkAccessManager *>(request.originatingObject());
+    if (_request->getMethod() == "GET" && _request->m_request.url().isValid())
+        manager->get(request);
+    else if (_request->getMethod() == "POST" && _request->m_request.url().isValid()) {
+        request.setRawHeader("Content-Type", "application/x-u1db-sync-stream");
+        QByteArray postString(manager->property("postString").toByteArray());
+        QByteArray postDataSize = QByteArray::number(postString.size());
+        request.setRawHeader("Content-Length", postDataSize);
+        manager->post(request, postString);
+    } else {
+        QVariantMap output_map;
+        output_map.insert("message_type", "error");
+        output_map.insert("message_value", "Invalid Request.method: " + _request->getMethod());
+        m_sync_output.append(output_map);
+        Q_EMIT syncOutputChanged(m_sync_output);
+        setSynchronize(false);
+    }
+}
+
+void Synchronizer::networkRequestCancelled(const QString& reason)
+{
+    disconnect(this, &Synchronizer::networkRequest, this, &Synchronizer::networkRequestEmitted);
+
+    QVariantMap output_map;
+    output_map.insert("message_type", "error");
+    output_map.insert("message_value", "Request was cancelled: " + reason);
+    m_sync_output.append(output_map);
+    Q_EMIT syncOutputChanged(m_sync_output);
+    setSynchronize(false);
+}
 
 /*!
  * \property Synchronizer::resolve_to_source
@@ -255,9 +314,9 @@
 
 
 /*!
- * \fn void Synchronizer::setSyncOutput(QList<QVariant> sync_output)
+ * \fn void Synchronizer::setSyncOutput(QList<QVariant> syncOutput)
  *
- * Sets the current value for the active session's \a sync_output.
+ * Sets the current value for the active session's \a syncOutput.
  *
  */
 
@@ -296,7 +355,7 @@
 }
 
 /*!
- * \brief Synchronizer::getSync
+ * \brief Synchronizer::getSynchronize
  *
  *
  * Returns the current value of synchronize. If true then the synchronize
@@ -308,7 +367,7 @@
  *
  */
 
-bool Synchronizer::getSync()
+bool Synchronizer::getSynchronize()
 {
      return m_synchronize;
 }
@@ -329,7 +388,7 @@
 }
 
 /*!
- * \property Synchronizer::sync_output
+ * \property Synchronizer::syncOutput
  * \brief Synchronizer::getSyncOutput
  *
  * Returns the output from a sync session. The list should contain numerous
@@ -358,6 +417,10 @@
 
 */
 
+void Synchronizer::onSyncOutputChanged(QList<QVariant> syncOutput) {
+    beginResetModel();
+    endResetModel();
+}
 
 /*!
  * \brief Synchronizer::onSyncChanged
@@ -366,7 +429,7 @@
  *
  */
 
-void Synchronizer::onSyncChanged(bool synchronize){
+void Synchronizer::onSynchronizeChanged(bool synchronize){
 
     Database* source = getSource();
 
@@ -381,6 +444,7 @@
     QMap<QString,QString>validator;
 
     validator.insert("remote","bool");
+    validator.insert("uri","QString");
     validator.insert("location","QString");
     validator.insert("resolve_to_source","bool");
 
@@ -393,10 +457,11 @@
 
     QList<QString>mandatory;
 
-    mandatory.append("remote");
+    mandatory.append("uri");
     mandatory.append("resolve_to_source");
 
     if(synchronize == true){
+        m_sync_output.clear();
 
         /*!
           A list of valid sync target databases is generated by calling the getValidTargets(validator, mandatory) method, and adding the return value to a QList (sync_targets).
@@ -410,34 +475,21 @@
          */
 
         synchronizeTargets(source, sync_targets);
-
-        /*!
-         * After the synchronization is complete the model is reset so that
-         *log and error messages are available at the application level.
-         *
-         */
-
-        beginResetModel();
-        endResetModel();
-
-        /*!
-          The convenience signals syncOutputChanged and syncCompleted are
-emitted after the model has been reset.
-          */
-
-        Q_EMIT syncOutputChanged(m_sync_output);
-        Q_EMIT syncCompleted();
-
-        /*!
-         * The sync boolean value is reset to its default value (false)
-         *once all sync activity is complete.
-         */
-
-        setSync(false);
-
-    }
-    else{
-
+        
+        if (sync_targets.isEmpty()) {
+            QVariantMap output_map;
+            output_map.insert("concerning_property", "targets");
+            output_map.insert("message_type", "no-errors");
+            output_map.insert("message_value", "No targets specified");
+            m_sync_output.append(output_map);
+            Q_EMIT syncOutputChanged(m_sync_output);
+        }
+
+        /* No sync started */
+        if (m_sync_output.isEmpty() || sync_targets.isEmpty()) {
+            Q_EMIT syncCompleted();
+            setSynchronize(false);
+        }
     }
 }
 
@@ -486,6 +538,7 @@
                 output_map.insert("message_type","error");
                 output_map.insert("message_value",message_value);
                 m_sync_output.append(output_map);
+                Q_EMIT syncOutputChanged(m_sync_output);
                 
                 target.insert("sync",false);
 
@@ -542,7 +595,7 @@
             target.insert("sync",true);
             sync_targets.append(target);
 
-            QString message_value = "Mandatory properties were included and their values are valid.";
+            QString message_value = "Mandatory properties included and valid.";
 
             QVariantMap output_map;
             output_map.insert("concerning_property","targets");
@@ -550,6 +603,7 @@
             output_map.insert("message_type","no-errors");
             output_map.insert("message_value",message_value);
             m_sync_output.append(output_map);
+            Q_EMIT syncOutputChanged(m_sync_output);
 
         }
 
@@ -588,67 +642,53 @@
             if(target.typeName()== QStringLiteral("QVariantMap")){
                 QMap<QString,QVariant> target_map = target.toMap();
 
-                if(target_map.contains("remote")&&target_map["remote"]==false){
-                    if(target_map.contains("sync")&&target_map["sync"]==true){
+                QVariantMap output_map;
+                output_map.insert("concerning_property", "targets");
+                output_map.insert("concerning_index", target_index);
 
+                bool sync = target_map.contains("sync") && target_map["sync"].toBool();
+                QUrl url(target_map["uri"].toString());
+                if (url.isLocalFile()) {
+                    if (sync) {
                         QString message_value = "Valid local target.";
-
-                        QVariantMap output_map;
-                        output_map.insert("concerning_property","targets");
-                        output_map.insert("concerning_index",target_index);
                         output_map.insert("message_type","no-errors");
                         output_map.insert("message_value",message_value);
                         m_sync_output.append(output_map);
+                        Q_EMIT syncOutputChanged(m_sync_output);
 
                         syncLocalToLocal(source, target_map);
                     }
                 }
-                else if(target_map.contains("remote")&&target_map["remote"]==true){
-                    if(target_map.contains("sync")&&target_map["sync"]==true){
-
-                        //ip
-                        //port
-                        //name
+                else if (url.scheme() == "http" || url.scheme() == "https") {
+                    if (sync) {
                         //GET /thedb/sync-from/my_replica_uid
 
                         QString source_uid = getUidFromLocalDb(source->getPath());
-                        QString get_string = target_map["name"].toString()+"/sync-from/"+source_uid;
-                        QString url_string = "http://"+target_map["ip"].toString();
-                        QString full_get_request = url_string+"/"+get_string;
-                        int port_number = target_map["port"].toInt();
+                        QString full_get_request = target_map["uri"].toString() + "/sync-from/" + source_uid;
 
                         QNetworkAccessManager *manager = new QNetworkAccessManager(source);
 
-                        QUrl url(full_get_request);
-                        url.setPort(port_number);
-
-                        QNetworkRequest request(url);
-
                         connect(manager, &QNetworkAccessManager::finished, this, &Synchronizer::remoteGetSyncInfoFinished);
 
                         QString message_value = "Valid remote target.";
 
-                        QVariantMap output_map;
-                        output_map.insert("concerning_property","targets");
-                        output_map.insert("concerning_index",target_index);
                         output_map.insert("message_type","no-errors");
                         output_map.insert("message_value",message_value);
                         m_sync_output.append(output_map);
-
-                        manager->get(QNetworkRequest(request));
-
+                        Q_EMIT syncOutputChanged(m_sync_output);
+
+                        sendNetworkRequest(manager, full_get_request, "GET");
                     }
                 }
                 else{
 
-                    QString message_value = "Unknown error. Please check properties";
+                    QString message_value = "Invalid URI, must be file, http or https";
 
-                    QVariantMap output_map;
-                    output_map.insert("concerning_property","targets");
-                    output_map.insert("concerning_index",target_index);
                     output_map.insert("message_type","error");
                     output_map.insert("message_value",message_value);
                     m_sync_output.append(output_map);
+                    Q_EMIT syncOutputChanged(m_sync_output);
+                    setSynchronize(false);
 
                 }
 
@@ -671,7 +711,7 @@
 void Synchronizer::syncLocalToLocal(Database *sourceDb, QMap<QString,QVariant> target)
 {
 
-    QString target_db_name = target["location"].toString();
+    QString target_db_name = QUrl(target["uri"].toString()).toLocalFile();
 
     Database *targetDb;
     Index *targetIndex;
@@ -705,6 +745,8 @@
         output_map.insert("message_type","error");
         output_map.insert("message_value",message_value);
         m_sync_output.append(output_map);
+        Q_EMIT syncOutputChanged(m_sync_output);
+        setSynchronize(false);
 
         return;
     }
@@ -890,6 +932,8 @@
     /* If the source has seen no changes unrelated to the synchronisation during this whole process, it now sends the target what its latest change is, so that the next synchronisation does not have to consider changes that were the result of this one.*/
 
 
+    Q_EMIT syncOutputChanged(m_sync_output);
+    setSynchronize(false);
 }
 
 /*!
@@ -966,64 +1010,28 @@
 
 QString Synchronizer::getUidFromLocalDb(QString dbFileName)
 {
-
     QString dbUid;
-
-    QSqlDatabase db;
-
-    db = QSqlDatabase::addDatabase("QSQLITE",QUuid::createUuid().toString());
-
-    QFile db_file(dbFileName);
-
-    if(!db_file.exists())
-    {
-
-        QString message_value = "Database does not exist.";
-
+    Database localDb;
+
+    localDb.setPath(dbFileName);
+    QString lastError(localDb.lastError());
+    if (lastError.isEmpty()) {
+        dbUid = localDb.getReplicaUid();
+        dbUid = dbUid.replace("{","");
+        dbUid = dbUid.replace("}","");
+        lastError = localDb.lastError();
+    }
+
+    if (!lastError.isEmpty()) {
+        QString message_value = localDb.lastError();
         QVariantMap output_map;
+
         output_map.insert("concerning_property","source|targets");
         output_map.insert("concerning_database",dbFileName);
         output_map.insert("message_type","error");
         output_map.insert("message_value",message_value);
         m_sync_output.append(output_map);
-
-        return dbUid;
-    }
-    else
-    {
-        db.setDatabaseName(dbFileName);
-        if (!db.open()){
-
-            QString message_value = db.lastError().text();
-
-            QVariantMap output_map;
-            output_map.insert("concerning_property","source|targets");
-            output_map.insert("concerning_database",dbFileName);
-            output_map.insert("message_type","error");
-            output_map.insert("message_value",message_value);
-            m_sync_output.append(output_map);
-
-        }
-        else{
-            QSqlQuery query (db.exec("SELECT value FROM u1db_config WHERE name = 'replica_uid'"));
-
-            if(!query.lastError().isValid() && query.next()){
-                dbUid = query.value(0).toString();
-                db.close();
-
-                dbUid = dbUid.replace("{","");
-
-                dbUid = dbUid.replace("}","");
-
-                return dbUid;
-            }
-            else{
-                qDebug() << query.lastError().text();
-                db.close();
-                return dbUid;
-            }
-        }
-
+        Q_EMIT syncOutputChanged(m_sync_output);
     }
 
     return dbUid;
@@ -1047,6 +1055,21 @@
 
 void Synchronizer::remoteGetSyncInfoFinished(QNetworkReply* reply)
 {
+    QVariant statusCodeVariant = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+    int statusCode(statusCodeVariant.isValid() ? statusCodeVariant.toInt() : -1);
+
+    if(!(statusCode == 200 || statusCode == 401)) {
+        QVariant reasonVariant = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute);
+        QString reason(reasonVariant.isValid() ? reasonVariant.toString() : "N/A");
+        QVariantMap output_map;
+        output_map.insert("concerning_property", "targets");
+        output_map.insert("message_type", "error");
+        output_map.insert("message_value", QString("Pre-sync bad HTTP code: %1 - %2").arg(statusCode).arg(reason));
+        m_sync_output.append(output_map);
+        Q_EMIT syncOutputChanged(m_sync_output);
+        setSynchronize(false);
+        return;
+    }
 
     QNetworkAccessManager *manager = reply->manager();
 
@@ -1123,15 +1146,8 @@
 
     postString.append("\r\n]");
 
-    QByteArray postDataSize = QByteArray::number(postString.size());
-
-    QNetworkRequest request(postUrl);
-    request.setRawHeader("User-Agent", "U1Db-Qt v1.0");
-    request.setRawHeader("X-Custom-User-Agent", "U1Db-Qt v1.0");
-    request.setRawHeader("Content-Type", "application/x-u1db-sync-stream");
-    request.setRawHeader("Content-Length", postDataSize);
-
-    manager->post(QNetworkRequest(request),postString);
+    manager->setProperty("postString", postString);
+    sendNetworkRequest(manager, postUrl.toString(), "POST");
 
 }
 
@@ -1150,6 +1166,21 @@
 
 void Synchronizer::remotePostSyncInfoFinished(QNetworkReply* reply)
 {
+    QVariant statusCodeVariant = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+    int statusCode(statusCodeVariant.isValid() ? statusCodeVariant.toInt() : -1);
+
+    if(!(statusCode == 200 || statusCode == 409 || statusCode == 401)) {
+        QVariant reasonVariant = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute);
+        QString reason(reasonVariant.isValid() ? reasonVariant.toString() : "N/A");
+        QVariantMap output_map;
+        output_map.insert("concerning_property", "targets");
+        output_map.insert("message_type", "error");
+        output_map.insert("message_value", QString("Post-sync bad HTTP code: %1 - %2").arg(statusCode).arg(reason));
+        m_sync_output.append(output_map);
+        Q_EMIT syncOutputChanged(m_sync_output);
+        setSynchronize(false);
+        return;
+    }
 
     QNetworkAccessManager *manager = reply->manager();
 
@@ -1180,9 +1211,32 @@
 
     replyData = replyData.replace("\r\n","");
 
-    QJsonDocument replyJson = QJsonDocument::fromJson(replyData.toUtf8());
-
-    QVariant replyVariant = replyJson.toVariant();
+    QJsonParseError parseError;
+    QJsonDocument replyJson = QJsonDocument::fromJson(replyData.toUtf8(), &parseError);
+    QString syncError;
+    QVariant replyVariant;
+
+    if (parseError.error == QJsonParseError::NoError) {
+        // Valid JSON: errors may be returned as { "error": "Foo bar" }
+        replyVariant = replyJson.toVariant();
+        QVariantMap replyMap(replyVariant.toMap());
+        if (replyMap.contains("error"))
+            syncError = QString("Server - %1: %2").arg(replyMap["error"].toString()).arg(replyMap["message"].toString());
+    } else {
+        // The response is likely an HTML page but can also be malformed JSON
+        syncError = QString("JSON - %1").arg(parseError.errorString());
+    }
+
+    if (!syncError.isEmpty()) {
+        QVariantMap output_map;
+        output_map.insert("concerning_property", "targets");
+        output_map.insert("message_type", "error");
+        output_map.insert("message_value", "Error: " + syncError);
+        m_sync_output.append(output_map);
+        Q_EMIT syncOutputChanged(m_sync_output);
+        setSynchronize(false);
+        return;
+    }
 
     QVariantList replyList = replyVariant.toList();
 
@@ -1190,6 +1244,8 @@
 
     int index = -1;
 
+    QString changelog;
+
     while(i.hasNext()){
 
         index++;
@@ -1240,6 +1296,7 @@
                 {
                     source->putDoc(content,id);
                     source->updateDocRevisionNumber(id,rev);
+                    changelog += QString(" %1@%2").arg(id).arg(rev);
                 }
 
             }
@@ -1248,6 +1305,16 @@
 
     }
 
+    if (changelog.isEmpty())
+        changelog = "No changes";
+
+    QVariantMap output_map;
+    output_map.insert("concerning_property", "source|targets");
+    output_map.insert("message_type", "no-errors");
+    output_map.insert("message_value", "Sync done:" + changelog);
+    m_sync_output.append(output_map);
+    Q_EMIT syncOutputChanged(m_sync_output);
+    setSynchronize(false);
 }
 
 QT_END_NAMESPACE_U1DB

=== modified file 'src/synchronizer.h'
--- src/synchronizer.h	2013-11-22 15:21:37 +0000
+++ src/synchronizer.h	2014-02-20 14:57:43 +0000
@@ -31,6 +31,7 @@
 #include "database.h"
 #include "index.h"
 #include "query.h"
+#include "request.h"
 
 QT_BEGIN_NAMESPACE_U1DB
 
@@ -41,10 +42,10 @@
 #else
     Q_PROPERTY(QT_PREPEND_NAMESPACE_U1DB(Database*) source READ getSource WRITE setSource NOTIFY sourceChanged)  
 #endif
-    Q_PROPERTY(bool synchronize READ getSync WRITE setSync NOTIFY syncChanged)
+    Q_PROPERTY(bool synchronize READ getSynchronize WRITE setSynchronize NOTIFY synchronizeChanged)
     Q_PROPERTY(bool resolve_to_source READ getResolveToSource WRITE setResolveToSource NOTIFY resolveToSourceChanged)
     Q_PROPERTY(QVariant targets READ getTargets WRITE setTargets NOTIFY targetsChanged)
-    Q_PROPERTY(QList<QVariant> sync_output READ getSyncOutput NOTIFY syncOutputChanged)
+    Q_PROPERTY(QList<QVariant> syncOutput READ getSyncOutput NOTIFY syncOutputChanged)
 
 public:
     Synchronizer(QObject* parent = 0);
@@ -60,13 +61,13 @@
 
     Database* getSource();
     QVariant getTargets();
-    bool getSync();
+    bool getSynchronize();
     bool getResolveToSource();
     QList<QVariant> getSyncOutput();
 
     void setSource(Database* source);
     void setTargets(QVariant targets);
-    void setSync(bool synchronize);
+    void setSynchronize(bool synchronize);
     void setResolveToSource(bool resolve_to_source);
     void setSyncOutput(QList<QVariant> sync_output);
 
@@ -97,11 +98,11 @@
     void targetsChanged(QVariant targets);
 
     /*!
-     * \brief syncChanged
+     * \brief synchronizeChanged
      * \param synchronize
      */
 
-    void syncChanged(bool synchronize);
+    void synchronizeChanged(bool synchronize);
 
     /*!
      * \brief resolveToSourceChanged
@@ -112,7 +113,7 @@
 
     /*!
      * \brief syncOutputChanged
-     * \param sync_output
+     * \param syncOutput
      */
 
     void syncOutputChanged(QList<QVariant> sync_output);
@@ -123,6 +124,12 @@
 
     void syncCompleted();
 
+    /*!
+     * \brief networkRequest
+     * \param request
+     */
+    void networkRequest(Request* request);
+
 private:
     //Q_DISABLE_COPY(Synchronizer)
     bool m_synchronize;
@@ -131,10 +138,16 @@
     QVariant m_targets;
     QList<QVariant> m_sync_output;
 
-    void onSyncChanged(bool synchronize);
+    void onSynchronizeChanged(bool synchronize);
+    void onSyncOutputChanged(QList<QVariant> syncOutput);
     void remoteGetSyncInfoFinished(QNetworkReply* reply);
     void remotePostSyncInfoFinished(QNetworkReply* reply);
 
+    void sendNetworkRequest(QNetworkAccessManager* manager, const QString& uri, QString method);
+    void networkRequestSent();
+    void networkRequestCancelled(const QString& reason);
+    void networkRequestEmitted(Request* request);
+
 };
 
 QT_END_NAMESPACE_U1DB

=== added file 'tests/tst_sync.qml'
--- tests/tst_sync.qml	1970-01-01 00:00:00 +0000
+++ tests/tst_sync.qml	2014-02-20 14:57:43 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import U1db 1.0 as U1db
+
+Item {
+    width: 200; height: 200
+
+    U1db.Database {
+        id: stars
+    }
+
+    U1db.Document {
+        database: stars
+        docId: 'earth'
+        contents: { 'habitable': true }
+    }
+
+    U1db.Document {
+        database: stars
+        docId: 'jupiter'
+        contents: { 'moons': [ 'europa' ] }
+    }
+
+    U1db.Synchronizer {
+        id: online
+        source: stars
+    }
+
+    SignalSpy {
+        id: spySynchronizeChanged
+        target: online
+        signalName: "synchronizeChanged"
+    }
+
+    U1db.Server {
+        id: mockServer
+        port: 0
+        property bool unresponsive: false
+        onNetworkRequest: {
+            if (!unresponsive)
+                write ("HTTP/1.0 404 Ok\nContent-Type: text/html; charset=\"utf-8\"\nNot found!\n")
+        }
+    }
+
+TestCase {
+    name: "Sync"
+
+    function test_0_incomplete () {
+        online.synchronize = true
+        spySynchronizeChanged.wait ()
+        compare(online.syncOutput[0].message_value, "No targets specified")
+
+        online.targets = [ { } ]
+        online.synchronize = true
+        spySynchronizeChanged.wait ()
+        compare(0, online.syncOutput[1].message_value.indexOf("Invalid URI"))
+
+        online.targets = [ { "uri": "foo://bar.com:9876/rien.db",
+            resolve_to_source: true } ]
+        online.synchronize = true
+        spySynchronizeChanged.wait ()
+        compare(0, online.syncOutput[1].message_value.indexOf("Invalid URI"))
+
+        online.targets = [ { "uri": "http://.invalid:1234/nada.db" } ]
+        online.synchronize = true
+        spySynchronizeChanged.wait ()
+        compare(0, online.syncOutput[0].message_value.indexOf("Expected property `resolve_to_source"))
+    }
+
+    function test_1_faultyServer () {
+        online.targets = [ { "uri": "http://.invalid:1234/nada.db",
+            resolve_to_source: true } ]
+        online.synchronize = true
+        spySynchronizeChanged.wait ()
+        compare("no-errors", online.syncOutput[0].message_type)
+    }
+} }
+