Merge remote-tracking branch 'javispedro/js-testing'

Conflicts:
	daemon/daemon.pro
	daemon/dbusconnector.cpp
	daemon/manager.cpp
	daemon/watchcommands.cpp
	daemon/watchcommands.h
	daemon/watchconnector.cpp
	daemon/watchconnector.h
	log4qt-debug.conf
	log4qt-release.conf
	rpm/pebble.spec
	rpm/pebble.yaml

1 files changed, 74 insertions, 0 deletions

diff --git a/daemon/uploadmanager.h b/daemon/uploadmanager.h
new file mode 100644
index 0000000..1980f96
--- /dev/null
+++ b/daemon/uploadmanager.h
@@ -0,0 +1,74 @@
+#ifndef UPLOADMANAGER_H
+#define UPLOADMANAGER_H
+
+#include <functional>
+#include <QQueue>
+#include "watchconnector.h"
+#include "stm32crc.h"
+
+class UploadManager : public QObject
+{
+    Q_OBJECT
+    QLoggingCategory l;
+
+public:
+    explicit UploadManager(WatchConnector *watch, QObject *parent = 0);
+
+    typedef std::function<void()> SuccessCallback;
+    typedef std::function<void(int)> ErrorCallback;
+    typedef std::function<void(qreal)> ProgressCallback;
+
+    uint upload(WatchConnector::UploadType type, int index, const QString &filename, QIODevice *device, int size = -1,
+                SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
+
+    uint uploadAppBinary(int slot, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
+    uint uploadAppResources(int slot, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
+    uint uploadFile(const QString &filename, QIODevice *device, SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback(), ProgressCallback progressCallback = ProgressCallback());
+
+    void cancel(uint id, int code = 0);
+
+signals:
+
+public slots:
+
+
+private:
+    enum State {
+        StateNotStarted,
+        StateWaitForToken,
+        StateInProgress,
+        StateCommit,
+        StateComplete
+    };
+
+    struct PendingUpload {
+        uint id;
+
+        WatchConnector::UploadType type;
+        int index;
+        QString filename;
+        QIODevice *device;
+        int size;
+        int remaining;
+        Stm32Crc crc;
+
+        SuccessCallback successCallback;
+        ErrorCallback errorCallback;
+        ProgressCallback progressCallback;
+    };
+
+    void startNextUpload();
+    void handleMessage(const QByteArray &msg);
+    bool uploadNextChunk(PendingUpload &upload);
+    bool commit(PendingUpload &upload);
+    bool complete(PendingUpload &upload);
+
+private:
+    WatchConnector *watch;
+    QQueue<PendingUpload> _pending;
+    uint _lastUploadId;
+    State _state;
+    quint32 _token;
+};
+
+#endif // UPLOADMANAGER_H