summaryrefslogtreecommitdiff
blob: d49cc8f6d9d9ed26a9522057891e831d7040ad81 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
From d102b01ee59d93de3fe18c12364ea69a85ea723f Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <cullmann@kde.org>
Date: Thu, 31 Dec 2020 15:44:40 +0000
Subject: [PATCH] avoid errors for application startup if no baloo index was
 ever created

use case:

 * a KDE application started e.g. in an non-KDE Plasma environment
 * a KDE application started with baloo indexing disabled

you normally will get:

kf.kio.slaves.tags: tag fetch failed: "Failed to open the database"
kf.kio.slaves.tags: "tags:/" list() invalid url

Now this is not issued if no index database exist.
---
 src/engine/database.cpp | 6 ++++++
 src/engine/database.h   | 7 +++++++
 src/lib/taglistjob.cpp  | 7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/src/engine/database.cpp b/src/engine/database.cpp
index 427210d0..ac93426c 100644
--- a/src/engine/database.cpp
+++ b/src/engine/database.cpp
@@ -247,3 +247,9 @@ QString Database::path() const
     QMutexLocker locker(&m_mutex);
     return m_path;
 }
+
+bool Database::isAvailable() const
+{
+    QMutexLocker locker(&m_mutex);
+    return QFileInfo::exists(m_path + QStringLiteral("/index"));
+}
diff --git a/src/engine/database.h b/src/engine/database.h
index 0f43b623..26d21101 100644
--- a/src/engine/database.h
+++ b/src/engine/database.h
@@ -73,6 +73,13 @@ public:
      */
     QString path() const;
 
+    /**
+     * Is the database available for use?
+     * For example if indexing is disabled or the indexer did never run this is false.
+     * @return database available
+     */
+    bool isAvailable() const;
+
 private:
     /**
      * serialize access, as open might be called from multiple threads
diff --git a/src/lib/taglistjob.cpp b/src/lib/taglistjob.cpp
index cea57889..58945cc7 100644
--- a/src/lib/taglistjob.cpp
+++ b/src/lib/taglistjob.cpp
@@ -33,7 +33,14 @@ TagListJob::~TagListJob()
 void TagListJob::start()
 {
     Database *db = globalDatabaseInstance();
+
     if (!db->open(Database::ReadOnlyDatabase)) {
+        // if we have no index, we have no tags
+        if (!db->isAvailable()) {
+            emitResult();
+            return;
+        }
+
         setError(UserDefinedError);
         setErrorText(QStringLiteral("Failed to open the database"));
         emitResult();
-- 
GitLab