diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2015-11-29 00:27:47 +0100 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2015-11-29 00:27:47 +0100 |
| commit | 0623dc3fcf3a0928a364d46f2ec0327a6e478b82 (patch) | |
| tree | fe1d26aa5b4be45d13b2db5259d52ad590cfaa6b /daemon/bundle.cpp | |
| parent | f498a49bfebcd2b535fcb54aaa8c0008fb320232 (diff) | |
| parent | 05011ecce5da659f36a0abea79f1a96d24703801 (diff) | |
Merge pull request #98 from abranson/master
Support pebble apps with workers
Diffstat (limited to 'daemon/bundle.cpp')
| -rw-r--r-- | daemon/bundle.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/daemon/bundle.cpp b/daemon/bundle.cpp index 63400b5..2b8de11 100644 --- a/daemon/bundle.cpp +++ b/daemon/bundle.cpp @@ -93,8 +93,14 @@ QIODevice *Bundle::openFile(enum Bundle::File file, QIODevice::OpenMode mode) co case Bundle::APPJS: fileName = "pebble-js-app.js"; break; - case Bundle::BINARY: - fileName = b->manifest.value(type()).toObject().value("name").toString(); + case Bundle::FIRMWARE: + fileName = b->manifest.value("firmware").toObject().value("name").toString(); + break; + case Bundle::APPLICATION: + fileName = b->manifest.value("application").toObject().value("name").toString(); + break; + case Bundle::WORKER: + fileName = b->manifest.value("worker").toObject().value("name").toString(); break; case Bundle::RESOURCES: fileName = b->manifest.value("resources").toObject().value("name").toString(); @@ -133,12 +139,18 @@ quint32 Bundle::crcFile(enum Bundle::File file) const quint32 ret = 0; switch (file) { - case Bundle::BINARY: - ret = b->manifest.value(type()).toObject().value("crc").toDouble(); + case Bundle::FIRMWARE: + ret = b->manifest.value("firmware").toObject().value("crc").toDouble(); break; case Bundle::RESOURCES: ret = b->manifest.value("resources").toObject().value("crc").toDouble(); break; + case Bundle::APPLICATION: + ret = b->manifest.value("application").toObject().value("crc").toDouble(); + break; + case Bundle::WORKER: + ret = b->manifest.value("worker").toObject().value("crc").toDouble(); + break; default: qCWarning(l) << "Unsupported CRC for" << file; } |