summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--daemon/appfetchmanager.cpp (renamed from daemon/appfetchmanager.cc)0
-rw-r--r--daemon/appmanager.cpp14
-rw-r--r--daemon/appmanager.h5
-rw-r--r--daemon/blobdbmanager.cpp (renamed from daemon/blobdbmanager.cc)0
-rw-r--r--daemon/daemon.pro148
-rw-r--r--daemon/manager.cpp7
-rw-r--r--daemon/manager.h8
-rw-r--r--daemon/timelineitem.h5
8 files changed, 101 insertions, 86 deletions
diff --git a/daemon/appfetchmanager.cc b/daemon/appfetchmanager.cpp
index 9c58e27..9c58e27 100644
--- a/daemon/appfetchmanager.cc
+++ b/daemon/appfetchmanager.cpp
diff --git a/daemon/appmanager.cpp b/daemon/appmanager.cpp
index 27e1e3f..4e659d3 100644
--- a/daemon/appmanager.cpp
+++ b/daemon/appmanager.cpp
@@ -2,9 +2,10 @@
#include <QDir>
#include "appmanager.h"
-AppManager::AppManager(QObject *parent)
+AppManager::AppManager(BlobDbManager *blobDB, QObject *parent)
: QObject(parent), l(metaObject()->className()),
- _watcher(new QFileSystemWatcher(this))
+ _watcher(new QFileSystemWatcher(this)),
+ blobDB(blobDB)
{
connect(_watcher, &QFileSystemWatcher::directoryChanged,
this, &AppManager::rescan);
@@ -18,6 +19,15 @@ AppManager::AppManager(QObject *parent)
rescan();
}
+void AppManager::refresh()
+{
+ qCDebug(l) << "pushing available apps to watch";
+ foreach (const QUuid &appUuid, appUuids()) {
+ qDebug() << "Inserting app" << info(appUuid).shortName() << "into BlobDB";
+ //blobDB->insert(info(appUuid));
+ }
+}
+
QStringList AppManager::appPaths() const
{
return QStandardPaths::locateAll(QStandardPaths::DataLocation,
diff --git a/daemon/appmanager.h b/daemon/appmanager.h
index 9fdb977..6f7bdcc 100644
--- a/daemon/appmanager.h
+++ b/daemon/appmanager.h
@@ -7,6 +7,7 @@
#include <QFileSystemWatcher>
#include <QLoggingCategory>
#include "appinfo.h"
+#include "blobdbmanager.h"
class AppManager : public QObject
{
@@ -14,7 +15,7 @@ class AppManager : public QObject
QLoggingCategory l;
public:
- explicit AppManager(QObject *parent = 0);
+ explicit AppManager(BlobDbManager *blobDB, QObject *parent = 0);
QStringList appPaths() const;
QList<QUuid> appUuids() const;
@@ -23,6 +24,7 @@ public:
AppInfo info(const QString &shortName) const;
void insertAppInfo(const AppInfo &info);
+ void refresh();
public slots:
void rescan();
@@ -35,6 +37,7 @@ private:
private:
QFileSystemWatcher *_watcher;
+ BlobDbManager *blobDB;
QHash<QUuid, AppInfo> _apps;
QHash<QString, QUuid> _names;
};
diff --git a/daemon/blobdbmanager.cc b/daemon/blobdbmanager.cpp
index f7a33dd..f7a33dd 100644
--- a/daemon/blobdbmanager.cc
+++ b/daemon/blobdbmanager.cpp
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index 9bfb6d0..0b8d090 100644
--- a/daemon/daemon.pro
+++ b/daemon/daemon.pro
@@ -1,74 +1,74 @@
-TARGET = pebbled
-
-CONFIG += console
-CONFIG += link_pkgconfig
-
-QT += core gui qml bluetooth dbus contacts positioning
-PKGCONFIG += mlite5 icu-i18n zlib
-LIBS += -lquazip
-CONFIG += c++11
-
-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
-
-SOURCES += \
- daemon.cpp \
- manager.cpp \
- voicecallmanager.cpp \
- voicecallhandler.cpp \
- notificationmanager.cpp \
- watchconnector.cpp \
- appmanager.cpp \
- musicmanager.cpp \
- datalogmanager.cpp \
- unpacker.cpp \
- appmsgmanager.cpp \
- jskitmanager.cpp \
- appinfo.cpp \
- jskitobjects.cpp \
- packer.cpp \
- bankmanager.cpp \
- uploadmanager.cpp \
- bundle.cpp \
- appfetchmanager.cc \
- blobdbmanager.cc \
- timelineitem.cpp
-
-HEADERS += \
- manager.h \
- voicecallmanager.h \
- voicecallhandler.h \
- notificationmanager.h \
- watchconnector.h \
- settings.h \
- appmanager.h \
- musicmanager.h \
- unpacker.h \
- datalogmanager.h \
- appmsgmanager.h \
- jskitmanager.h \
- appinfo.h \
- jskitobjects.h \
- packer.h \
- bankmanager.h \
- uploadmanager.h \
- bundle.h \
- appfetchmanager.h \
- blobdbmanager.h \
- timelineitem.h
-
-DBUS_ADAPTORS += ../org.pebbled.Watch.xml
-
-OTHER_FILES += js/typedarray.js
-
-INSTALLS += target systemd js
-
-target.path = /usr/bin
-
-systemd.files = $${TARGET}.service
-systemd.path = /usr/lib/systemd/user
-
-js.files = js/*
-js.path = /usr/share/pebble/js
-
-# unnecesary includes, just so QtCreator could find headers... :-(
-INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5 $$[QT_HOST_PREFIX]/include/quazip
+TARGET = pebbled
+
+CONFIG += console
+CONFIG += link_pkgconfig
+
+QT += core gui qml bluetooth dbus contacts positioning
+PKGCONFIG += mlite5 icu-i18n zlib
+LIBS += -lquazip
+CONFIG += c++11
+
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
+SOURCES += \
+ daemon.cpp \
+ manager.cpp \
+ voicecallmanager.cpp \
+ voicecallhandler.cpp \
+ notificationmanager.cpp \
+ watchconnector.cpp \
+ appmanager.cpp \
+ musicmanager.cpp \
+ datalogmanager.cpp \
+ unpacker.cpp \
+ appmsgmanager.cpp \
+ jskitmanager.cpp \
+ appinfo.cpp \
+ jskitobjects.cpp \
+ packer.cpp \
+ bankmanager.cpp \
+ uploadmanager.cpp \
+ bundle.cpp \
+ timelineitem.cpp \
+ blobdbmanager.cpp \
+ appfetchmanager.cpp
+
+HEADERS += \
+ manager.h \
+ voicecallmanager.h \
+ voicecallhandler.h \
+ notificationmanager.h \
+ watchconnector.h \
+ settings.h \
+ appmanager.h \
+ musicmanager.h \
+ unpacker.h \
+ datalogmanager.h \
+ appmsgmanager.h \
+ jskitmanager.h \
+ appinfo.h \
+ jskitobjects.h \
+ packer.h \
+ bankmanager.h \
+ uploadmanager.h \
+ bundle.h \
+ appfetchmanager.h \
+ blobdbmanager.h \
+ timelineitem.h
+
+DBUS_ADAPTORS += ../org.pebbled.Watch.xml
+
+OTHER_FILES += js/typedarray.js
+
+INSTALLS += target systemd js
+
+target.path = /usr/bin
+
+systemd.files = $${TARGET}.service
+systemd.path = /usr/lib/systemd/user
+
+js.files = js/*
+js.path = /usr/share/pebble/js
+
+# unnecesary includes, just so QtCreator could find headers... :-(
+INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5 $$[QT_HOST_PREFIX]/include/quazip
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index 0b365c3..c2e37e2 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -11,9 +11,10 @@ Manager::Manager(Settings *settings, QObject *parent) :
proxy(new PebbledProxy(this)),
watch(new WatchConnector(this)),
upload(new UploadManager(watch, this)),
- apps(new AppManager(this)),
+ blobdb(new BlobDbManager(watch, this)),
+ apps(new AppManager(blobdb, this)),
bank(new BankManager(watch, upload, apps, this)),
- fetch(new AppFetchManager(watch, upload, apps, this)),
+ fetch(new AppFetchManager(watch, upload, apps, this)),
voice(new VoiceCallManager(settings, this)),
notifications(new NotificationManager(settings, this)),
music(new MusicManager(watch, settings, this)),
@@ -59,7 +60,7 @@ Manager::Manager(Settings *settings, QObject *parent) :
connect(notifications, SIGNAL(facebookNotify(const QString &,const QString &)), SLOT(onFacebookNotify(const QString &,const QString &)));
connect(notifications, SIGNAL(telegramNotify(const QString &,const QString &)), SLOT(onTelegramNotify(const QString &,const QString &)));
connect(notifications, SIGNAL(hangoutsNotify(const QString &,const QString &)), SLOT(onHangoutsNotify(const QString &,const QString &)));
- connect(notifications, SIGNAL(whatappNotify(const QString &,const QString &)), SLOT(onWhatsappNotify(const QString &,const QString &)));
+ connect(notifications, SIGNAL(whatsappNotify(const QString &,const QString &)), SLOT(onWhatsappNotify(const QString &,const QString &)));
connect(appmsg, &AppMsgManager::appStarted, this, &Manager::onAppOpened);
connect(appmsg, &AppMsgManager::appStopped, this, &Manager::onAppClosed);
diff --git a/daemon/manager.h b/daemon/manager.h
index 5d3b494..56db7fa 100644
--- a/daemon/manager.h
+++ b/daemon/manager.h
@@ -10,9 +10,9 @@
#include "appmsgmanager.h"
#include "jskitmanager.h"
#include "appmanager.h"
-#include "blobdbmanager.h"
+#include "blobdbmanager.h"
#include "bankmanager.h"
-#include "appfetchmanager.h"
+#include "appfetchmanager.h"
#include "settings.h"
#include <QObject>
@@ -41,10 +41,10 @@ class Manager : public QObject, protected QDBusContext
WatchConnector *watch;
UploadManager *upload;
+ BlobDbManager *blobdb;
AppManager *apps;
- BlobDbManager *blobdb;
BankManager *bank;
- AppFetchManager *fetch;
+ AppFetchManager *fetch;
VoiceCallManager *voice;
NotificationManager *notifications;
MusicManager *music;
diff --git a/daemon/timelineitem.h b/daemon/timelineitem.h
index 9d7850c..778266d 100644
--- a/daemon/timelineitem.h
+++ b/daemon/timelineitem.h
@@ -31,12 +31,13 @@ public:
IconIDTelegram = 0x07,
IconIDHangout = 0x08,
IconIDGMail = 0x09,
- IconIDFlash = 0x0a, // TODO: what service is this?
+ IconIDFacebookMessenger = 0x0a,
IconIDFacebook = 0x0b,
IconIDMusic = 0x0c,
IconIDAlarm = 0x0d,
IconIDWeather = 0x0e,
- IconIDGuess = 0x31
+ IconIDEmail = 0x13,
+ IconIDSMS = 0x2d
};
enum Color {
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-14 23:31:59 +0000