GNOME.org
 

tracker r1834 - in branches/indexer-split: . src/libtracker-common src/trackerd

Author: mr
Date: Wed Jul  2 16:15:07 2008
New Revision: 1834
URL: http://svn.gnome.org/viewvc/tracker?rev=1834&view=rev

Log:
	* src/trackerd/tracker-main.c:
	* src/libtracker-common/tracker-config.[ch]: Removed the email
	client option, it is redundant now. Removed the index-modules
	since that is now going to be changed to be ignore-modules.

	* src/libtracker-common/tracker-log.c: Use gsize for log size and
	remove perror, instead use g_fprintf(stderr, ...) when we get an
	error so we don't recurse.

	* src/trackerd/tracker-crawler.c: Only add monitors when we
	process directories, so they are added breadth ways not depth
	ways. Also, make the debugging ALWAYS available, this changes with
	the -v option or the config setting.

	* src/trackerd/tracker-monitor.c: Don't add any monitors if it is
	disabled in the config. Also, make the debugging ALWAYS available.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-config.c
   branches/indexer-split/src/libtracker-common/tracker-config.h
   branches/indexer-split/src/libtracker-common/tracker-log.c
   branches/indexer-split/src/trackerd/tracker-crawler.c
   branches/indexer-split/src/trackerd/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-monitor.c

Modified: branches/indexer-split/src/libtracker-common/tracker-config.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-config.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-config.c	Wed Jul  2 16:15:07 2008
@@ -62,10 +62,6 @@
 #define KEY_LOW_DISK_SPACE_LIMIT		 "LowDiskSpaceLimit"
 #define KEY_INDEX_MOUNTED_DIRECTORIES	         "IndexMountedDirectories"
 #define KEY_INDEX_REMOVABLE_DEVICES		 "IndexRemovableMedia"
-#define KEY_INDEX_MODULES                        "IndexModules"
-
-#define GROUP_EMAILS				 "Emails"
-#define KEY_EMAIL_CLIENT                         "IndexEMailClient"
 
 #define GROUP_PERFORMANCE			 "Performance"
 #define KEY_MAX_TEXT_TO_INDEX			 "MaxTextToIndex"
@@ -100,8 +96,6 @@
 #define DEFAULT_DISABLE_INDEXING_ON_BATTERY_INIT FALSE
 #define DEFAULT_INDEX_MOUNTED_DIRECTORIES  	 TRUE 
 #define DEFAULT_INDEX_REMOVABLE_DEVICES	         TRUE
-#define DEFAULT_INDEX_MODULES                    "applications;files;gaim-conversations;firefox-history"
-#define DEFAULT_INDEX_EMAIL_CLIENT               "evolution"
 #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
 #define DEFAULT_MAX_TEXT_TO_INDEX		 1048576  /* Bytes */
 #define DEFAULT_MAX_WORDS_TO_INDEX		 10000
@@ -148,10 +142,6 @@
 	gint	  low_disk_space_limit;
 	gboolean  index_mounted_directories;
 	gboolean  index_removable_devices;
-	GSList   *index_modules;
-
-	/* Emails */
-	gchar    *email_client;
 
 	/* Performance */
 	gint	  max_text_to_index;
@@ -210,10 +200,6 @@
 	PROP_LOW_DISK_SPACE_LIMIT,
 	PROP_INDEX_MOUNTED_DIRECTORIES,
 	PROP_INDEX_REMOVABLE_DEVICES,
-	PROP_INDEX_MODULES,
-
-	/* Emails */
-	PROP_EMAIL_CLIENT,
 
 	/* Performance */
 	PROP_MAX_TEXT_TO_INDEX,
@@ -433,20 +419,6 @@
 							       "which are for removable devices",
 							       DEFAULT_INDEX_REMOVABLE_DEVICES,
 							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	g_object_class_install_property (object_class,
-					 PROP_INDEX_MODULES,
-					 g_param_spec_pointer ("index-modules",
-							       "Used index modules",
-							       "Modules used to index data",
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	/* Emails */
-        g_object_class_install_property (object_class,
-					 PROP_EMAIL_CLIENT,
-					 g_param_spec_string ("email-client",
-							      "Email client",
-							      "Email client to index",
-							      DEFAULT_INDEX_EMAIL_CLIENT,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	/* Performance */
 	g_object_class_install_property (object_class,
@@ -576,11 +548,7 @@
 	g_slist_foreach (priv->no_index_file_types, (GFunc) g_free, NULL);
 	g_slist_free (priv->no_index_file_types);
 
-	g_slist_foreach (priv->index_modules, (GFunc) g_free, NULL);
-	g_slist_free (priv->index_modules);
-
 	g_free (priv->language);
-	g_free (priv->email_client);
 
 	if (priv->monitor) {
 		g_object_unref (priv->monitor);
@@ -678,14 +646,6 @@
 	case PROP_INDEX_REMOVABLE_DEVICES:
 		g_value_set_boolean (value, priv->index_removable_devices);
 		break;
-	case PROP_INDEX_MODULES:
-		g_value_set_pointer (value, priv->index_modules);
-		break;
-
-		/* Emails */
-	case PROP_EMAIL_CLIENT:
-		g_value_set_string (value, priv->email_client);
-		break;
 
 		/* Performance */
 	case PROP_MAX_TEXT_TO_INDEX:
@@ -825,15 +785,6 @@
 		tracker_config_set_index_removable_devices (TRACKER_CONFIG (object),
 								g_value_get_boolean (value));
 		break;
-	case PROP_INDEX_MODULES:
-		/* Not writable */
-		break;
-
-		/* Emails */
-	case PROP_EMAIL_CLIENT:
-		tracker_config_set_email_client (TRACKER_CONFIG (object),
-						 g_value_get_string (value));
-		break;
 
 		/* Performance */
 	case PROP_MAX_TEXT_TO_INDEX:
@@ -1002,15 +953,12 @@
 	gchar	     *language;
 	const gchar  *watch_directory_roots[2] = { NULL, NULL };
 	const gchar  *empty_string_list[] = { NULL };
-	gchar       **index_modules;
 
 	/* Get default values */
 	language = tracker_language_get_default_code ();
 
 	watch_directory_roots[0] = g_get_home_dir ();
 
-	index_modules = g_strsplit (DEFAULT_INDEX_MODULES, ";", -1);
-
 	/* General */
 	g_key_file_set_integer (key_file, GROUP_GENERAL, KEY_VERBOSITY, DEFAULT_VERBOSITY);
 	g_key_file_set_comment (key_file, GROUP_GENERAL, KEY_VERBOSITY,
@@ -1131,14 +1079,6 @@
 	g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_INDEX_REMOVABLE_DEVICES,
 				" Set to true to enable traversing mounted directories for removable devices",
 				NULL);
-	g_key_file_set_string_list (key_file, GROUP_INDEXING, KEY_INDEX_MODULES,
-				    (const gchar **) index_modules, g_strv_length (index_modules));
-	g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_INDEX_MODULES,
-				" Modules used to extract data, they will be queried in the same order than they're written here",
-				NULL);
-
-	/* Emails */
-	g_key_file_set_string  (key_file, GROUP_EMAILS, KEY_EMAIL_CLIENT, DEFAULT_INDEX_EMAIL_CLIENT);
 
 	/* Performance */
 	g_key_file_set_integer (key_file, GROUP_PERFORMANCE, KEY_MAX_TEXT_TO_INDEX, DEFAULT_MAX_TEXT_TO_INDEX);
@@ -1201,7 +1141,6 @@
 	}
 
 	g_print ("Writting default configuration to file:'%s'\n", filename);
-	g_strfreev (index_modules);
 	g_free (content);
 
 	return TRUE;
@@ -1342,12 +1281,6 @@
 				config_string_list_to_gslist ((const gchar **) value, FALSE);
 		}
 	}
-	else if (strcmp (property, "index-modules") == 0) {
-		if (value) {
-			priv->index_modules =
-				config_string_list_to_gslist ((const gchar **) value, FALSE);
-		}
-	}
 	else {
 		g_warning ("Property '%s' not recognized to set string list from key '%s'",
 			   property, key);
@@ -1466,10 +1399,6 @@
 	config_load_int (config, "low-disk-space-limit", key_file, GROUP_INDEXING, KEY_LOW_DISK_SPACE_LIMIT);
 	config_load_boolean (config, "index-mounted-directories", key_file, GROUP_INDEXING, KEY_INDEX_MOUNTED_DIRECTORIES);
 	config_load_boolean (config, "index-removable-devices", key_file, GROUP_INDEXING, KEY_INDEX_REMOVABLE_DEVICES);
-	config_load_string_list (config, "index-modules", key_file, GROUP_INDEXING, KEY_INDEX_MODULES);
-
-	/* Emails */
-	config_load_string (config, "email-client", key_file, GROUP_EMAILS, KEY_EMAIL_CLIENT);
 
 	/* Performance */
 	config_load_int (config, "max-text-to-index", key_file, GROUP_PERFORMANCE, KEY_MAX_TEXT_TO_INDEX);
@@ -1812,30 +1741,6 @@
 	return priv->index_removable_devices;
 }
 
-GSList *
-tracker_config_get_index_modules (TrackerConfig *config)
-{
-	TrackerConfigPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
-
-	priv = GET_PRIV (config);
-
-	return priv->index_modules;
-}
-
-const gchar *
-tracker_config_get_email_client (TrackerConfig *config)
-{
-	TrackerConfigPriv *priv;
-
-	g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_INDEX_EMAIL_CLIENT);
-
-	priv = GET_PRIV (config);
-
-	return priv->email_client;
-}
-
 gint
 tracker_config_get_max_text_to_index (TrackerConfig *config)
 {
@@ -2263,27 +2168,6 @@
 }
 
 void
-tracker_config_set_email_client (TrackerConfig *config,
-				 const gchar   *value)
-{
-	TrackerConfigPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_CONFIG (config));
-
-	priv = GET_PRIV (config);
-
-	g_free (priv->email_client);
-
-	if (value) {
-		priv->email_client = g_strdup (value);
-	} else {
-		priv->email_client = NULL;
-	}
-
-	g_object_notify (G_OBJECT (config), "email-client");
-}
-
-void
 tracker_config_set_max_text_to_index (TrackerConfig *config,
 				      gint	     value)
 {

Modified: branches/indexer-split/src/libtracker-common/tracker-config.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-config.h	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-config.h	Wed Jul  2 16:15:07 2008
@@ -73,9 +73,7 @@
 gboolean       tracker_config_get_disable_indexing_on_battery_init (TrackerConfig *config);
 gint           tracker_config_get_low_disk_space_limit             (TrackerConfig *config);
 gboolean       tracker_config_get_index_removable_devices          (TrackerConfig *config);
-GSList *       tracker_config_get_index_modules                    (TrackerConfig *config);
 gboolean       tracker_config_get_index_mounted_directories        (TrackerConfig *config);
-const gchar *  tracker_config_get_email_client                     (TrackerConfig *config);
 gint           tracker_config_get_max_text_to_index                (TrackerConfig *config);
 gint           tracker_config_get_max_words_to_index               (TrackerConfig *config);
 gint           tracker_config_get_optimization_sweep_count         (TrackerConfig *config);
@@ -125,8 +123,6 @@
 								    gboolean       value);
 void           tracker_config_set_index_mounted_directories        (TrackerConfig *config,
 								    gboolean       value);
-void           tracker_config_set_email_client                     (TrackerConfig *config,
-								    const gchar   *value);
 void           tracker_config_set_max_text_to_index                (TrackerConfig *config,
 								    gint           value);
 void           tracker_config_set_max_words_to_index               (TrackerConfig *config,

Modified: branches/indexer-split/src/libtracker-common/tracker-log.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-log.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-log.c	Wed Jul  2 16:15:07 2008
@@ -55,7 +55,7 @@
 	gchar         *output;
 	struct tm     *local_time;
 	GTimeVal       current_time;
-	static size_t  size = 0;
+	static gsize   size = 0;
 	const gchar   *log_level_str;
 
 	g_return_if_fail (log != NULL);
@@ -66,8 +66,7 @@
 
 	fd = g_fopen (log->filename, "a");
 	if (!fd) {
-		perror ("log");
-		g_warning ("Could not open log: '%s'", log->filename);
+		g_fprintf (stderr, "Could not open log: '%s'", log->filename);
 		g_mutex_unlock (log->mutex);
 		return;
 	}

Modified: branches/indexer-split/src/trackerd/tracker-crawler.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-crawler.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-crawler.c	Wed Jul  2 16:15:07 2008
@@ -37,8 +37,6 @@
 
 #define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerPrivate))
 
-/* #define TESTING */
-
 #define FILE_ATTRIBUTES				\
 	G_FILE_ATTRIBUTE_STANDARD_NAME ","	\
 	G_FILE_ATTRIBUTE_STANDARD_TYPE
@@ -556,19 +554,15 @@
 	if (path_should_be_ignored (crawler, path, FALSE)) {
 		crawler->private->files_ignored++;
 
-#ifdef TESTING
 		g_debug ("Ignored:'%s' (%d)",
 			 path,
 			 crawler->private->enumerations);
-#endif /* TESTING */
 	} else {
 		crawler->private->files_found++;
 
-#ifdef TESTING
 		g_debug ("Found  :'%s' (%d)",
 			 path,
 			 crawler->private->enumerations);
-#endif /* TESTING */
 
 		g_queue_push_tail (crawler->private->files, g_object_ref (file));
 	}
@@ -589,19 +583,15 @@
 	if (path_should_be_ignored (crawler, path, TRUE)) {
 		crawler->private->directories_ignored++;
 
-#ifdef TESTING
 		g_debug ("Ignored:'%s' (%d)",
 			 path,
 			 crawler->private->enumerations);
-#endif /* TESTING */
 	} else {
 		crawler->private->directories_found++;
 
-#ifdef TESTING
 		g_debug ("Found  :'%s' (%d)",
 			 path,
 			 crawler->private->enumerations);
-#endif /* TESTING */
 
 		g_queue_push_tail (crawler->private->directories, g_object_ref (file));
 	}
@@ -712,6 +702,8 @@
 process_directory (TrackerCrawler *crawler,
 		   GFile          *file)
 {
+	tracker_monitor_add (file);
+
 	file_enumerate_children (crawler, file);
 }
 
@@ -895,8 +887,6 @@
 {
 	crawler->private->enumerations++;
 
-	tracker_monitor_add (file);
-
 	g_file_enumerate_children_async (file,
 					 FILE_ATTRIBUTES,
 					 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Wed Jul  2 16:15:07 2008
@@ -262,8 +262,6 @@
 		   tracker_config_get_enable_content_indexing (tracker->config) ? "yes" : "no");
 	g_message ("  Thumbnailing enabled  .................  %s", 
 		   tracker_config_get_enable_thumbnails (tracker->config) ? "yes" : "no");
-	g_message ("  Email client to index  ................  %s",
-		   tracker_config_get_email_client (tracker->config));
 
 	g_message ("Tracker indexer parameters:");
 	g_message ("  Indexer language code  ................  %s", 

Modified: branches/indexer-split/src/trackerd/tracker-monitor.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-monitor.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-monitor.c	Wed Jul  2 16:15:07 2008
@@ -28,8 +28,6 @@
 #include "tracker-dbus.h"
 #include "tracker-indexer-client.h"
 
-/* #define TESTING  */
-
 #define FILES_QUEUE_PROCESS_INTERVAL 2000
 #define FILES_QUEUE_PROCESS_MAX      5000
 
@@ -424,6 +422,10 @@
 	gchar        *path;
 
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
+	
+	if (!tracker_config_get_enable_watches (config)) {
+		return TRUE;
+	}
 
 	if (g_hash_table_lookup (monitors, file)) {
 		return TRUE;
@@ -446,6 +448,7 @@
 	path = g_file_get_path (file);
 
 	ignored_roots = tracker_config_get_no_watch_directory_roots (config);
+
 	/* Check this location isn't excluded in the config */
 	for (l = ignored_roots; l; l = l->next) {
 		if (strcmp (path, l->data) == 0) {
@@ -484,11 +487,9 @@
 			     g_object_ref (file), 
 			     monitor);
 
-#ifdef TESTING
 	g_debug ("Added monitor for:'%s', total monitors:%d", 
 		 path,
 		 g_hash_table_size (monitors));
-#endif /* TESTING */
 
 	g_free (path);
 	
@@ -504,6 +505,10 @@
 
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 
+	if (!tracker_config_get_enable_watches (config)) {
+		return TRUE;
+	}
+
 	monitor = g_hash_table_lookup (monitors, file);
 	if (!monitor) {
 		return TRUE;
@@ -516,11 +521,9 @@
 
 	path = g_file_get_path (file);
 
-#ifdef TESTING
 	g_debug ("Removed monitor for:'%s', total monitors:%d", 
 		 path,
 		 g_hash_table_size (monitors));
-#endif /* TESTING */
 
 	g_free (path);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]