[nautilus/sam/tracker-3: 4/4] WIP: Store starred files in a private database
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/sam/tracker-3: 4/4] WIP: Store starred files in a private database
- Date: Sun, 3 May 2020 10:59:18 +0000 (UTC)
commit 0376d003169c5f212b5348799c1d96b6b689e8fe
Author: Sam Thursfield <sam afuera me uk>
Date: Sun May 3 10:38:15 2020 +0200
WIP: Store starred files in a private database
Until now, starred file information was stored in the tracker-miner-fs
database. This has some downsides, firstly the data is deleted if
someone runs `tracker reset --hard`, secondly it isn't possible to
do this from inside a Flatpak sandbox with Tracker 3.0.
This commit changes the NautilusTagManager to set up a private
database inside XDG_DATA_HOME/nautilus. This stores the starred file
information. The database is managed with Tracker, which allows us
to continue using the rename-tracking that tracker-miner-fs provides.
The same limitations apply as before that only files in indexed
locations can be starred.
data/meson.build | 2 +
data/ontology/meson.build | 8 ++
data/ontology/nautilus.description | 9 ++
data/ontology/nautilus.ontology | 14 ++++
src/nautilus-tag-manager.c | 148 +++++++++++++++++++++------------
test/automated/displayless/meson.build | 18 +++-
test/meson.build | 1 +
7 files changed, 145 insertions(+), 55 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 7218b84e0..e51ed50b1 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -137,3 +137,5 @@ if appstream_util.found()
]
)
endif
+
+subdir('ontology')
diff --git a/data/ontology/meson.build b/data/ontology/meson.build
new file mode 100644
index 000000000..cb80e86a1
--- /dev/null
+++ b/data/ontology/meson.build
@@ -0,0 +1,8 @@
+ontology_data = files(
+ 'nautilus.description',
+ 'nautilus.ontology',
+)
+
+install_data(ontology_data,
+ install_dir: join_paths(datadir, 'nautilus', 'ontology')
+)
diff --git a/data/ontology/nautilus.description b/data/ontology/nautilus.description
new file mode 100644
index 000000000..42f4102c3
--- /dev/null
+++ b/data/ontology/nautilus.description
@@ -0,0 +1,9 @@
+@prefix dsc: <http://tracker.api.gnome.org/ontology/v3/dsc#> .
+
+<virtual-ontology-uri:nautilus.ontology> a dsc:Ontology ;
+ dsc:title "Nautilus ontology" ;
+ dsc:description "Tracker database schema for Nautilus private data." ;
+
+ dsc:localPrefix "nautilus" ;
+ dsc:baseUrl "https://gitlab.gnome.org/GNOME/nautilus#"; ;
+ dsc:relativePath "./nautilus.ontology" ;
diff --git a/data/ontology/nautilus.ontology b/data/ontology/nautilus.ontology
new file mode 100644
index 000000000..2a677da13
--- /dev/null
+++ b/data/ontology/nautilus.ontology
@@ -0,0 +1,14 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix nautilus: <https://gitlab.gnome.org/GNOME/nautilus#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
+
+nautilus: a tracker:Namespace, tracker:Ontology ;
+ tracker:prefix "nautilus" ;
+ tracker:lastModified "2020-05-03T10:00:00Z" .
+
+nautilus:starred a rdf:Property ;
+ rdfs:comment "Marks resources that are starred in Nautilus." ;
+ rdfs:domain rdfs:Resource ;
+ rdfs:range xsd:boolean .
diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
index 319f9bdac..097f2f9a4 100644
--- a/src/nautilus-tag-manager.c
+++ b/src/nautilus-tag-manager.c
@@ -23,11 +23,15 @@
#include <tracker-sparql.h>
+#include "config.h"
+
struct _NautilusTagManager
{
GObject object;
- TrackerSparqlConnection *connection;
+ gboolean tracker_ok;
+ TrackerSparqlConnection *local;
+ TrackerSparqlConnection *miner_fs;
TrackerNotifier *notifier;
TrackerSparqlStatement *query_starred_files;
@@ -76,19 +80,19 @@ enum
#define TRACKER_MINER_FS_BUSNAME "org.freedesktop.Tracker3.Miner.Files"
-#define STARRED_TAG "<urn:gnome:nautilus:starred>"
-
#define QUERY_STARRED_FILES \
"SELECT ?url tracker:id(?urn) " \
"{ " \
- " ?urn nie:url ?url ; " \
- " nao:hasTag " STARRED_TAG \
+ " ?urn nautilus:starred true . " \
+ " SERVICE <dbus:" TRACKER_MINER_FS_BUSNAME "> { " \
+ " ?urn nie:isStoredAs ?url ; " \
+ " } " \
"}"
#define QUERY_UPDATED_FILE_URL \
- "SELECT ?url EXISTS { ?urn nao:hasTag " STARRED_TAG "} AS ?starred" \
+ "SELECT ?url EXISTS { ?urn nautilus:starred true } AS ?starred" \
"{ " \
- " ?urn nie:url ?url . " \
+ " ?urn nie:isStoredAs ?url . " \
" FILTER (tracker:id(?urn) = ~id) " \
"}"
@@ -138,7 +142,7 @@ add_selection_filter (GList *selection,
}
static void
-start_query_or_update (TrackerSparqlConnection *connection,
+start_query_or_update (TrackerSparqlConnection *local,
GString *query,
GAsyncReadyCallback callback,
gpointer user_data,
@@ -147,7 +151,7 @@ start_query_or_update (TrackerSparqlConnection *connection,
{
g_autoptr (GError) error = NULL;
- if (!connection)
+ if (!local)
{
g_message ("nautilus-tag-manager: No Tracker connection");
return;
@@ -155,7 +159,7 @@ start_query_or_update (TrackerSparqlConnection *connection,
if (is_query)
{
- tracker_sparql_connection_query_async (connection,
+ tracker_sparql_connection_query_async (local,
query->str,
cancellable,
callback,
@@ -163,7 +167,7 @@ start_query_or_update (TrackerSparqlConnection *connection,
}
else
{
- tracker_sparql_connection_update_async (connection,
+ tracker_sparql_connection_update_async (local,
query->str,
G_PRIORITY_DEFAULT,
cancellable,
@@ -177,7 +181,7 @@ on_update_callback (GObject *object,
GAsyncResult *result,
gpointer user_data)
{
- TrackerSparqlConnection *connection;
+ TrackerSparqlConnection *local;
GError *error;
UpdateData *data;
gint64 *new_id;
@@ -188,9 +192,9 @@ on_update_callback (GObject *object,
error = NULL;
- connection = TRACKER_SPARQL_CONNECTION (object);
+ local = TRACKER_SPARQL_CONNECTION (object);
- tracker_sparql_connection_update_finish (connection, result, &error);
+ tracker_sparql_connection_update_finish (local, result, &error);
if (error == NULL ||
(error != NULL && error->code != G_IO_ERROR_CANCELLED))
@@ -390,7 +394,7 @@ static void
nautilus_tag_manager_query_starred_files (NautilusTagManager *self,
GCancellable *cancellable)
{
- if (!self->connection)
+ if (!self->tracker_ok)
{
g_message ("nautilus-tag-manager: No Tracker connection");
return;
@@ -420,8 +424,11 @@ nautilus_tag_manager_delete_tag (NautilusTagManager *self,
GString *query)
{
g_string_append (query,
- "DELETE { ?urn nao:hasTag " STARRED_TAG " }"
- "WHERE { ?urn a nfo:FileDataObject ; nie:url ?url .");
+ "DELETE { ?urn nautilus:starred true } "
+ "WHERE { "
+ " SERVICE <dbus:" TRACKER_MINER_FS_BUSNAME "> "
+ " ?urn nie:isStoredAs ?url . "
+ "}");
query = add_selection_filter (selection, query);
@@ -436,9 +443,11 @@ nautilus_tag_manager_insert_tag (NautilusTagManager *self,
GString *query)
{
g_string_append (query,
- "INSERT DATA { " STARRED_TAG " a nao:Tag .}\n"
- "INSERT { ?urn nao:hasTag " STARRED_TAG " }"
- "WHERE { ?urn a nfo:FileDataObject ; nie:url ?url .");
+ "INSERT { ?urn nautilus:starred true } "
+ "WHERE { "
+ " SERVICE <dbus:" TRACKER_MINER_FS_BUSNAME "> "
+ " ?urn nie:isStoredAs ?url . "
+ "}");
query = add_selection_filter (selection, query);
@@ -516,15 +525,13 @@ on_get_file_ids_for_urls_query_callback (GObject *object,
{
TrackerSparqlCursor *cursor;
g_autoptr (GError) error = NULL;
- TrackerSparqlConnection *connection;
+ TrackerSparqlConnection *local;
GTask *task;
- connection = TRACKER_SPARQL_CONNECTION (object);
+ local = TRACKER_SPARQL_CONNECTION (object);
task = user_data;
- cursor = tracker_sparql_connection_query_finish (connection,
- result,
- &error);
+ cursor = tracker_sparql_connection_query_finish (local, result, &error);
if (error != NULL)
{
@@ -551,13 +558,13 @@ nautilus_tag_manager_get_file_ids_for_urls (NautilusTagManager *self,
{
GString *query;
- query = g_string_new ("SELECT ?url tracker:id(?urn) WHERE { ?urn nie:url ?url; .");
+ query = g_string_new ("SELECT ?url tracker:id(?urn) WHERE { ?urn a rdfs:Resource . SERVICE <dbus:"
TRACKER_MINER_FS_BUSNAME "> { ?urn nie:isStoredAs ?url .");
query = add_selection_filter (selection, query);
- g_string_append (query, "}\n");
+ g_string_append (query, "} }\n");
- start_query_or_update (self->connection,
+ start_query_or_update (self->local,
query,
on_get_file_ids_for_urls_query_callback,
task,
@@ -603,7 +610,7 @@ on_star_files_callback (GObject *object,
*/
destroy_insert_task_data (data);
- start_query_or_update (self->connection,
+ start_query_or_update (self->local,
query,
on_update_callback,
update_data,
@@ -666,7 +673,7 @@ nautilus_tag_manager_unstar_files (NautilusTagManager *self,
update_data->selection = nautilus_file_list_copy (selection);
update_data->star = FALSE;
- start_query_or_update (self->connection,
+ start_query_or_update (self->local,
query,
on_update_callback,
update_data,
@@ -690,7 +697,7 @@ on_tracker_notifier_events (TrackerNotifier *notifier,
const gchar *new_location_uri;
GError *error = NULL;
TrackerSparqlCursor *cursor;
- gboolean query_has_results;
+ gboolean query_has_results = FALSE;
gboolean is_starred;
gint64 id, *new_id;
GList *changed_files;
@@ -707,21 +714,22 @@ on_tracker_notifier_events (TrackerNotifier *notifier,
NULL,
&error);
- if (error || !cursor)
+ if (cursor && !error)
{
- g_printerr ("Couldn't query the Tracker Store: '%s'", error->message);
+ changed_file = NULL;
- g_clear_error (&error);
+ id = tracker_notifier_event_get_id (event);
+ location_uri = g_hash_table_lookup (self->starred_file_ids, &id);
- return;
+ query_has_results = tracker_sparql_cursor_next (cursor, NULL, &error);
}
- changed_file = NULL;
-
- id = tracker_notifier_event_get_id (event);
- location_uri = g_hash_table_lookup (self->starred_file_ids, &id);
-
- query_has_results = tracker_sparql_cursor_next (cursor, NULL, &error);
+ if (!cursor || error)
+ {
+ g_printerr ("Couldn't query the Tracker Store: '%s'", error ? error->message : "(null error)");
+ g_clear_error (&error);
+ return;
+ }
if (!query_has_results)
{
@@ -806,8 +814,9 @@ nautilus_tag_manager_finalize (GObject *object)
}
g_clear_object (&self->notifier);
- g_clear_object (&self->connection);
- g_clear_object (&self->query_has_results);
+ g_clear_object (&self->local);
+ g_clear_object (&self->miner_fs);
+ g_clear_object (&self->query_updated_file_url);
g_clear_object (&self->query_starred_files);
g_hash_table_destroy (self->starred_file_ids);
@@ -854,21 +863,53 @@ nautilus_tag_manager_get (void)
}
static gboolean
-setup_tracker_connection (NautilusTagManager *self,
+setup_tracker_connections (NautilusTagManager *self,
GCancellable *cancellable,
GError **error)
{
- self->connection = tracker_sparql_connection_bus_new (TRACKER_MINER_FS_BUSNAME,
- NULL,
- NULL,
- error);
+ const gchar *datadir;
+ g_autofree gchar *store_path = NULL;
+ g_autofree gchar *ontology_path = NULL;
+ g_autoptr (GFile) store = NULL;
+ g_autoptr (GFile) ontology = NULL;
+
+ /* Connect to private database to store nautilus:starred property. */
+
+ if (g_getenv ("NAUTILUS_TEST_DATADIR")) {
+ datadir = g_getenv ("NAUTILUS_TEST_DATADIR");
+ } else {
+ datadir = NAUTILUS_DATADIR;
+ }
+
+ store_path = g_build_filename (g_get_user_data_dir (), "nautilus", NULL);
+ ontology_path = g_build_filename (datadir, "ontology", NULL);
+
+ store = g_file_new_for_path (store_path);
+ ontology = g_file_new_for_path (ontology_path);
+
+ self->local = tracker_sparql_connection_new (TRACKER_SPARQL_CONNECTION_FLAGS_NONE,
+ store,
+ ontology,
+ cancellable,
+ error);
if (*error)
{
return FALSE;
}
- self->query_updated_file_url = tracker_sparql_connection_query_statement (self->connection,
+ /* Connect to Tracker filesystem index to follow file renames. */
+ self->miner_fs = tracker_sparql_connection_bus_new (TRACKER_MINER_FS_BUSNAME,
+ NULL,
+ NULL,
+ error);
+
+ if (*error) {
+ return FALSE;
+ }
+
+ /* Prepare reusable queries. */
+ self->query_updated_file_url = tracker_sparql_connection_query_statement (self->local,
QUERY_UPDATED_FILE_URL,
cancellable,
error);
@@ -878,7 +919,7 @@ setup_tracker_connection (NautilusTagManager *self,
return FALSE;
}
- self->query_starred_files = tracker_sparql_connection_query_statement (self->connection,
+ self->query_starred_files = tracker_sparql_connection_query_statement (self->local,
QUERY_STARRED_FILES,
cancellable,
error);
@@ -898,17 +939,18 @@ nautilus_tag_manager_set_cancellable (NautilusTagManager *self,
{
g_autoptr (GError) error = NULL;
- setup_tracker_connection (self, cancellable, &error);
+ self->tracker_ok = setup_tracker_connections (self, cancellable, &error);
if (error) {
g_warning ("Unable to initialize tag manager: %s", error->message);
return;
}
+ self->notifier = tracker_sparql_connection_create_notifier (self->miner_fs,
+ TRACKER_NOTIFIER_FLAG_NONE);
+
nautilus_tag_manager_query_starred_files (self, cancellable);
- self->notifier = tracker_sparql_connection_create_notifier (self->connection,
- TRACKER_NOTIFIER_FLAG_NONE);
g_signal_connect (self->notifier,
"events",
G_CALLBACK (on_tracker_notifier_events),
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
index fccc61b30..863ef501a 100644
--- a/test/automated/displayless/meson.build
+++ b/test/automated/displayless/meson.build
@@ -35,9 +35,20 @@ tests = [
]]
]
+tracker_miner_proxy = gnome.gdbus_codegen(
+ 'tracker-miner-proxy',
+ join_paths(tracker_sparql.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces',
'org.freedesktop.Tracker3.Miner.xml'),
+ interface_prefix: 'org.freedesktop.Tracker3.',
+ namespace: 'Tracker')
+
tracker_tests = [
['test-nautilus-search-engine-tracker', [
- 'test-nautilus-search-engine-tracker.c'
+ 'test-nautilus-search-engine-tracker.c',
+ ]],
+ ['test-tag-manager', [
+ 'test-tag-manager.c',
+ 'test-utilities-tracker.c',
+ tracker_miner_proxy[0], tracker_miner_proxy[1],
]],
]
@@ -54,13 +65,16 @@ foreach t: tests
)
endforeach
+
+
# Tests that read and write from the Tracker index are run using 'tracker-sandbox'
# script to use a temporary instance of tracker-miner-fs instead of the session one.
foreach t: tracker_tests
+ test_exe = executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep)
test(
t[0],
tracker_sandbox,
- args: [executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep)],
+ args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
env: [
test_env,
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
diff --git a/test/meson.build b/test/meson.build
index ab588efd3..36e5aca0a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -15,6 +15,7 @@
# the test sources are scattered.
test_env = [
'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.build_root(), 'data')),
+ 'NAUTILUS_TEST_DATADIR=@0@'.format(join_paths(meson.source_root(), 'data')),
'RUNNING_TESTS=@0@'.format('TRUE')
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
