[tracker-miners/wip/carlosg/writeback-refactor: 10/12] data: Drop enable-writeback gsettings key



commit 642a6bc0eb57effe3c6e1b5392371434ee9dee23
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed May 20 14:23:02 2020 +0200

    data: Drop enable-writeback gsettings key
    
    Writeback requests are now explicit, this setting went unused.

 ...org.freedesktop.Tracker.Miner.Files.gschema.xml |  6 -----
 src/miners/fs/tracker-config.c                     | 28 ----------------------
 src/miners/fs/tracker-config.h                     |  1 -
 tests/functional-tests/fixtures.py                 |  6 -----
 4 files changed, 41 deletions(-)
---
diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml 
b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
index 4c572237e..3e5b6c149 100644
--- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
+++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
@@ -68,12 +68,6 @@ Boston, MA  02110-1301, USA.
       <default>true</default>
     </key>
 
-    <key name="enable-writeback" type="b">
-      <summary>Enable writeback</summary>
-      <description>Set to false to completely disable any file writeback</description>
-      <default>true</default>
-    </key>
-
     <key name="index-removable-devices" type="b">
       <summary>Index removable devices</summary>
       <description>Set to true to enable indexing mounted directories for removable devices.</description>
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index 656f705ea..fd006971f 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -48,7 +48,6 @@
 #define DEFAULT_LOW_DISK_SPACE_LIMIT             1        /* 0->100 / -1 */
 #define DEFAULT_CRAWLING_INTERVAL                -1       /* 0->365 / -1 / -2 */
 #define DEFAULT_REMOVABLE_DAYS_THRESHOLD         3        /* 1->365 / 0  */
-#define DEFAULT_ENABLE_WRITEBACK                 FALSE
 
 typedef struct {
        /* IMPORTANT: There are 3 versions of the directories:
@@ -117,10 +116,6 @@ enum {
        PROP_IGNORED_FILES,
        PROP_CRAWLING_INTERVAL,
        PROP_REMOVABLE_DAYS_THRESHOLD,
-
-       /* Writeback */
-       PROP_ENABLE_WRITEBACK
-
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (TrackerConfig, tracker_config, G_TYPE_SETTINGS)
@@ -275,15 +270,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
                                                           365,
                                                           DEFAULT_REMOVABLE_DAYS_THRESHOLD,
                                                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-       /* Writeback */
-       g_object_class_install_property (object_class,
-                                        PROP_ENABLE_WRITEBACK,
-                                        g_param_spec_boolean ("enable-writeback",
-                                                              "Enable Writeback",
-                                                              "Set to false to disable writeback",
-                                                              DEFAULT_ENABLE_WRITEBACK,
-                                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -430,11 +416,6 @@ config_get_property (GObject    *object,
                g_value_set_int (value, tracker_config_get_removable_days_threshold (config));
                break;
 
-       /* Writeback */
-       case PROP_ENABLE_WRITEBACK:
-               g_value_set_boolean (value, tracker_config_get_enable_writeback (config));
-               break;
-
        /* Did we miss any new properties? */
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -652,7 +633,6 @@ config_constructed (GObject *object)
        g_settings_bind (settings, "low-disk-space-limit", object, "low-disk-space-limit", 
G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "removable-days-threshold", object, "removable-days-threshold", 
G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "enable-monitors", object, "enable-monitors", G_SETTINGS_BIND_GET);
-       g_settings_bind (settings, "enable-writeback", object, "enable-writeback", G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "index-removable-devices", object, "index-removable-devices", 
G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "index-optical-discs", object, "index-optical-discs", G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "index-on-battery", object, "index-on-battery", G_SETTINGS_BIND_GET);
@@ -725,14 +705,6 @@ tracker_config_get_enable_monitors (TrackerConfig *config)
        return g_settings_get_boolean (G_SETTINGS (config), "enable-monitors");
 }
 
-gboolean
-tracker_config_get_enable_writeback (TrackerConfig *config)
-{
-       g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_ENABLE_WRITEBACK);
-
-       return g_settings_get_boolean (G_SETTINGS (config), "enable-writeback");
-}
-
 gint
 tracker_config_get_throttle (TrackerConfig *config)
 {
diff --git a/src/miners/fs/tracker-config.h b/src/miners/fs/tracker-config.h
index 97e171355..5511c6c6e 100644
--- a/src/miners/fs/tracker-config.h
+++ b/src/miners/fs/tracker-config.h
@@ -63,7 +63,6 @@ GSList *       tracker_config_get_ignored_directories_with_content (TrackerConfi
 GSList *       tracker_config_get_ignored_files                    (TrackerConfig *config);
 gint           tracker_config_get_crawling_interval                (TrackerConfig *config);
 gint           tracker_config_get_removable_days_threshold         (TrackerConfig *config);
-gboolean       tracker_config_get_enable_writeback                 (TrackerConfig *config);
 
 void           tracker_config_set_initial_sleep                    (TrackerConfig *config,
                                                                     gint           value);
diff --git a/tests/functional-tests/fixtures.py b/tests/functional-tests/fixtures.py
index a226b4b0b..95f27c7c8 100644
--- a/tests/functional-tests/fixtures.py
+++ b/tests/functional-tests/fixtures.py
@@ -81,7 +81,6 @@ class TrackerMinerTest(ut.TestCase):
     def config(self):
         settings = {
             'org.freedesktop.Tracker3.Miner.Files': {
-                'enable-writeback': GLib.Variant.new_boolean(False),
                 'index-recursive-directories': GLib.Variant.new_strv([self.indexed_dir]),
                 'index-single-directories': GLib.Variant.new_strv([]),
                 'index-optical-discs': GLib.Variant.new_boolean(False),
@@ -404,11 +403,6 @@ class TrackerWritebackTest (TrackerMinerTest):
     Start all processes including writeback, miner pointing to WRITEBACK_TMP_DIR
     """
 
-    def config(self):
-        values = super(TrackerWritebackTest, self).config()
-        values['org.freedesktop.Tracker3.Miner.Files']['enable-writeback'] = GLib.Variant.new_boolean(True)
-        return values
-
     def datadir_path(self, filename):
         """Returns the full path to a writeback test file."""
         datadir = os.path.join(os.path.dirname(__file__), 'test-writeback-data')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]