From 05011ecce5da659f36a0abea79f1a96d24703801 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Sat, 28 Nov 2015 23:49:17 +0100 Subject: Support Pebble apps with workers Separate upload for 'worker' binaries. Split binary upload type into firmware, application and worker, as the 'type' field states 'worker' for applications with worker binaries. Fixes #34 --- daemon/manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'daemon/manager.cpp') diff --git a/daemon/manager.cpp b/daemon/manager.cpp index b02264e..37625e3 100644 --- a/daemon/manager.cpp +++ b/daemon/manager.cpp @@ -343,7 +343,7 @@ bool Manager::uploadFirmware(bool recovery, const QString &file) return false; } - if (!bundle.fileExists(Bundle::BINARY) || !bundle.fileExists(Bundle::RESOURCES)) { + if (!bundle.fileExists(Bundle::FIRMWARE) || !bundle.fileExists(Bundle::RESOURCES)) { qCWarning(l) << file << "is missing binary or resource"; return false; } @@ -364,9 +364,9 @@ bool Manager::uploadFirmware(bool recovery, const QString &file) qCDebug(l) << "firmware resource upload succesful"; resourceFile->close(); // Proceed to upload the resource file - QSharedPointer binaryFile(bundle.openFile(Bundle::BINARY)); + QSharedPointer binaryFile(bundle.openFile(Bundle::FIRMWARE)); if (binaryFile) { - upload->uploadFirmwareBinary(recovery, binaryFile.data(), bundle.crcFile(Bundle::BINARY), + upload->uploadFirmwareBinary(recovery, binaryFile.data(), bundle.crcFile(Bundle::FIRMWARE), [this, binaryFile]() { binaryFile->close(); qCDebug(l) << "firmware binary upload succesful"; -- cgit v1.2.3