[tracker-miners/wip/carlosg/dbus-api-changes: 28/29] Add IndexLocation method call to replace IndexFile
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/dbus-api-changes: 28/29] Add IndexLocation method call to replace IndexFile
- Date: Sat, 1 Aug 2020 11:55:02 +0000 (UTC)
commit 4942a6feb89ad42cc9a974994ff4baaa3189c751
Author: Sam Thursfield <sam afuera me uk>
Date: Thu Jul 9 02:07:53 2020 +0200
Add IndexLocation method call to replace IndexFile
The method call takes a flags parameter, allowing more control
over its behaviour in Tracker 3. The flags are unused at the
moment, meant as an extension point to specify behavior.
src/libtracker-miners-common/tracker-enums.h | 4 +
src/miners/fs/tracker-main.c | 2 +-
.../org.freedesktop.Tracker3.Miner.Files.Index.xml | 5 +-
.../org.freedesktop.Tracker3.Miner.Files.Proxy.xml | 2 +-
src/tracker-control/tracker-miner-files-index.c | 52 +++++--
.../tracker-miner-files-peer-listener.c | 3 +-
.../tracker-miner-files-peer-listener.h | 4 +-
src/tracker/tracker-index.c | 2 +-
src/tracker/tracker-miner-manager.c | 156 ++++++++++++++-------
src/tracker/tracker-miner-manager.h | 30 ++--
src/tracker/tracker-reset.c | 2 +-
tests/functional-tests/extractor-decorator.py | 2 +-
tests/functional-tests/miner-basic.py | 2 +-
tests/functional-tests/minerhelper.py | 4 +-
14 files changed, 190 insertions(+), 80 deletions(-)
---
diff --git a/src/libtracker-miners-common/tracker-enums.h b/src/libtracker-miners-common/tracker-enums.h
index d54b97b90..acd64937d 100644
--- a/src/libtracker-miners-common/tracker-enums.h
+++ b/src/libtracker-miners-common/tracker-enums.h
@@ -33,6 +33,10 @@ typedef enum {
TRACKER_SERIALIZATION_FORMAT_JSON_LD,
} TrackerSerializationFormat;
+typedef enum {
+ TRACKER_INDEX_LOCATION_FLAGS_NONE = 0,
+} TrackerIndexLocationFlags;
+
G_END_DECLS
#endif /* __TRACKER_ENUMS_H__ */
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 701c86594..24255b058 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -822,7 +822,7 @@ update_indexed_files_from_proxy (TrackerMinerFiles *miner,
GVariant *v;
gint i;
- v = g_dbus_proxy_get_cached_property (proxy, "IndexedFiles");
+ v = g_dbus_proxy_get_cached_property (proxy, "IndexedLocations");
if (v)
indexed_uris = g_variant_get_strv (v, NULL);
diff --git a/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Index.xml
b/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Index.xml
index 12c35e493..e368f1e20 100644
--- a/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Index.xml
+++ b/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Index.xml
@@ -1,8 +1,11 @@
<node>
<interface name='org.freedesktop.Tracker3.Miner.Files.Index'>
- <method name='IndexFile'>
+ <method name='IndexLocation'>
<arg type='s' name='file_uri' direction='in' />
<arg type='as' name='graphs' direction='in' />
+ <arg type='as' name='flags' direction='in'>"
+ <doc:doc><doc:summary>Extension flags, no allowed values at the moment</doc:summary></doc:doc>
+ </arg>
</method>
</interface>
</node>
diff --git a/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Proxy.xml
b/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Proxy.xml
index a04161ab1..e6504176d 100644
--- a/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Proxy.xml
+++ b/src/tracker-control/org.freedesktop.Tracker3.Miner.Files.Proxy.xml
@@ -1,6 +1,6 @@
<node>
<interface name='org.freedesktop.Tracker3.Miner.Files.Proxy'>
<property name='Graphs' type='as' access='read' />
- <property name='IndexedFiles' type='as' access='read' />
+ <property name='IndexedLocations' type='as' access='read' />
</interface>
</node>
diff --git a/src/tracker-control/tracker-miner-files-index.c b/src/tracker-control/tracker-miner-files-index.c
index 27fd0e505..75f15d2ed 100644
--- a/src/tracker-control/tracker-miner-files-index.c
+++ b/src/tracker-control/tracker-miner-files-index.c
@@ -20,6 +20,8 @@
#include "config-miners.h"
#include <libtracker-miners-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-enums.h>
+#include <libtracker-miners-common/tracker-miners-enum-types.h>
#include <libtracker-sparql/tracker-sparql.h>
#include <libtracker-miner/tracker-miner.h>
@@ -129,6 +131,32 @@ index_finalize (GObject *object)
g_strfreev (priv->graphs);
}
+static TrackerIndexLocationFlags
+parse_index_location_flags (const gchar * const *flags_strv)
+{
+ TrackerIndexLocationFlags flags = 0;
+ GFlagsClass *type_class;
+ GFlagsValue *value;
+
+ type_class = g_type_class_ref (TRACKER_TYPE_INDEX_LOCATION_FLAGS);
+
+ while (*flags_strv) {
+ const gchar *flag_string = *flags_strv;
+
+ value = g_flags_get_value_by_nick (type_class, flag_string);
+
+ if (value != NULL) {
+ flags |= value->value;
+ }
+
+ flags_strv ++;
+ }
+
+ g_type_class_unref (type_class);
+
+ return flags;
+}
+
static void
update_indexed_files (TrackerMinerFilesIndex *index)
{
@@ -136,19 +164,21 @@ update_indexed_files (TrackerMinerFilesIndex *index)
priv = TRACKER_MINER_FILES_INDEX_GET_PRIVATE (index);
- tracker_dbus_miner_files_proxy_set_indexed_files (priv->proxy_skeleton,
- (const gchar * const *) priv->indexed_files->data);
+ tracker_dbus_miner_files_proxy_set_indexed_locations (priv->proxy_skeleton,
+ (const gchar * const *)
priv->indexed_files->data);
}
static void
-tracker_miner_files_index_handle_index_file (TrackerDBusMinerFilesIndex *skeleton,
- GDBusMethodInvocation *invocation,
- const gchar *file_uri,
- const gchar * const *graphs,
- TrackerMinerFilesIndex *index)
+tracker_miner_files_index_handle_index_location (TrackerDBusMinerFilesIndex *skeleton,
+ GDBusMethodInvocation *invocation,
+ const gchar *file_uri,
+ const gchar * const *graphs,
+ const gchar * const *flags,
+ TrackerMinerFilesIndex *index)
{
TrackerMinerFilesIndexPrivate *priv;
TrackerDBusRequest *request;
+ TrackerIndexLocationFlags index_flags;
GFile *file;
priv = TRACKER_MINER_FILES_INDEX_GET_PRIVATE (index);
@@ -165,9 +195,11 @@ tracker_miner_files_index_handle_index_file (TrackerDBusMinerFilesIndex *skeleto
update_indexed_files (index);
}
+ index_flags = parse_index_location_flags (flags);
+
tracker_miner_files_peer_listener_add_watch (priv->peer_listener,
g_dbus_method_invocation_get_sender (invocation),
- file, graphs);
+ file, graphs, index_flags);
tracker_dbus_request_end (request, NULL);
g_dbus_method_invocation_return_value (invocation, NULL);
@@ -236,8 +268,8 @@ tracker_miner_files_index_init (TrackerMinerFilesIndex *object)
priv->proxy_skeleton = tracker_dbus_miner_files_proxy_skeleton_new ();
priv->skeleton = tracker_dbus_miner_files_index_skeleton_new ();
- g_signal_connect (priv->skeleton, "handle-index-file",
- G_CALLBACK (tracker_miner_files_index_handle_index_file),
+ g_signal_connect (priv->skeleton, "handle-index-location",
+ G_CALLBACK (tracker_miner_files_index_handle_index_location),
object);
priv->indexed_files = g_array_new (TRUE, TRUE, sizeof (gchar *));
g_array_set_clear_func (priv->indexed_files, string_clear);
diff --git a/src/tracker-control/tracker-miner-files-peer-listener.c
b/src/tracker-control/tracker-miner-files-peer-listener.c
index bac0ee612..0e8fb5e42 100644
--- a/src/tracker-control/tracker-miner-files-peer-listener.c
+++ b/src/tracker-control/tracker-miner-files-peer-listener.c
@@ -351,7 +351,8 @@ void
tracker_miner_files_peer_listener_add_watch (TrackerMinerFilesPeerListener *listener,
const gchar *dbus_name,
GFile *file,
- const gchar * const *graphs)
+ const gchar * const *graphs,
+ TrackerIndexLocationFlags flags)
{
TrackerMinerFilesPeerListenerPrivate *priv;
PeerFilesData *peer_data;
diff --git a/src/tracker-control/tracker-miner-files-peer-listener.h
b/src/tracker-control/tracker-miner-files-peer-listener.h
index 1dc3ac17a..2bd09559f 100644
--- a/src/tracker-control/tracker-miner-files-peer-listener.h
+++ b/src/tracker-control/tracker-miner-files-peer-listener.h
@@ -24,6 +24,7 @@
#include <glib-object.h>
#include <gio/gio.h>
+#include <libtracker-miners-common/tracker-enums.h>
#define TRACKER_TYPE_MINER_FILES_PEER_LISTENER (tracker_miner_files_peer_listener_get_type ())
#define TRACKER_MINER_FILES_PEER_LISTENER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object),
TRACKER_TYPE_MINER_FILES_PEER_LISTENER, TrackerMinerFilesPeerListener))
@@ -51,7 +52,8 @@ TrackerMinerFilesPeerListener *
void tracker_miner_files_peer_listener_add_watch (TrackerMinerFilesPeerListener *listener,
const gchar *dbus_name,
GFile *file,
- const gchar * const *graphs);
+ const gchar * const *graphs,
+ TrackerIndexLocationFlags flags);
void tracker_miner_files_peer_listener_remove_watch (TrackerMinerFilesPeerListener *listener,
const gchar *dbus_name,
GFile *file);
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index f0ff904fe..a5724e758 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -70,7 +70,7 @@ index_or_reindex_file (void)
GFile *file;
file = g_file_new_for_commandline_arg (*p);
- tracker_miner_manager_index_file (manager, file, NULL, &error);
+ tracker_miner_manager_index_location (manager, file, NULL, TRACKER_INDEX_LOCATION_FLAGS_NONE,
NULL, &error);
if (error) {
g_printerr ("%s: %s\n",
diff --git a/src/tracker/tracker-miner-manager.c b/src/tracker/tracker-miner-manager.c
index 3cbfee104..c8808cbc7 100644
--- a/src/tracker/tracker-miner-manager.c
+++ b/src/tracker/tracker-miner-manager.c
@@ -24,6 +24,7 @@
#include <string.h>
#include <libtracker-miners-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-enums.h>
#include <libtracker-miners-common/tracker-type-utils.h>
#include <libtracker-miners-common/tracker-domain-ontology.h>
@@ -47,8 +48,6 @@
#define DISPLAY_NAME_KEY "DisplayName"
#define DESCRIPTION_KEY "Comment"
-#define METHOD_INDEX_FILE "IndexFile"
-
#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker3.Miner"
typedef struct TrackerMinerManagerPrivate TrackerMinerManagerPrivate;
@@ -80,6 +79,12 @@ struct TrackerMinerManagerPrivate {
TrackerDomainOntology *domain_ontology;
};
+typedef struct {
+ GFile *location;
+ GStrv graphs;
+ TrackerIndexLocationFlags flags;
+} IndexLocationTaskData;
+
static void miner_manager_initable_iface_init (GInitableIface *iface);
static void miner_manager_set_property (GObject *object,
guint param_id,
@@ -1405,15 +1410,41 @@ tracker_miner_manager_error_quark (void)
return error_quark;
}
+static gchar **
+index_location_flags_to_strv (TrackerIndexLocationFlags flags)
+{
+ GFlagsClass *typeclass;
+ GPtrArray *flags_array;
+ int i;
+
+ typeclass = g_type_class_ref (TRACKER_TYPE_INDEX_LOCATION_FLAGS);
+ flags_array = g_ptr_array_new ();
+
+ for (i = 0; i < typeclass->n_values; i++) {
+ GFlagsValue *value;
+
+ value = &typeclass->values[i];
+
+ if (flags & (value->value)) {
+ g_ptr_array_add (flags_array, (char *)value->value_nick);
+ }
+ }
+
+ g_type_class_unref (typeclass);
+ return (gchar **) g_ptr_array_free (flags_array, FALSE);
+}
+
static gboolean
-miner_manager_index_file_sync (TrackerMinerManager *manager,
- const gchar *method_name,
- GFile *file,
- GCancellable *cancellable,
- GError **error)
+miner_manager_index_location_sync (TrackerMinerManager *manager,
+ GFile *file,
+ GStrv graphs,
+ TrackerIndexLocationFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
TrackerMinerManagerPrivate *priv;
gchar *uri;
+ gchar **flags_strv;
GVariant *v;
GError *new_error = NULL;
@@ -1437,13 +1468,14 @@ miner_manager_index_file_sync (TrackerMinerManager *manager,
priv = tracker_miner_manager_get_instance_private (manager);
uri = g_file_get_uri (file);
+ flags_strv = index_location_flags_to_strv (flags);
v = g_dbus_connection_call_sync (priv->connection,
- "org.freedesktop.Tracker3.Miner.Files",
+ "org.freedesktop.Tracker3.Miner.Files.Control",
"/org/freedesktop/Tracker3/Miner/Files/Index",
"org.freedesktop.Tracker3.Miner.Files.Index",
- method_name,
- g_variant_new ("(s)", uri),
+ "IndexLocation",
+ g_variant_new ("(sasas)", uri, graphs, flags_strv),
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
@@ -1451,6 +1483,7 @@ miner_manager_index_file_sync (TrackerMinerManager *manager,
&new_error);
g_free (uri);
+ g_free (flags_strv);
if (new_error) {
g_propagate_error (error, new_error);
@@ -1462,18 +1495,42 @@ miner_manager_index_file_sync (TrackerMinerManager *manager,
return TRUE;
}
+static IndexLocationTaskData *
+index_location_task_data_new (GFile *location,
+ GStrv graphs,
+ TrackerIndexLocationFlags flags)
+{
+ IndexLocationTaskData *data;
+
+ data = g_slice_new0 (IndexLocationTaskData);
+ data->location = g_object_ref (location);
+ data->graphs = g_strdupv (graphs);
+ data->flags = flags;
+
+ return data;
+}
+
+static void
+index_location_task_data_free (IndexLocationTaskData *data)
+{
+ g_object_unref (data->location);
+ g_strfreev (data->graphs);
+ g_slice_free (IndexLocationTaskData, data);
+}
+
static void
-miner_manager_index_file_thread (GTask *task,
- gpointer source_object,
- gpointer task_data,
- GCancellable *cancellable)
+miner_manager_index_location_thread (GTask *task,
+ gpointer source_object,
+ gpointer task_data,
+ GCancellable *cancellable)
{
TrackerMinerManager *manager = source_object;
- GFile *file = task_data;
+ IndexLocationTaskData *data = task_data;
GError *error = NULL;
- miner_manager_index_file_sync (manager, METHOD_INDEX_FILE,
- file, cancellable, &error);
+ miner_manager_index_location_sync (manager, data->location,
+ data->graphs, data->flags,
+ cancellable, &error);
if (error != NULL) {
g_task_return_error (task, error);
} else {
@@ -1481,10 +1538,12 @@ miner_manager_index_file_thread (GTask *task,
}
}
+
/**
- * tracker_miner_manager_index_file:
+ * tracker_miner_manager_index_location:
* @manager: a #TrackerMinerManager
- * @file: a URL valid in GIO of a file to give to the miner for processing
+ * @location: a #GFile instance of a file or directory
+ * @flags: values from #TrackerIndexLocationFlags
* @cancellable: (allow-none): a #GCancellable, or %NULL
* @error: (out callee-allocates) (transfer full) (allow-none): return location for errors
*
@@ -1497,53 +1556,56 @@ miner_manager_index_file_thread (GTask *task,
* Since: 2.0
**/
gboolean
-tracker_miner_manager_index_file (TrackerMinerManager *manager,
- GFile *file,
- GCancellable *cancellable,
- GError **error)
+tracker_miner_manager_index_location (TrackerMinerManager *manager,
+ GFile *location,
+ GStrv graphs,
+ TrackerIndexLocationFlags flags,
+ GCancellable *cancellable,
+ GError **error)
{
- g_return_val_if_fail (TRACKER_IS_MINER_MANAGER (manager), FALSE);
- g_return_val_if_fail (G_IS_FILE (file), FALSE);
- g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
-
- return miner_manager_index_file_sync (manager, METHOD_INDEX_FILE,
- file, cancellable, error);
+ return miner_manager_index_location_sync (manager, location, graphs, flags, cancellable, error);
}
/**
- * tracker_miner_manager_index_file_async:
+ * tracker_miner_manager_index_location_async:
* @manager: a #TrackerMinerManager
- * @file: a URL valid in GIO of a file to give to the miner for processing
+ * @location: a #GFile instance of a file or directory
+ * @flags: values from #TrackerIndexLocationFlags
* @cancellable: (allow-none): a #GCancellable, or %NULL
* @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied
* @user_data: the data to pass to the callback function
*
- * Tells the filesystem miner to start indexing the @file. Once the message has been sent,
- * @callback will be called. You can then call tracker_miner_manager_index_file_finish()
+ * Tells the filesystem miner to start indexing the @location. Once the message has been sent,
+ * @callback will be called. You can then call tracker_miner_manager_index_location_finish()
* to get the result.
*
* Since: 0.16
**/
void
-tracker_miner_manager_index_file_async (TrackerMinerManager *manager,
- GFile *file,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+tracker_miner_manager_index_location_async (TrackerMinerManager *manager,
+ GFile *location,
+ GStrv graphs,
+ TrackerIndexLocationFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
- GTask *task = g_task_new (manager, cancellable, callback, user_data);
- g_task_set_task_data (task, g_object_ref (file), (GDestroyNotify) g_object_unref);
- g_task_run_in_thread (task, miner_manager_index_file_thread);
- g_object_unref (task);
+ IndexLocationTaskData *data;
+ g_autoptr (GTask) task;
+
+ data = index_location_task_data_new (location, graphs, flags);
+ task = g_task_new (manager, cancellable, callback, user_data);
+ g_task_set_task_data (task, data, (GDestroyNotify) index_location_task_data_free);
+ g_task_run_in_thread (task, miner_manager_index_location_thread);
}
/**
- * tracker_miner_manager_index_file_finish:
+ * tracker_miner_manager_index_location_finish:
* @manager: a #TrackerMinerManager
* @result: a #GAsyncResult
* @error: (out callee-allocates) (transfer full) (allow-none): return location for errors
*
- * Finishes a request to index a file. See tracker_miner_manager_index_file_async()
+ * Finishes a request to index a file. See tracker_miner_manager_index_location_async()
*
* On failure @error will be set.
*
@@ -1552,9 +1614,9 @@ tracker_miner_manager_index_file_async (TrackerMinerManager *manager,
* Since: 0.16
**/
gboolean
-tracker_miner_manager_index_file_finish (TrackerMinerManager *manager,
- GAsyncResult *result,
- GError **error)
+tracker_miner_manager_index_location_finish (TrackerMinerManager *manager,
+ GAsyncResult *result,
+ GError **error)
{
return g_task_propagate_boolean (G_TASK (result), error);
}
diff --git a/src/tracker/tracker-miner-manager.h b/src/tracker/tracker-miner-manager.h
index 1a23d06af..f42fcb90b 100644
--- a/src/tracker/tracker-miner-manager.h
+++ b/src/tracker/tracker-miner-manager.h
@@ -26,6 +26,8 @@
#include <gio/gio.h>
+#include <libtracker-miners-common/tracker-miners-enum-types.h>
+
G_BEGIN_DECLS
#define TRACKER_TYPE_MINER_MANAGER (tracker_miner_manager_get_type())
@@ -128,18 +130,22 @@ const gchar * tracker_miner_manager_get_display_name (TrackerMinerManag
const gchar * tracker_miner_manager_get_description (TrackerMinerManager *manager,
const gchar *miner);
-gboolean tracker_miner_manager_index_file (TrackerMinerManager *manager,
- GFile *file,
- GCancellable *cancellable,
- GError **error);
-void tracker_miner_manager_index_file_async (TrackerMinerManager *manager,
- GFile *file,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean tracker_miner_manager_index_file_finish (TrackerMinerManager *manager,
- GAsyncResult *result,
- GError **error);
+gboolean tracker_miner_manager_index_location (TrackerMinerManager *manager,
+ GFile *location,
+ GStrv graphs,
+ TrackerIndexLocationFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+void tracker_miner_manager_index_location_async (TrackerMinerManager *manager,
+ GFile *location,
+ GStrv graphs,
+ TrackerIndexLocationFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean tracker_miner_manager_index_location_finish (TrackerMinerManager *manager,
+ GAsyncResult *result,
+ GError **error);
G_END_DECLS
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 8329a69ad..3bc3bdb97 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -117,7 +117,7 @@ delete_info_recursively (GFile *file)
/* Request reindexing of this data, it was previously in the store. */
miner_manager = tracker_miner_manager_new_full (FALSE, NULL);
- tracker_miner_manager_index_file (miner_manager, file, NULL, &error);
+ tracker_miner_manager_index_location (miner_manager, file, NULL, TRACKER_INDEX_LOCATION_FLAGS_NONE,
NULL, &error);
g_object_unref (miner_manager);
if (error)
diff --git a/tests/functional-tests/extractor-decorator.py b/tests/functional-tests/extractor-decorator.py
index 41c8eec17..c6a953667 100755
--- a/tests/functional-tests/extractor-decorator.py
+++ b/tests/functional-tests/extractor-decorator.py
@@ -66,7 +66,7 @@ class ExtractorDecoratorTest(fixtures.TrackerMinerTest):
# deleted, so we should see the nie:title property change.
with self.tracker.await_insert(fixtures.AUDIO_GRAPH, f'nie:title "{VALID_FILE_TITLE}"',
timeout=cfg.AWAIT_TIMEOUT):
- miner_fs.index_file(file_uri)
+ miner_fs.index_location(file_uri, [], [])
title_result = store.query('SELECT ?title { <%s> nie:interpretedAs/nie:title ?title }' %
file_uri)
assert len(title_result) == 1
diff --git a/tests/functional-tests/miner-basic.py b/tests/functional-tests/miner-basic.py
index 33f7afbd3..ad386ca72 100755
--- a/tests/functional-tests/miner-basic.py
+++ b/tests/functional-tests/miner-basic.py
@@ -368,7 +368,7 @@ class MinerCrawlTest(fixtures.TrackerMinerTest):
# indirectly by the new file)
with open(document, 'w') as f:
f.write(DEFAULT_TEXT)
- self.miner_fs.index_file(directory_uri)
+ self.miner_fs.index_location(directory_uri, [], [])
new_urn = self.__get_file_urn(directory)
# Ensure that children remain consistent, old and new ones
diff --git a/tests/functional-tests/minerhelper.py b/tests/functional-tests/minerhelper.py
index 37f99d5bd..4d2a5c495 100644
--- a/tests/functional-tests/minerhelper.py
+++ b/tests/functional-tests/minerhelper.py
@@ -139,5 +139,5 @@ class MinerFsHelper ():
self._target_wakeup_count = None
GLib.source_remove(timeout_id)
- def index_file(self, uri):
- return self.index.IndexFile('(sas)', uri, [])
+ def index_location(self, uri, graphs=None, flags=None):
+ return self.index.IndexLocation('(sasas)', uri, graphs or [], flags or [])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
