From f9b068798d9a9681213b3ccd07a42850d3a63ac2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 6 May 2019 21:58:15 +0200 Subject: [PATCH] Remove obsolete 'max-media-art-width' setting We don't deal with media art in tracker-extract since commit 6a05068624bfa and ac84484dfb5dea636, mostly as it would require us to weaken the tracker-extract sandbox. --- ...rg.freedesktop.Tracker.Extract.gschema.xml | 7 ------ src/tracker-extract/tracker-config.c | 24 ------------------- src/tracker-extract/tracker-config.h | 1 - 3 files changed, 32 deletions(-) diff --git a/data/org.freedesktop.Tracker.Extract.gschema.xml b/data/org.freedesktop.Tracker.Extract.gschema.xml index e1449e747..173c9c946 100644 --- a/data/org.freedesktop.Tracker.Extract.gschema.xml +++ b/data/org.freedesktop.Tracker.Extract.gschema.xml @@ -42,13 +42,6 @@ Boston, MA 02110-1301, USA. 1048576 - - Max media art width - Maximum width in pixels for any media art extracted. Anything bigger is resized. Set to -1 to disable saving media art from files. Setting to 0 sets no limit on the media art width. - - 0 - - Wait for FS miner to be done before extracting When true, tracker-extract will wait for tracker-miner-fs to be done crawling before extracting meta-data. This option is useful on constrained environment where it is important to list files as fast as possible and can wait to get meta-data later. diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c index 20f6383f8..14b96afba 100644 --- a/src/tracker-extract/tracker-config.c +++ b/src/tracker-extract/tracker-config.c @@ -89,16 +89,6 @@ tracker_config_class_init (TrackerConfigClass *klass) 1024 * 1024, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_MAX_MEDIA_ART_WIDTH, - g_param_spec_int ("max-media-art-width", - "Max Media Art Width", - " Maximum width of the Media Art to be generated (-1=disable, 0=original width, 1->2048=max pixel width)", - -1, - 2048, - 0, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_WAIT_FOR_MINER_FS, g_param_spec_boolean ("wait-for-miner-fs", @@ -167,11 +157,6 @@ config_get_property (GObject *object, tracker_config_get_max_bytes (config)); break; - case PROP_MAX_MEDIA_ART_WIDTH: - g_value_set_int (value, - tracker_config_get_max_media_art_width (config)); - break; - case PROP_WAIT_FOR_MINER_FS: g_value_set_boolean (value, tracker_config_get_wait_for_miner_fs (config)); @@ -226,7 +211,6 @@ config_constructed (GObject *object) */ g_settings_bind (settings, "verbosity", object, "verbosity", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_GET_NO_CHANGES); g_settings_bind (settings, "sched-idle", object, "sched-idle", G_SETTINGS_BIND_GET); - g_settings_bind (settings, "max-media-art-width", object, "max-media-art-width", G_SETTINGS_BIND_GET); g_settings_bind (settings, "wait-for-miner-fs", object, "wait-for-miner-fs", G_SETTINGS_BIND_GET); /* Cache settings accessed from extractor modules, we don't want @@ -311,14 +295,6 @@ tracker_config_get_max_bytes (TrackerConfig *config) return config->max_bytes; } -gint -tracker_config_get_max_media_art_width (TrackerConfig *config) -{ - g_return_val_if_fail (TRACKER_IS_CONFIG (config), 0); - - return g_settings_get_int (G_SETTINGS (config), "max-media-art-width"); -} - gboolean tracker_config_get_wait_for_miner_fs (TrackerConfig *config) { diff --git a/src/tracker-extract/tracker-config.h b/src/tracker-extract/tracker-config.h index c8af8ef57..66cdef890 100644 --- a/src/tracker-extract/tracker-config.h +++ b/src/tracker-extract/tracker-config.h @@ -49,7 +49,6 @@ TrackerConfig *tracker_config_new (void); gint tracker_config_get_verbosity (TrackerConfig *config); gint tracker_config_get_sched_idle (TrackerConfig *config); gint tracker_config_get_max_bytes (TrackerConfig *config); -gint tracker_config_get_max_media_art_width (TrackerConfig *config); gboolean tracker_config_get_wait_for_miner_fs (TrackerConfig *config); void tracker_config_set_verbosity (TrackerConfig *config, -- GitLab