[grilo-plugins/wip/carlosg/tracker3: 5/41] tracker3: Drop show-documents configuration option



commit 55ac9206b0c6a98fbe6104fa5b4218e8813c8feb
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon May 11 13:21:18 2020 +0200

    tracker3: Drop show-documents configuration option
    
    It seems a little bit shoehorned as there's no GrlMediaType to
    express documents. Drop this configuration option as it also does
    seem unused according to codesearch.debian.net.

 src/tracker3/grl-tracker-source-api.c  | 43 ++++------------------------------
 src/tracker3/grl-tracker-source-priv.h |  1 -
 src/tracker3/grl-tracker.c             |  3 ---
 3 files changed, 4 insertions(+), 43 deletions(-)
---
diff --git a/src/tracker3/grl-tracker-source-api.c b/src/tracker3/grl-tracker-source-api.c
index 92958da5..eed651f7 100644
--- a/src/tracker3/grl-tracker-source-api.c
+++ b/src/tracker3/grl-tracker-source-api.c
@@ -96,9 +96,6 @@ GRL_LOG_DOMAIN_STATIC(tracker_source_result_log_domain);
   "OFFSET %u "                                  \
   "LIMIT %u"
 
-#define TRACKER_BROWSE_SHOW_DOCUMENTS           \
-  "{ ?urn a nfo:Document } UNION"
-
 #define TRACKER_BROWSE_CATEGORY_REQUEST         \
   "SELECT rdf:type(?urn) %s "                   \
   "WHERE "                                      \
@@ -147,16 +144,6 @@ GRL_LOG_DOMAIN_STATIC(tracker_source_result_log_domain);
   "%s "                                                 \
   "}"
 
-#define TRACKER_TEST_MEDIA_FROM_URI_REQUEST_WITH_DOCUMENTS  \
-  "SELECT ?urn "                                            \
-  "WHERE "                                                  \
-  "{ "                                                      \
-  "?urn nie:url \"%s\" ; "                                  \
-  "tracker:available true . "                               \
-  "%s "                                                     \
-  "FILTER (?type IN ( nfo:Media, nfo:Document ))"           \
-  "}"
-
 #define TRACKER_MEDIA_FROM_URI_REQUEST          \
   "SELECT rdf:type(?urn) %s "                   \
   "WHERE "                                      \
@@ -1045,9 +1032,7 @@ grl_tracker_source_browse_category (GrlSource *source,
     const char *id;
 
     id = grl_media_get_id (bs->container);
-    if (g_strcmp0 (id, "documents") == 0)
-      category = "nfo:Document";
-    else if (g_strcmp0 (id, "music") == 0)
+    if (g_strcmp0 (id, "music") == 0)
       category = "nmm:MusicPiece";
     else if (g_strcmp0 (id, "photos") == 0)
       category = "nmm:Photo";
@@ -1079,9 +1064,6 @@ grl_tracker_source_browse_category (GrlSource *source,
     /* Hardcoded categories */
     if (filter == GRL_TYPE_FILTER_ALL) {
       remaining = 3;
-      if (grl_tracker_show_documents)  {
-        remaining++;
-      }
     } else {
       remaining = 0;
       if (filter & GRL_TYPE_FILTER_AUDIO) {
@@ -1112,17 +1094,6 @@ grl_tracker_source_browse_category (GrlSource *source,
         category = "nmm:Video";
       }
     } else {
-      if (remaining == 4) {
-        media = grl_media_container_new ();
-        grl_media_set_title (media, "Documents");
-        grl_media_set_id (media, "documents");
-        grl_data_set_string (GRL_DATA (media),
-                             grl_metadata_key_tracker_category,
-                             "nfo:Document");
-        bs->callback (bs->source, bs->operation_id, media, --remaining,
-                      bs->user_data, NULL);
-      }
-
       if (filter & GRL_TYPE_FILTER_AUDIO) {
         media = grl_media_container_new ();
         grl_media_set_title (media, "Music");
@@ -1305,15 +1276,9 @@ grl_tracker_source_test_media_from_uri (GrlSource *source,
   gchar                *sparql_final;
 
   constraint = grl_tracker_source_get_device_constraint (priv);
-  if (grl_tracker_show_documents) {
-    sparql_final = g_strdup_printf (TRACKER_TEST_MEDIA_FROM_URI_REQUEST_WITH_DOCUMENTS,
-                                    uri,
-                                    constraint);
-  } else {
-    sparql_final = g_strdup_printf (TRACKER_TEST_MEDIA_FROM_URI_REQUEST,
-                                    uri,
-                                    constraint);
-  }
+  sparql_final = g_strdup_printf (TRACKER_TEST_MEDIA_FROM_URI_REQUEST,
+                                  uri,
+                                  constraint);
 
   cursor = tracker_sparql_connection_query (grl_tracker_connection,
                                             sparql_final,
diff --git a/src/tracker3/grl-tracker-source-priv.h b/src/tracker3/grl-tracker-source-priv.h
index f4954965..227e19db 100644
--- a/src/tracker3/grl-tracker-source-priv.h
+++ b/src/tracker3/grl-tracker-source-priv.h
@@ -80,7 +80,6 @@ extern GrlPlugin *grl_tracker_plugin;
 extern GrlTrackerCache *grl_tracker_item_cache;
 
 /* tracker plugin config */
-extern gboolean grl_tracker_show_documents;
 extern gchar *grl_tracker_store_path;
 
 #endif /* _GRL_TRACKER_SOURCE_PRIV_H_ */
diff --git a/src/tracker3/grl-tracker.c b/src/tracker3/grl-tracker.c
index 3b476c33..3505db59 100644
--- a/src/tracker3/grl-tracker.c
+++ b/src/tracker3/grl-tracker.c
@@ -57,7 +57,6 @@ GCancellable *grl_tracker_plugin_init_cancel = NULL;
 GrlTrackerQueue *grl_tracker_queue = NULL;
 
 /* tracker plugin config */
-gboolean grl_tracker_show_documents    = FALSE;
 gchar *grl_tracker_store_path = NULL;
 
 /* =================== Tracker Plugin  =============== */
@@ -126,8 +125,6 @@ grl_tracker3_plugin_init (GrlRegistry *registry,
 
     config = GRL_CONFIG (configs->data);
 
-    grl_tracker_show_documents =
-      grl_config_get_boolean (config, "show-documents");
     grl_tracker_store_path =
       grl_config_get_string (config, "store-path");
   }


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