rpms/tracker
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.3.3

Browse Source
This commit is contained in:
David King 2015-02-06 09:17:11 +00:00
parent 7a89137b0a
commit f1c139c051
5 changed files with 6 additions and 818 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
View File

@ -1,59 +0,0 @@
From 59745984f91fa0c5e464c312c3a142fe3bd3b853 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 13 Jan 2015 14:51:50 +0100
Subject: [PATCH] libtracker-miner: Restrict the amount of data that is logged
for errors
SPARQL update strings can be very long if the entire text of a document
is being stored. Dumping these huge strings to the log eats up disk
space and makes them harder to follow.
However, often, the occurence of such an error indicates a broken
extractor. In those cases, knowing part of the SPARQL can help in
identifying the file that triggered the error.
Usually the "nie:plainTextContent" property is the last one in the
string, so we truncate the error messages at the first occurance of
this property to achieve the best of both worlds.
https://bugzilla.gnome.org/show_bug.cgi?id=735406
---
src/libtracker-miner/tracker-decorator.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
index b8978d8..781e4de 100644
--- a/src/libtracker-miner/tracker-decorator.c
+++ b/src/libtracker-miner/tracker-decorator.c
@@ -19,6 +19,8 @@
#include "config.h"
+#include <string.h>
+
#include "tracker-decorator.h"
#include "tracker-decorator-internal.h"
#include "tracker-priority-queue.h"
@@ -365,9 +367,17 @@ decorator_commit_cb (GObject *object,
child_error = g_ptr_array_index (errors, i);
if (child_error) {
+ gchar *msg, *p;
+
+ msg = g_strdup (g_ptr_array_index (sparql, i));
+ p = strstr (msg, "nie:plainTextContent");
+ if (p != NULL)
+ *p = '\0';
+
g_warning ("Task %d, error: %s", i, child_error->message);
- g_warning ("Sparql update was:\n%s\n",
- (gchar *) g_ptr_array_index (sparql, i));
+ g_warning ("Sparql update was:\n%s\n", msg);
+
+ g_free (msg);
}
}
--
2.1.0

621
0001-miners-Detect-locale-changes-only-when-the-miner-cou.patch
View File

@ -1,621 +0,0 @@
From b8d567197d9bc9cf371853d3a9863e8b376b7d1d Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 5 Jan 2015 16:58:36 +0100
Subject: [PATCH] miners: Detect locale changes only when the miner could be
constructed
https://bugzilla.gnome.org/show_bug.cgi?id=742391
---
src/miners/apps/tracker-miner-applications.c | 320 ++++++++++-----------
src/miners/user-guides/tracker-miner-user-guides.c | 234 ++++++++-------
2 files changed, 273 insertions(+), 281 deletions(-)
diff --git a/src/miners/apps/tracker-miner-applications.c b/src/miners/apps/tracker-miner-applications.c
index 1c9288e..a01d3dd 100644
--- a/src/miners/apps/tracker-miner-applications.c
+++ b/src/miners/apps/tracker-miner-applications.c
@@ -196,6 +196,154 @@ miner_finished_cb (TrackerMinerFS *fs,
g_free (locale_file);
}
+/* If a reset is requested, we will remove from the store all items previously
+ * inserted by the tracker-miner-applications, this is:
+ * (a) all elements which are nfo:softwareIcon of a given nfo:Software
+ * (b) all nfo:Software in our graph (includes both applications and maemo applets)
+ * (c) all elements which are nfo:softwareCategoryIcon of a given nfo:SoftwareCategory
+ * (d) all nfo:SoftwareCategory in our graph
+ */
+static void
+miner_applications_reset (TrackerMiner *miner)
+{
+ GError *error = NULL;
+ TrackerSparqlBuilder *sparql;
+
+ sparql = tracker_sparql_builder_new_update ();
+
+ /* (a) all elements which are nfo:softwareIcon of a given nfo:Software */
+ tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
+ tracker_sparql_builder_subject_variable (sparql, "icon");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "rdfs:Resource");
+ tracker_sparql_builder_delete_close (sparql);
+
+ tracker_sparql_builder_where_open (sparql);
+ tracker_sparql_builder_subject_variable (sparql, "software");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "nfo:Software");
+ tracker_sparql_builder_subject_variable (sparql, "icon");
+ tracker_sparql_builder_predicate (sparql, "nfo:softwareIcon");
+ tracker_sparql_builder_object_variable (sparql, "software");
+ tracker_sparql_builder_where_close (sparql);
+
+ /* (b) all nfo:Software in our graph (includes both applications and maemo applets) */
+ tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
+ tracker_sparql_builder_subject_variable (sparql, "software");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "rdfs:Resource");
+ tracker_sparql_builder_delete_close (sparql);
+
+ tracker_sparql_builder_where_open (sparql);
+ tracker_sparql_builder_subject_variable (sparql, "software");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "nfo:Software");
+ tracker_sparql_builder_where_close (sparql);
+
+ /* (c) all elements which are nfo:softwareCategoryIcon of a given nfo:SoftwareCategory */
+ tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
+ tracker_sparql_builder_subject_variable (sparql, "icon");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "rdfs:Resource");
+ tracker_sparql_builder_delete_close (sparql);
+
+ tracker_sparql_builder_where_open (sparql);
+ tracker_sparql_builder_subject_variable (sparql, "category");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "nfo:SoftwareCategory");
+ tracker_sparql_builder_subject_variable (sparql, "icon");
+ tracker_sparql_builder_predicate (sparql, "nfo:softwareCategoryIcon");
+ tracker_sparql_builder_object_variable (sparql, "category");
+ tracker_sparql_builder_where_close (sparql);
+
+ /* (d) all nfo:SoftwareCategory in our graph */
+ tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
+ tracker_sparql_builder_subject_variable (sparql, "category");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "rdfs:Resource");
+ tracker_sparql_builder_delete_close (sparql);
+
+ tracker_sparql_builder_where_open (sparql);
+ tracker_sparql_builder_subject_variable (sparql, "category");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "nfo:SoftwareCategory");
+ tracker_sparql_builder_where_close (sparql);
+
+ /* Execute a sync update, we don't want the apps miner to start before
+ * we finish this. */
+ tracker_sparql_connection_update (tracker_miner_get_connection (miner),
+ tracker_sparql_builder_get_result (sparql),
+ G_PRIORITY_HIGH,
+ NULL,
+ &error);
+
+ if (error) {
+ /* Some error happened performing the query, not good */
+ g_critical ("Couldn't reset mined applications: %s",
+ error ? error->message : "unknown error");
+ g_error_free (error);
+ }
+
+ g_object_unref (sparql);
+}
+
+static gboolean
+detect_locale_changed (TrackerMiner *miner)
+{
+ gchar *locale_file;
+ gchar *previous_locale = NULL;
+ gchar *current_locale;
+ gboolean changed;
+
+ locale_file = g_build_filename (g_get_user_cache_dir (), "tracker", LOCALE_FILENAME, NULL);
+
+ if (G_LIKELY (g_file_test (locale_file, G_FILE_TEST_EXISTS))) {
+ gchar *contents;
+
+ /* Check locale is correct */
+ if (G_LIKELY (g_file_get_contents (locale_file, &contents, NULL, NULL))) {
+ if (contents &&
+ contents[0] == '\0') {
+ g_critical (" Empty locale file found at '%s'", locale_file);
+ g_free (contents);
+ } else {
+ /* Re-use contents */
+ previous_locale = contents;
+ }
+ } else {
+ g_critical (" Could not get content of file '%s'", locale_file);
+ }
+ } else {
+ g_message (" Could not find locale file:'%s'", locale_file);
+ }
+
+ g_free (locale_file);
+
+ current_locale = tracker_locale_get (TRACKER_LOCALE_LANGUAGE);
+
+ /* Note that having both to NULL is actually valid, they would default
+ * to the unicode collation without locale-specific stuff. */
+ if (g_strcmp0 (previous_locale, current_locale) != 0) {
+ g_message ("Locale change detected from '%s' to '%s'...",
+ previous_locale, current_locale);
+ changed = TRUE;
+ } else {
+ g_message ("Current and previous locales match: '%s'", previous_locale);
+ changed = FALSE;
+ }
+
+ g_free (current_locale);
+ g_free (previous_locale);
+
+ if (changed) {
+ g_message ("Locale change detected, so resetting miner to "
+ "remove all previously created items...");
+ miner_applications_reset (miner);
+ }
+
+ return changed;
+}
+
static gboolean
miner_applications_initable_init (GInitable *initable,
GCancellable *cancellable,
@@ -233,6 +381,9 @@ miner_applications_initable_init (GInitable *initable,
miner_applications_add_directories (fs);
+ /* If the locales changed, we need to reset things first */
+ detect_locale_changed (TRACKER_MINER (fs));
+
return TRUE;
}
@@ -856,169 +1007,14 @@ miner_applications_process_file_attributes (TrackerMinerFS *fs,
return FALSE;
}
-/* If a reset is requested, we will remove from the store all items previously
- * inserted by the tracker-miner-applications, this is:
- * (a) all elements which are nfo:softwareIcon of a given nfo:Software
- * (b) all nfo:Software in our graph (includes both applications and maemo applets)
- * (c) all elements which are nfo:softwareCategoryIcon of a given nfo:SoftwareCategory
- * (d) all nfo:SoftwareCategory in our graph
- */
-static void
-miner_applications_reset (TrackerMiner *miner)
-{
- GError *error = NULL;
- TrackerSparqlBuilder *sparql;
-
- sparql = tracker_sparql_builder_new_update ();
-
- /* (a) all elements which are nfo:softwareIcon of a given nfo:Software */
- tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
- tracker_sparql_builder_subject_variable (sparql, "icon");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "rdfs:Resource");
- tracker_sparql_builder_delete_close (sparql);
-
- tracker_sparql_builder_where_open (sparql);
- tracker_sparql_builder_subject_variable (sparql, "software");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nfo:Software");
- tracker_sparql_builder_subject_variable (sparql, "icon");
- tracker_sparql_builder_predicate (sparql, "nfo:softwareIcon");
- tracker_sparql_builder_object_variable (sparql, "software");
- tracker_sparql_builder_where_close (sparql);
-
- /* (b) all nfo:Software in our graph (includes both applications and maemo applets) */
- tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
- tracker_sparql_builder_subject_variable (sparql, "software");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "rdfs:Resource");
- tracker_sparql_builder_delete_close (sparql);
-
- tracker_sparql_builder_where_open (sparql);
- tracker_sparql_builder_subject_variable (sparql, "software");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nfo:Software");
- tracker_sparql_builder_where_close (sparql);
-
- /* (c) all elements which are nfo:softwareCategoryIcon of a given nfo:SoftwareCategory */
- tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
- tracker_sparql_builder_subject_variable (sparql, "icon");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "rdfs:Resource");
- tracker_sparql_builder_delete_close (sparql);
-
- tracker_sparql_builder_where_open (sparql);
- tracker_sparql_builder_subject_variable (sparql, "category");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nfo:SoftwareCategory");
- tracker_sparql_builder_subject_variable (sparql, "icon");
- tracker_sparql_builder_predicate (sparql, "nfo:softwareCategoryIcon");
- tracker_sparql_builder_object_variable (sparql, "category");
- tracker_sparql_builder_where_close (sparql);
-
- /* (d) all nfo:SoftwareCategory in our graph */
- tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
- tracker_sparql_builder_subject_variable (sparql, "category");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "rdfs:Resource");
- tracker_sparql_builder_delete_close (sparql);
-
- tracker_sparql_builder_where_open (sparql);
- tracker_sparql_builder_subject_variable (sparql, "category");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nfo:SoftwareCategory");
- tracker_sparql_builder_where_close (sparql);
-
- /* Execute a sync update, we don't want the apps miner to start before
- * we finish this. */
- tracker_sparql_connection_update (tracker_miner_get_connection (miner),
- tracker_sparql_builder_get_result (sparql),
- G_PRIORITY_HIGH,
- NULL,
- &error);
-
- if (error) {
- /* Some error happened performing the query, not good */
- g_critical ("Couldn't reset mined applications: %s",
- error ? error->message : "unknown error");
- g_error_free (error);
- }
-
- g_object_unref (sparql);
-}
-
-static gboolean
-detect_locale_changed (TrackerMiner *miner)
-{
- gchar *locale_file;
- gchar *previous_locale = NULL;
- gchar *current_locale;
- gboolean changed;
-
- locale_file = g_build_filename (g_get_user_cache_dir (), "tracker", LOCALE_FILENAME, NULL);
-
- if (G_LIKELY (g_file_test (locale_file, G_FILE_TEST_EXISTS))) {
- gchar *contents;
-
- /* Check locale is correct */
- if (G_LIKELY (g_file_get_contents (locale_file, &contents, NULL, NULL))) {
- if (contents &&
- contents[0] == '\0') {
- g_critical (" Empty locale file found at '%s'", locale_file);
- g_free (contents);
- } else {
- /* Re-use contents */
- previous_locale = contents;
- }
- } else {
- g_critical (" Could not get content of file '%s'", locale_file);
- }
- } else {
- g_message (" Could not find locale file:'%s'", locale_file);
- }
-
- g_free (locale_file);
-
- current_locale = tracker_locale_get (TRACKER_LOCALE_LANGUAGE);
-
- /* Note that having both to NULL is actually valid, they would default
- * to the unicode collation without locale-specific stuff. */
- if (g_strcmp0 (previous_locale, current_locale) != 0) {
- g_message ("Locale change detected from '%s' to '%s'...",
- previous_locale, current_locale);
- changed = TRUE;
- } else {
- g_message ("Current and previous locales match: '%s'", previous_locale);
- changed = FALSE;
- }
-
- g_free (current_locale);
- g_free (previous_locale);
-
- if (changed) {
- g_message ("Locale change detected, so resetting miner to "
- "remove all previously created items...");
- miner_applications_reset (miner);
- }
-
- return changed;
-}
-
TrackerMiner *
tracker_miner_applications_new (GError **error)
{
- TrackerMiner *miner;
-
- miner = g_initable_new (TRACKER_TYPE_MINER_APPLICATIONS,
- NULL,
- error,
- "name", "Applications",
- "processing-pool-wait-limit", 10,
- "processing-pool-ready-limit", 100,
- NULL);
-
- /* If the locales changed, we need to reset things first */
- detect_locale_changed (miner);
-
- return miner;
+ return g_initable_new (TRACKER_TYPE_MINER_APPLICATIONS,
+ NULL,
+ error,
+ "name", "Applications",
+ "processing-pool-wait-limit", 10,
+ "processing-pool-ready-limit", 100,
+ NULL);
}
diff --git a/src/miners/user-guides/tracker-miner-user-guides.c b/src/miners/user-guides/tracker-miner-user-guides.c
index 5d8307a..59dfc40 100644
--- a/src/miners/user-guides/tracker-miner-user-guides.c
+++ b/src/miners/user-guides/tracker-miner-user-guides.c
@@ -248,6 +248,111 @@ miner_finished_cb (TrackerMinerFS *fs,
g_free (locale_file);
}
+/* If a reset is requested, we will remove from the store all items previously
+ * inserted by the tracker-miner-userguides, this is:
+ * (a) Remove all resources which are a nfo:HelpDocument
+ * (b) Remove all unnecessary directories
+ */
+static void
+miner_userguides_reset (TrackerMiner *miner)
+{
+ GError *error = NULL;
+ TrackerSparqlBuilder *sparql;
+
+ sparql = tracker_sparql_builder_new_update ();
+
+ /* (a) Remove all resources which are a nfo:HelpDocument */
+ tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
+ tracker_sparql_builder_subject_variable (sparql, "userguide");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "rdfs:Resource");
+ tracker_sparql_builder_delete_close (sparql);
+
+ tracker_sparql_builder_where_open (sparql);
+ tracker_sparql_builder_subject_variable (sparql, "userguide");
+ tracker_sparql_builder_predicate (sparql, "a");
+ tracker_sparql_builder_object (sparql, "nfo:HelpDocument");
+ tracker_sparql_builder_where_close (sparql);
+
+ /* (b) Remove all unnecessary directories */
+ /* TODO: Finish */
+
+
+ /* Execute a sync update, we don't want the userguides miner to start before
+ * we finish this. */
+ tracker_sparql_connection_update (tracker_miner_get_connection (miner),
+ tracker_sparql_builder_get_result (sparql),
+ G_PRIORITY_HIGH,
+ NULL,
+ &error);
+
+ if (error) {
+ /* Some error happened performing the query, not good */
+ g_critical ("Couldn't reset mined userguides: %s",
+ error ? error->message : "unknown error");
+ g_error_free (error);
+ }
+
+ g_object_unref (sparql);
+}
+
+static gboolean
+detect_locale_changed (TrackerMiner *miner)
+{
+ gchar *locale_file;
+ gchar *previous_locale = NULL;
+ gchar *current_locale;
+ gboolean changed;
+
+ locale_file = g_build_filename (g_get_user_cache_dir (), "tracker", LOCALE_FILENAME, NULL);
+
+ if (G_LIKELY (g_file_test (locale_file, G_FILE_TEST_EXISTS))) {
+ gchar *contents;
+
+ /* Check locale is correct */
+ if (G_LIKELY (g_file_get_contents (locale_file, &contents, NULL, NULL))) {
+ if (contents &&
+ contents[0] == '\0') {
+ g_critical (" Empty locale file found at '%s'", locale_file);
+ g_free (contents);
+ } else {
+ /* Re-use contents */
+ previous_locale = contents;
+ }
+ } else {
+ g_critical (" Could not get content of file '%s'", locale_file);
+ }
+ } else {
+ g_message (" Could not find locale file:'%s'", locale_file);
+ }
+
+ g_free (locale_file);
+
+ current_locale = tracker_locale_get (TRACKER_LOCALE_LANGUAGE);
+
+ /* Note that having both to NULL is actually valid, they would default
+ * to the unicode collation without locale-specific stuff. */
+ if (g_strcmp0 (previous_locale, current_locale) != 0) {
+ g_message ("Locale change detected from '%s' to '%s'...",
+ previous_locale, current_locale);
+ changed = TRUE;
+ } else {
+ g_message ("Current and previous locales match: '%s'", previous_locale);
+ changed = FALSE;
+ }
+
+ g_free (current_locale);
+ g_free (previous_locale);
+
+ if (changed) {
+ g_message ("Locale change detected, so resetting miner to "
+ "remove all previously created items...");
+ miner_userguides_reset (miner);
+ }
+
+ return changed;
+}
+
static gboolean
miner_userguides_initable_init (GInitable *initable,
GCancellable *cancellable,
@@ -282,6 +387,9 @@ miner_userguides_initable_init (GInitable *initable,
miner_userguides_add_directories (fs);
+ /* If the locales changed, we need to reset things first */
+ detect_locale_changed (TRACKER_MINER (fs));
+
return TRUE;
}
@@ -657,126 +765,14 @@ parser_get_file_content (const gchar *uri,
g_strstrip (*content);
}
-/* If a reset is requested, we will remove from the store all items previously
- * inserted by the tracker-miner-userguides, this is:
- * (a) Remove all resources which are a nfo:HelpDocument
- * (b) Remove all unnecessary directories
- */
-static void
-miner_userguides_reset (TrackerMiner *miner)
-{
- GError *error = NULL;
- TrackerSparqlBuilder *sparql;
-
- sparql = tracker_sparql_builder_new_update ();
-
- /* (a) Remove all resources which are a nfo:HelpDocument */
- tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
- tracker_sparql_builder_subject_variable (sparql, "userguide");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "rdfs:Resource");
- tracker_sparql_builder_delete_close (sparql);
-
- tracker_sparql_builder_where_open (sparql);
- tracker_sparql_builder_subject_variable (sparql, "userguide");
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nfo:HelpDocument");
- tracker_sparql_builder_where_close (sparql);
-
- /* (b) Remove all unnecessary directories */
- /* TODO: Finish */
-
-
- /* Execute a sync update, we don't want the userguides miner to start before
- * we finish this. */
- tracker_sparql_connection_update (tracker_miner_get_connection (miner),
- tracker_sparql_builder_get_result (sparql),
- G_PRIORITY_HIGH,
- NULL,
- &error);
-
- if (error) {
- /* Some error happened performing the query, not good */
- g_critical ("Couldn't reset mined userguides: %s",
- error ? error->message : "unknown error");
- g_error_free (error);
- }
-
- g_object_unref (sparql);
-}
-
-static gboolean
-detect_locale_changed (TrackerMiner *miner)
-{
- gchar *locale_file;
- gchar *previous_locale = NULL;
- gchar *current_locale;
- gboolean changed;
-
- locale_file = g_build_filename (g_get_user_cache_dir (), "tracker", LOCALE_FILENAME, NULL);
-
- if (G_LIKELY (g_file_test (locale_file, G_FILE_TEST_EXISTS))) {
- gchar *contents;
-
- /* Check locale is correct */
- if (G_LIKELY (g_file_get_contents (locale_file, &contents, NULL, NULL))) {
- if (contents &&
- contents[0] == '\0') {
- g_critical (" Empty locale file found at '%s'", locale_file);
- g_free (contents);
- } else {
- /* Re-use contents */
- previous_locale = contents;
- }
- } else {
- g_critical (" Could not get content of file '%s'", locale_file);
- }
- } else {
- g_message (" Could not find locale file:'%s'", locale_file);
- }
-
- g_free (locale_file);
-
- current_locale = tracker_locale_get (TRACKER_LOCALE_LANGUAGE);
-
- /* Note that having both to NULL is actually valid, they would default
- * to the unicode collation without locale-specific stuff. */
- if (g_strcmp0 (previous_locale, current_locale) != 0) {
- g_message ("Locale change detected from '%s' to '%s'...",
- previous_locale, current_locale);
- changed = TRUE;
- } else {
- g_message ("Current and previous locales match: '%s'", previous_locale);
- changed = FALSE;
- }
-
- g_free (current_locale);
- g_free (previous_locale);
-
- if (changed) {
- g_message ("Locale change detected, so resetting miner to "
- "remove all previously created items...");
- miner_userguides_reset (miner);
- }
-
- return changed;
-}
-
TrackerMiner *
tracker_miner_userguides_new (GError **error)
{
- TrackerMiner *miner;
-
- miner = g_initable_new (TRACKER_TYPE_MINER_USERGUIDES,
- NULL,
- error,
- "name", "Userguides",
- "processing-pool-wait-limit", 10,
- "processing-pool-ready-limit", 100,
- NULL);
-
- /* If the locales changed, we need to reset things first */
- detect_locale_changed (miner);
-
- return miner;
+ return g_initable_new (TRACKER_TYPE_MINER_USERGUIDES,
+ NULL,
+ error,
+ "name", "Userguides",
+ "processing-pool-wait-limit", 10,
+ "processing-pool-ready-limit", 100,
+ NULL);
}
--
2.1.0

2
sources
View File

@ -1 +1 @@
2411b648158b01ea815de41a70c297d7 tracker-1.3.2.tar.xz bab46bb617641f62802af18e83410e75 tracker-1.3.3.tar.xz

118
tracker-1.3.2-libmediaart-2.0.patch
View File

@ -1,118 +0,0 @@
From a87a0319b170276284edaeb6e61bd1c0fe41a834 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti@declera.com>
Date: Tue, 20 Jan 2015 17:35:12 +0200
Subject: Mechanically adjust for libmediaart-2.0
https://bugzilla.gnome.org/show_bug.cgi?id=743250
diff --git a/configure.ac b/configure.ac
index ec8b150..017b4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,7 +231,7 @@ NETWORK_MANAGER_REQUIRED=0.8
GSTREAMER_REQUIRED=0.10.31
GUPNP_DLNA_REQUIRED=0.9.4
LIBPNG_REQUIRED=0.89
-LIBMEDIAART_REQUIRED=0.5.0
+LIBMEDIAART_REQUIRED=1.9.0
# 3.6.11 for sqlite_backup API
# 3.6.16 to fix test failures
@@ -1107,7 +1107,7 @@ AC_ARG_ENABLE(libmediaart,
if test "x$enable_libmediaart" != "xno" ; then
PKG_CHECK_MODULES(LIBMEDIAART,
- [libmediaart-1.0 >= $LIBMEDIAART_REQUIRED],
+ [libmediaart-2.0 >= $LIBMEDIAART_REQUIRED],
[have_libmediaart=yes],
[have_libmediaart=no])
@@ -1124,7 +1124,7 @@ if test "x$enable_libmediaart" != "xno" ; then
TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $LIBMEDIAART_LIBS"
# Used for .pc file...
- LIBTRACKER_MINER_PC_REQUIRES="libmediaart-1.0"
+ LIBTRACKER_MINER_PC_REQUIRES="libmediaart-2.0"
AC_SUBST(LIBTRACKER_MINER_PC_REQUIRES)
if test "x$have_libmediaart" = "xyes"; then
diff --git a/src/libtracker-miner/tracker-media-art.c b/src/libtracker-miner/tracker-media-art.c
index c0559e9..cbba55d 100644
--- a/src/libtracker-miner/tracker-media-art.c
+++ b/src/libtracker-miner/tracker-media-art.c
@@ -96,16 +96,16 @@ on_query_finished (GObject *source_object,
/* The get_path API does stripping itself */
media_art_get_path (artist,
album,
- "album", NULL,
- &target, NULL);
+ "album",
+ &target);
g_hash_table_replace (table, target, target);
/* Also add the file to which the symlinks are made */
media_art_get_path (NULL,
album,
- "album", NULL,
- &album_path, NULL);
+ "album",
+ &album_path);
g_hash_table_replace (table, album_path, album_path);
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 7d52e0b..ef56d88 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -1661,6 +1661,7 @@ tracker_extract_gstreamer (const gchar *uri,
extractor->media_art_buffer_mime,
extractor->media_art_artist,
extractor->media_art_title,
+ NULL,
&error);
} else {
success = media_art_process_file (media_art_process,
@@ -1669,6 +1670,7 @@ tracker_extract_gstreamer (const gchar *uri,
tracker_extract_info_get_file (info),
extractor->media_art_artist,
extractor->media_art_title,
+ NULL,
&error);
}
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index f2ef306..b93e4f4 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -2675,6 +2675,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
md.media_art_mime,
md.performer,
md.title,
+ NULL,
&error);
} else {
success = media_art_process_file (media_art_process,
@@ -2683,6 +2684,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
file,
md.performer,
md.title,
+ NULL,
&error);
}
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index e619650..91c383c 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -527,6 +527,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
file,
vd.album_artist ? vd.album_artist : vd.artist,
vd.album,
+ NULL,
&error);
if (!success || error) {
--
cgit v0.10.1

24
tracker.spec
View File

@ -15,8 +15,8 @@
%endif %endif
Name: tracker Name: tracker
Version: 1.3.2 Version: 1.3.3
Release: 5%{?dist} Release: 1%{?dist}
Summary: Desktop-neutral search tool and indexer Summary: Desktop-neutral search tool and indexer
Group: Applications/System Group: Applications/System
@ -28,15 +28,6 @@ Source0: https://download.gnome.org/sources/%{name}/1.3/%{name}-%{version
# https://bugzilla.redhat.com/show_bug.cgi?id=771601 # https://bugzilla.redhat.com/show_bug.cgi?id=771601
Patch0: 0001-Only-autostart-in-GNOME-771601.patch Patch0: 0001-Only-autostart-in-GNOME-771601.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=742391
Patch1: 0001-miners-Detect-locale-changes-only-when-the-miner-cou.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=735406
Patch2: 0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=743250
Patch3: tracker-1.3.2-libmediaart-2.0.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: firefox BuildRequires: firefox
BuildRequires: giflib-devel BuildRequires: giflib-devel
@ -87,9 +78,6 @@ BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(vorbisfile)
# Needed for autoreconf
BuildRequires: autoconf automake libtool
Obsoletes: compat-tracker018 < 0.17.2-2 Obsoletes: compat-tracker018 < 0.17.2-2
Obsoletes: tracker-miner-flickr < 0.16.0 Obsoletes: tracker-miner-flickr < 0.16.0
Obsoletes: tracker-nautilus-plugin < 0.17.2-2 Obsoletes: tracker-nautilus-plugin < 0.17.2-2
@ -184,11 +172,6 @@ This package contains the documentation for tracker
%setup -q %setup -q
%patch0 -p1 -b .autostart-gnome %patch0 -p1 -b .autostart-gnome
%patch1 -p1 -b .detect-locale-changes
%patch2 -p1 -b .restrict-logs
%patch3 -p1 -b .mediaart-2.0
autoreconf --force --install
## nuke unwanted rpaths, see also ## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@ -335,6 +318,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog %changelog
* Fri Feb 06 2015 David King <amigadave@amigadave.com> - 1.3.3-1
- Update to 1.3.3
* Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 1.3.2-5 * Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 1.3.2-5
- rebuild for ICU 54.1 - rebuild for ICU 54.1