[tracker-miners/wip/carlosg/cli-improvements: 9/30] tracker-extract: Remove unused file recovery hashtable
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/cli-improvements: 9/30] tracker-extract: Remove unused file recovery hashtable
- Date: Tue, 18 Aug 2020 10:37:40 +0000 (UTC)
commit db447c9f3e152dd38f9f50ce091bc9996e0182b7
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Aug 16 15:12:29 2020 +0200
tracker-extract: Remove unused file recovery hashtable
We now fail on files after the first try, this accounting doesn't do
anything anymore.
src/tracker-extract/tracker-extract-decorator.c | 31 +------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-decorator.c b/src/tracker-extract/tracker-extract-decorator.c
index 804f19f49..cfbb3ae42 100644
--- a/src/tracker-extract/tracker-extract-decorator.c
+++ b/src/tracker-extract/tracker-extract-decorator.c
@@ -50,7 +50,6 @@ struct _TrackerExtractDecoratorPrivate {
guint n_extracting_files;
TrackerExtractPersistence *persistence;
- GHashTable *recovery_files;
GDBusProxy *index_proxy;
};
@@ -119,7 +118,6 @@ tracker_extract_decorator_finalize (GObject *object)
if (priv->timer)
g_timer_destroy (priv->timer);
- g_hash_table_unref (priv->recovery_files);
g_clear_object (&priv->index_proxy);
G_OBJECT_CLASS (tracker_extract_decorator_parent_class)->finalize (object);
@@ -162,7 +160,6 @@ get_metadata_cb (TrackerExtract *extract,
info = tracker_extract_file_finish (extract, result, &error);
tracker_extract_persistence_remove_file (priv->persistence, data->file);
- g_hash_table_remove (priv->recovery_files, tracker_decorator_info_get_url (data->decorator_info));
if (data->cancellable && data->signal_id != 0) {
g_cancellable_disconnect (data->cancellable, data->signal_id);
@@ -218,26 +215,6 @@ get_metadata_cb (TrackerExtract *extract,
g_free (data);
}
-static GFile *
-decorator_get_recovery_file (TrackerExtractDecorator *decorator,
- TrackerDecoratorInfo *info)
-{
- TrackerExtractDecoratorPrivate *priv;
- GFile *file;
-
- priv = tracker_extract_decorator_get_instance_private (decorator);
- file = g_hash_table_lookup (priv->recovery_files,
- tracker_decorator_info_get_url (info));
-
- if (file) {
- g_object_ref (file);
- } else {
- file = g_file_new_for_uri (tracker_decorator_info_get_url (info));
- }
-
- return file;
-}
-
static void
task_cancellable_cancelled_cb (GCancellable *cancellable,
ExtractData *data)
@@ -303,7 +280,7 @@ decorator_next_item_cb (TrackerDecorator *decorator,
data = g_new0 (ExtractData, 1);
data->decorator = decorator;
data->decorator_info = info;
- data->file = decorator_get_recovery_file (TRACKER_EXTRACT_DECORATOR (decorator), info);
+ data->file = g_file_new_for_uri (tracker_decorator_info_get_url (info));
task = tracker_decorator_info_get_task (info);
g_message ("Extracting metadata for '%s'", tracker_decorator_info_get_url (info));
@@ -487,12 +464,6 @@ decorator_ignore_file (GFile *file,
static void
tracker_extract_decorator_init (TrackerExtractDecorator *decorator)
{
- TrackerExtractDecoratorPrivate *priv;
-
- priv = tracker_extract_decorator_get_instance_private (decorator);
- priv->recovery_files = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_object_unref);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]