Changeset View
Changeset View
Standalone View
Standalone View
src/file/mainhub.cpp
Show All 37 Lines | 35 | { | |||
---|---|---|---|---|---|
38 | 38 | | |||
39 | connect(&m_fileWatcher, &FileWatch::indexNewFile, &m_fileIndexScheduler, &FileIndexScheduler::indexNewFile); | 39 | connect(&m_fileWatcher, &FileWatch::indexNewFile, &m_fileIndexScheduler, &FileIndexScheduler::indexNewFile); | ||
40 | connect(&m_fileWatcher, &FileWatch::indexModifiedFile, &m_fileIndexScheduler, &FileIndexScheduler::indexModifiedFile); | 40 | connect(&m_fileWatcher, &FileWatch::indexModifiedFile, &m_fileIndexScheduler, &FileIndexScheduler::indexModifiedFile); | ||
41 | connect(&m_fileWatcher, &FileWatch::indexXAttr, &m_fileIndexScheduler, &FileIndexScheduler::indexXAttrFile); | 41 | connect(&m_fileWatcher, &FileWatch::indexXAttr, &m_fileIndexScheduler, &FileIndexScheduler::indexXAttrFile); | ||
42 | connect(&m_fileWatcher, &FileWatch::fileRemoved, &m_fileIndexScheduler, &FileIndexScheduler::handleFileRemoved); | 42 | connect(&m_fileWatcher, &FileWatch::fileRemoved, &m_fileIndexScheduler, &FileIndexScheduler::handleFileRemoved); | ||
43 | 43 | | |||
44 | connect(&m_fileWatcher, &FileWatch::installedWatches, &m_fileIndexScheduler, &FileIndexScheduler::scheduleIndexing); | 44 | connect(&m_fileWatcher, &FileWatch::installedWatches, &m_fileIndexScheduler, &FileIndexScheduler::scheduleIndexing); | ||
45 | 45 | | |||
46 | connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, &m_fileIndexScheduler, &FileIndexScheduler::halt); | ||||
47 | | ||||
46 | MainAdaptor* main = new MainAdaptor(this); | 48 | MainAdaptor* main = new MainAdaptor(this); | ||
47 | Q_UNUSED(main) | 49 | Q_UNUSED(main) | ||
48 | 50 | | |||
49 | QDBusConnection bus = QDBusConnection::sessionBus(); | 51 | QDBusConnection bus = QDBusConnection::sessionBus(); | ||
50 | bus.registerObject(QStringLiteral("/"), this, QDBusConnection::ExportAllSlots | | 52 | bus.registerObject(QStringLiteral("/"), this, QDBusConnection::ExportAllSlots | | ||
51 | QDBusConnection::ExportScriptableSignals | QDBusConnection::ExportAdaptors); | 53 | QDBusConnection::ExportScriptableSignals | QDBusConnection::ExportAdaptors); | ||
52 | 54 | | |||
53 | if (!m_config->isInitialRun()) { | 55 | if (!m_config->isInitialRun()) { | ||
54 | m_fileIndexScheduler.scheduleCheckUnindexedFiles(); | 56 | m_fileIndexScheduler.scheduleCheckUnindexedFiles(); | ||
55 | m_fileIndexScheduler.scheduleCheckStaleIndexEntries(); | 57 | m_fileIndexScheduler.scheduleCheckStaleIndexEntries(); | ||
56 | } | 58 | } | ||
57 | QTimer::singleShot(0, &m_fileWatcher, &FileWatch::watchIndexedFolders); | 59 | QTimer::singleShot(0, &m_fileWatcher, &FileWatch::watchIndexedFolders); | ||
58 | } | 60 | } | ||
59 | 61 | | |||
60 | void MainHub::quit() const | 62 | void MainHub::quit() const | ||
61 | { | 63 | { | ||
62 | QCoreApplication::instance()->quit(); | 64 | QCoreApplication::instance()->quit(); | ||
63 | } | 65 | } | ||
64 | 66 | | |||
65 | void MainHub::updateConfig() | 67 | void MainHub::updateConfig() | ||
66 | { | 68 | { | ||
69 | m_fileIndexScheduler.halt(); | ||||
70 | | ||||
67 | m_config->forceConfigUpdate(); | 71 | m_config->forceConfigUpdate(); | ||
68 | // FIXME!! | 72 | // FIXME!! | ||
bruns: Unrelated change | |||||
69 | //m_fileIndexer.updateConfig(); | 73 | //m_fileIndexer.updateConfig(); | ||
70 | m_fileWatcher.updateIndexedFoldersWatches(); | 74 | m_fileWatcher.updateIndexedFoldersWatches(); | ||
71 | } | 75 | } | ||
72 | 76 | | |||
73 | void MainHub::registerBalooWatcher(const QString &service) | 77 | void MainHub::registerBalooWatcher(const QString &service) | ||
74 | { | 78 | { | ||
75 | m_fileWatcher.registerBalooWatcher(service); | 79 | m_fileWatcher.registerBalooWatcher(service); | ||
76 | } | 80 | } |
Unrelated change