diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2015-11-28 23:49:17 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2015-11-28 23:49:17 +0100 |
| commit | 05011ecce5da659f36a0abea79f1a96d24703801 (patch) | |
| tree | fe1d26aa5b4be45d13b2db5259d52ad590cfaa6b /daemon/manager.cpp | |
| parent | 625962e90a0646f48e13fff5e2f88f781c5dd9b5 (diff) | |
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
Diffstat (limited to 'daemon/manager.cpp')
| -rw-r--r-- | daemon/manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QIODevice> binaryFile(bundle.openFile(Bundle::BINARY)); + QSharedPointer<QIODevice> 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"; |