From 39eeab3f4fa94d333f0a7bb05c3d81472c2c00ff Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 1 Sep 2020 15:54:26 +0200 Subject: [PATCH 1/3] Disable miner autostart by default For GNOME 3.38, Tracker 3 is only used by two apps: Totem and Music. Thus, disable the miners by default so they only start when needed. --- meson_options.txt | 2 ++ src/miners/fs/meson.build | 10 +++++++--- src/miners/rss/meson.build | 10 +++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 3420973ab..4ef4dd9ff 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,6 +83,8 @@ option('generic_media_extractor', type: 'combo', choices: ['auto', 'gstreamer', option('gstreamer_backend', type: 'combo', choices: ['discoverer', 'gupnp'], value: 'discoverer', description: 'When GStreamer is used, this enables one of the (discoverer, gupnp) GStreamer backends') +option('autostart', type: 'boolean', value: false, + description: 'Install .desktop files into $sysconfdir/xdg/autostart so miners start along with desktop session') option('dbus_services_dir', type: 'string', description: 'Directory to install D-Bus .service files (value from dbus-1.pc is used by default)') option('systemd_user_services', type: 'boolean', value: true, diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build index e700dee6f..d6ec6fe03 100644 --- a/src/miners/fs/meson.build +++ b/src/miners/fs/meson.build @@ -51,9 +51,13 @@ dbus_service_file = configure_file( desktop_file = configure_file( input: 'tracker-miner-fs.desktop.in', output: 'tracker-miner-fs-@0@.desktop'.format(tracker_api_major), - configuration: conf, - install: true, - install_dir: xdg_autostart_dir) + configuration: conf) + +if get_option('autostart') + install_data(desktop_file, + install: true, + install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart')) +endif if get_option('systemd_user_services') # This file allows starting the service as a systemd user service. diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build index 84eaa6bc0..5f83c6bcb 100644 --- a/src/miners/rss/meson.build +++ b/src/miners/rss/meson.build @@ -27,9 +27,13 @@ dbus_service_file = configure_file( desktop_file = configure_file( input: 'tracker-miner-rss.desktop.in', output: 'tracker-miner-rss-@0@.desktop'.format(tracker_api_major), - configuration: conf, - install: true, - install_dir: xdg_autostart_dir) + configuration: conf) + +if get_option('autostart') + install_data(desktop_file, + install: true, + install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart')) +endif if get_option('systemd_user_services') # This file allows starting the service as a systemd user service. -- GitLab From a2026e4f7afb5a3f3de650206aca70ba3c24add7 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 3 Sep 2020 16:33:31 +0200 Subject: [PATCH 2/3] Use different settings paths to Tracker 2 --- data/org.freedesktop.Tracker.Extract.gschema.xml | 2 +- data/org.freedesktop.Tracker.FTS.gschema.xml | 2 +- data/org.freedesktop.Tracker.Miner.Files.gschema.xml | 2 +- src/libtracker-miners-common/tracker-fts-config.c | 2 +- src/miners/fs/tracker-config.c | 2 +- src/tracker-extract/tracker-config.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/org.freedesktop.Tracker.Extract.gschema.xml b/data/org.freedesktop.Tracker.Extract.gschema.xml index e1a418686..cc94d59e4 100644 --- a/data/org.freedesktop.Tracker.Extract.gschema.xml +++ b/data/org.freedesktop.Tracker.Extract.gschema.xml @@ -18,7 +18,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + Max bytes to extract Maximum number of UTF-8 bytes to extract. diff --git a/data/org.freedesktop.Tracker.FTS.gschema.xml b/data/org.freedesktop.Tracker.FTS.gschema.xml index d9820a2ce..ca4fb2eec 100644 --- a/data/org.freedesktop.Tracker.FTS.gschema.xml +++ b/data/org.freedesktop.Tracker.FTS.gschema.xml @@ -18,7 +18,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + Enable stemmer diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml index dd4a106a6..ca9125609 100644 --- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml +++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml @@ -18,7 +18,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + Initial sleep Initial sleep time, in seconds. diff --git a/src/libtracker-miners-common/tracker-fts-config.c b/src/libtracker-miners-common/tracker-fts-config.c index 1bbc64ec5..83cb54b4e 100644 --- a/src/libtracker-miners-common/tracker-fts-config.c +++ b/src/libtracker-miners-common/tracker-fts-config.c @@ -32,7 +32,7 @@ #include "tracker-fts-config.h" #define CONFIG_SCHEMA "org.freedesktop.Tracker3.FTS" -#define CONFIG_PATH "/org/freedesktop/tracker/fts/" +#define CONFIG_PATH "/org/freedesktop/tracker3/fts/" /* Default values */ #define DEFAULT_IGNORE_NUMBERS TRUE diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c index fd006971f..556002af8 100644 --- a/src/miners/fs/tracker-config.c +++ b/src/miners/fs/tracker-config.c @@ -34,7 +34,7 @@ #include "tracker-config.h" #define CONFIG_SCHEMA "org.freedesktop.Tracker3.Miner.Files" -#define CONFIG_PATH "/org/freedesktop/tracker/miner/files/" +#define CONFIG_PATH "/org/freedesktop/tracker3/miner/files/" /* Default values */ #define DEFAULT_INITIAL_SLEEP 15 /* 0->1000 */ diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c index 426bba67c..4070fbed6 100644 --- a/src/tracker-extract/tracker-config.c +++ b/src/tracker-extract/tracker-config.c @@ -28,7 +28,7 @@ #include "tracker-config.h" #define CONFIG_SCHEMA "org.freedesktop.Tracker3.Extract" -#define CONFIG_PATH "/org/freedesktop/tracker/extract/" +#define CONFIG_PATH "/org/freedesktop/tracker3/extract/" static void config_set_property (GObject *object, guint param_id, -- GitLab From e846f64e5a8a72cbda5d3ecc9a3c1673a5f3b094 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 3 Sep 2020 16:34:44 +0200 Subject: [PATCH 3/3] Limit indexing to music and videos by default In GNOME 3.38 the first adopters of Tracker 3 are Totem and Music. Only index the directories which they use. --- meson_options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 4ef4dd9ff..ab95f194b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,10 +20,10 @@ option('domain_prefix', type: 'string', value: 'org.freedesktop', option('miner_fs_cache_location', type: 'string', value: '', description: 'Location of the miner cache, only used when domain_prefix is not \'org.freedesktop\'') option('default_index_recursive_dirs', type: 'array', - value: [ '&DESKTOP', '&DOCUMENTS', '&MUSIC', '&PICTURES', '&VIDEOS' ], + value: [ '&MUSIC', '&VIDEOS' ], description: 'List of directories to index recursively') option('default_index_single_dirs', type: 'array', - value: [ '$HOME', '&DOWNLOAD' ], + value: [ ], description: 'List of directories to index without inspecting subfolders') option('network_manager', type: 'feature', value: 'auto', -- GitLab