2 files changed, 49 insertions, 0 deletions

diff --git a/client/resourceaccess.cpp b/client/resourceaccess.cpp
index 4042219..e73c773 100644
--- a/client/resourceaccess.cpp
+++ b/client/resourceaccess.cpp
@@ -3,6 +3,7 @@
 #include "common/console.h"
 #include "common/commands.h"
 #include "common/handshake_generated.h"
+#include "common/revisionupdate_generated.h"
 
 #include <QDebug>
 #include <QProcess>
@@ -26,6 +27,9 @@ ResourceAccess::ResourceAccess(const QString &resourceName, QObject *parent)
             this, &ResourceAccess::disconnected);
     connect(m_socket, SIGNAL(error(QLocalSocket::LocalSocketError)),
             this, SLOT(connectionError(QLocalSocket::LocalSocketError)));
+    connect(m_socket, &QIODevice::readyRead,
+            this, &ResourceAccess::readResourceMessage);
+
 }
 
 ResourceAccess::~ResourceAccess()
@@ -109,3 +113,44 @@ void ResourceAccess::connectionError(QLocalSocket::LocalSocketError error)
     }
 }
 
+void ResourceAccess::readResourceMessage()
+{
+    if (!m_socket->isValid()) {
+        return;
+    }
+
+    m_partialMessageBuffer += m_socket->readAll();
+
+    // should be scheduled rather than processed all at once
+    while (processMessageBuffer()) {}
+}
+
+bool ResourceAccess::processMessageBuffer()
+{
+    static const int headerSize = (sizeof(int) * 2);
+    Console::main()->log(QString("processing %1").arg(m_partialMessageBuffer.size()));
+    if (m_partialMessageBuffer.size() < headerSize) {
+        return false;
+    }
+
+    const int commandId = *(int*)m_partialMessageBuffer.constData();
+    const int size = *(int*)(m_partialMessageBuffer.constData() + sizeof(int));
+
+    if (size > m_partialMessageBuffer.size() - headerSize) {
+        return false;
+    }
+
+    switch (commandId) {
+        case Commands::RevisionUpdateCommand: {
+            auto buffer = Toynadi::GetRevisionUpdate(m_partialMessageBuffer.constData() + headerSize);
+            Console::main()->log(QString("    Revision updated to: %1").arg(buffer->revision()));
+            emit revisionChanged(buffer->revision());
+            break;
+        }
+        default:
+            break;
+    }
+
+    m_partialMessageBuffer.remove(0, headerSize + size);
+    return m_partialMessageBuffer.size() >= headerSize;
+}
diff --git a/client/resourceaccess.h b/client/resourceaccess.h
index 53b46c5..09df614 100644
--- a/client/resourceaccess.h
+++ b/client/resourceaccess.h
@@ -21,15 +21,19 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void ready(bool isReady);
+    void revisionChanged(unsigned long long revision);
 
 private Q_SLOTS:
     void connected();
     void disconnected();
     void connectionError(QLocalSocket::LocalSocketError error);
+    void readResourceMessage();
+    bool processMessageBuffer();
 
 private:
     QString m_resourceName;
     QLocalSocket *m_socket;
     QTimer *m_tryOpenTimer;
     bool m_startingProcess;
+    QByteArray m_partialMessageBuffer;
 };