Merge pull request #48 from pvuorela/master

Fix clearing tracker database
sailfishos · Jan 31, 2018 · 24d04e1 · 24d04e1
2 parents c77077f + ecd1c91
commit 24d04e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugin/utiltools.cpp b/plugin/utiltools.cpp
@@ -41,12 +41,9 @@ void UtilTools::cleanRpmDb(QJSValue successCallback, QJSValue errorCallback)
     execute(SystemTool, QStringList("repair_rpm_db"), successCallback, errorCallback);
 }
 
-
 void UtilTools::cleanTrackerDb(QJSValue successCallback, QJSValue errorCallback)
 {
-    QStringList arguments;
-    arguments << "--user" << "start" << "tracker-reindex.service";
-    execute("systemctl", arguments, successCallback, errorCallback);
+    execute(SystemTool, QStringList("tracker_reindex"), successCallback, errorCallback);
 }
 
 void UtilTools::restartNetwork(QJSValue successCallback, QJSValue errorCallback)
@@ -78,7 +75,7 @@ void UtilTools::handleProcessExit(int exitCode, QProcess::ExitStatus status)
             }
         }
     } else if (callbacks.second.isCallable()) {
-        QJSValue result = callbacks.second.call();
+        QJSValue result = callbacks.second.call(QJSValueList() << QJSValue(exitCode));
         if (result.isError()) {
             qmlInfo(this) << "Error executing error callback";
         }

diff --git a/tools/sailfish_tools_system_action.cpp b/tools/sailfish_tools_system_action.cpp
@@ -70,6 +70,9 @@ std::map<std::string, action_type> actions = {
         }},
     { "restart_network", [](action_ctx const *) {
             return execute_own_utility("restart_network.sh");
+        }},
+    { "tracker_reindex", [](action_ctx const *) {
+            return execute_own_utility("tracker_reindex.sh");
         }}
 };
 

diff --git a/tools/tracker_reindex.sh b/tools/tracker_reindex.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-tracker reset --hard
+tracker reset -y --hard