Skip to content

GitLab

Commit 418559c4 authored by Martyn Russell's avatar Martyn Russell
Browse files
Options

libtracker-common: Removed tracker-config.[ch] 

This also changes the way tracker-language.[ch] works.
parent 3bd73da7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 984 additions and 2924 deletions
docs/reference/libtracker-common/libtracker-common-docs.sgml
View file @ 418559c4
......@@ -15,7 +15,6 @@
<!ENTITY tracker-file-utils SYSTEM "xml/tracker-file-utils.xml">
<!ENTITY tracker-property SYSTEM "xml/tracker-property.xml">
<!ENTITY tracker-dbus SYSTEM "xml/tracker-dbus.xml">
<!ENTITY tracker-config SYSTEM "xml/tracker-config.xml">
<!ENTITY version SYSTEM "version.xml">
]>
<book id="index">
......@@ -54,7 +53,6 @@
<chapter>
<title>Configuration</title>
&tracker-config;
&tracker-power;
&tracker-storage;
&tracker-language;
......
docs/reference/libtracker-common/libtracker-common-sections.txt
View file @ 418559c4
<INCLUDE>libtracker-common/tracker-config.h</INCLUDE>
<SECTION>
<FILE>tracker-config</FILE>
<TITLE>Config</TITLE>
TrackerConfig
tracker_config_new
tracker_config_add_crawl_directory_roots
tracker_config_add_disabled_modules
tracker_config_add_no_watch_directory_roots
tracker_config_add_watch_directory_roots
tracker_config_get_crawl_directory_roots
tracker_config_get_disable_indexing_on_battery
tracker_config_get_disable_indexing_on_battery_init
tracker_config_get_disabled_modules
tracker_config_get_enable_content_indexing
tracker_config_get_enable_indexing
tracker_config_get_enable_stemmer
tracker_config_get_enable_thumbnails
tracker_config_get_enable_watches
tracker_config_get_fast_merges
tracker_config_get_index_mounted_directories
tracker_config_get_index_removable_devices
tracker_config_get_initial_sleep
tracker_config_get_language
tracker_config_get_low_disk_space_limit
tracker_config_get_low_memory_mode
tracker_config_get_max_bucket_count
tracker_config_get_max_text_to_index
tracker_config_get_max_word_length
tracker_config_get_max_words_to_index
tracker_config_get_min_bucket_count
tracker_config_get_min_word_length
tracker_config_get_nfs_locking
tracker_config_get_no_index_file_types
tracker_config_get_no_watch_directory_roots
tracker_config_get_throttle
tracker_config_get_verbosity
tracker_config_get_watch_directory_roots
tracker_config_remove_disabled_modules
tracker_config_set_disable_indexing_on_battery
tracker_config_set_disable_indexing_on_battery_init
tracker_config_set_enable_content_indexing
tracker_config_set_enable_indexing
tracker_config_set_enable_stemmer
tracker_config_set_enable_thumbnails
tracker_config_set_enable_watches
tracker_config_set_fast_merges
tracker_config_set_index_mounted_directories
tracker_config_set_index_removable_devices
tracker_config_set_initial_sleep
tracker_config_set_language
tracker_config_set_low_disk_space_limit
tracker_config_set_low_memory_mode
tracker_config_set_max_bucket_count
tracker_config_set_max_text_to_index
tracker_config_set_max_word_length
tracker_config_set_max_words_to_index
tracker_config_set_min_bucket_count
tracker_config_set_min_word_length
tracker_config_set_nfs_locking
tracker_config_set_throttle
tracker_config_set_verbosity
<SUBSECTION Standard>
TrackerConfigClass
TRACKER_CONFIG
TRACKER_IS_CONFIG
TRACKER_TYPE_CONFIG
tracker_config_get_type
TRACKER_CONFIG_CLASS
TRACKER_IS_CONFIG_CLASS
TRACKER_CONFIG_GET_CLASS
</SECTION>
<INCLUDE>libtracker-common/tracker-type-utils.h</INCLUDE>
<SECTION>
<FILE>tracker-type-utils</FILE>
......
docs/reference/libtracker-common/libtracker-common.types deleted 100644 → 0
View file @ 3bd73da7
#include <libtracker-common/tracker-common.h>
tracker_class_get_type
tracker_config_get_type
tracker_language_get_type
tracker_power_get_type
tracker_property_get_type
tracker_storage_get_type
src/Makefile.am
View file @ 418559c4
......@@ -16,7 +16,7 @@ SUBDIRS = \
tracker-miner-fs
if HAVE_TRACKER_PREFERENCES
SUBDIRS += tracker-preferences
# SUBDIRS += tracker-preferences
endif
if HAVE_TRACKER_APPLET
......@@ -52,5 +52,7 @@ DIST_SUBDIRS = \
libtracker-gtk \
tracker-applet \
tracker-search-tool \
tracker-preferences \
plugins
# Disabled for now
# tracker-preferences
src/libtracker-common/Makefile.am
View file @ 418559c4
......@@ -60,7 +60,6 @@ libtracker_common_la_SOURCES = \
tracker-class.c \
tracker-dbus.c \
tracker-file-utils.c \
tracker-global-config.c \
tracker-ioprio.c \
tracker-language.c \
tracker-log.c \
......@@ -92,7 +91,6 @@ libtracker_commoninclude_HEADERS = \
tracker-class.h \
tracker-common.h \
tracker-file-utils.h \
tracker-global-config.h \
tracker-language.h \
tracker-module-config.h \
tracker-namespace.h \
......
src/libtracker-common/tracker-common.h
View file @ 418559c4
......@@ -33,7 +33,6 @@ G_BEGIN_DECLS
#define __LIBTRACKER_COMMON_INSIDE__
#include "tracker-class.h"
#include "tracker-global-config.h"
#include "tracker-file-utils.h"
#include "tracker-language.h"
#include "tracker-module-config.h"
......
src/libtracker-common/tracker-global-config.c deleted 100644 → 0
View file @ 3bd73da7
This diff is collapsed.
src/libtracker-common/tracker-global-config.h deleted 100644 → 0
View file @ 3bd73da7
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc@gnome.org)
* Copyright (C) 2007, Michal Pryc (Michal.Pryc@Sun.Com)
* Copyright (C) 2008, Nokia (urho.konttori@nokia.com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __LIBTRACKER_COMMON_CONFIG_H__
#define __LIBTRACKER_COMMON_CONFIG_H__
#include <glib-object.h>
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
#define TRACKER_TYPE_CONFIG (tracker_config_get_type ())
#define TRACKER_CONFIG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig))
#define TRACKER_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass))
#define TRACKER_IS_CONFIG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CONFIG))
#define TRACKER_IS_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG))
#define TRACKER_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG, TrackerConfigClass))
typedef struct _TrackerConfig TrackerConfig;
typedef struct _TrackerConfigClass TrackerConfigClass;
struct _TrackerConfig {
GObject parent;
};
struct _TrackerConfigClass {
GObjectClass parent_class;
};
GType tracker_config_get_type (void) G_GNUC_CONST;
TrackerConfig *tracker_config_new (void);
gboolean tracker_config_save (TrackerConfig *config);
gint tracker_config_get_verbosity (TrackerConfig *config);
gint tracker_config_get_initial_sleep (TrackerConfig *config);
gboolean tracker_config_get_low_memory_mode (TrackerConfig *config);
GSList * tracker_config_get_watch_directory_roots (TrackerConfig *config);
GSList * tracker_config_get_crawl_directory_roots (TrackerConfig *config);
GSList * tracker_config_get_no_watch_directory_roots (TrackerConfig *config);
gboolean tracker_config_get_enable_watches (TrackerConfig *config);
gint tracker_config_get_throttle (TrackerConfig *config);
gboolean tracker_config_get_enable_indexing (TrackerConfig *config);
gboolean tracker_config_get_enable_content_indexing (TrackerConfig *config);
gboolean tracker_config_get_enable_thumbnails (TrackerConfig *config);
GSList * tracker_config_get_disabled_modules (TrackerConfig *config);
gint tracker_config_get_min_word_length (TrackerConfig *config);
gint tracker_config_get_max_word_length (TrackerConfig *config);
const gchar * tracker_config_get_language (TrackerConfig *config);
gboolean tracker_config_get_enable_stemmer (TrackerConfig *config);
gboolean tracker_config_get_disable_indexing_on_battery (TrackerConfig *config);
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);
gboolean tracker_config_get_index_mounted_directories (TrackerConfig *config);
gint tracker_config_get_max_text_to_index (TrackerConfig *config);
gint tracker_config_get_max_words_to_index (TrackerConfig *config);
void tracker_config_set_verbosity (TrackerConfig *config,
gint value);
void tracker_config_set_initial_sleep (TrackerConfig *config,
gint value);
void tracker_config_set_low_memory_mode (TrackerConfig *config,
gboolean value);
void tracker_config_set_enable_watches (TrackerConfig *config,
gboolean value);
void tracker_config_set_throttle (TrackerConfig *config,
gint value);
void tracker_config_set_enable_indexing (TrackerConfig *config,
gboolean value);
void tracker_config_set_enable_content_indexing (TrackerConfig *config,
gboolean value);
void tracker_config_set_enable_thumbnails (TrackerConfig *config,
gboolean value);
void tracker_config_set_min_word_length (TrackerConfig *config,
gint value);
void tracker_config_set_max_word_length (TrackerConfig *config,
gint value);
void tracker_config_set_language (TrackerConfig *config,
const gchar *value);
void tracker_config_set_enable_stemmer (TrackerConfig *config,
gboolean value);
void tracker_config_set_disable_indexing_on_battery (TrackerConfig *config,
gboolean value);
void tracker_config_set_disable_indexing_on_battery_init (TrackerConfig *config,
gboolean value);
void tracker_config_set_low_disk_space_limit (TrackerConfig *config,
gint value);
void tracker_config_set_index_removable_devices (TrackerConfig *config,
gboolean value);
void tracker_config_set_index_mounted_directories (TrackerConfig *config,
gboolean value);
void tracker_config_set_max_text_to_index (TrackerConfig *config,
gint value);
void tracker_config_set_max_words_to_index (TrackerConfig *config,
gint value);
/* List APIs*/
void tracker_config_add_watch_directory_roots (TrackerConfig *config,
gchar * const *roots);
void tracker_config_add_crawl_directory_roots (TrackerConfig *config,
gchar * const *roots);
void tracker_config_add_no_watch_directory_roots (TrackerConfig *config,
gchar * const *roots);
void tracker_config_add_disabled_modules (TrackerConfig *config,
const gchar * const *modules);void tracker_config_remove_watch_directory_roots (TrackerConfig *config,
const gchar *root);
void tracker_config_remove_crawl_directory_roots (TrackerConfig *config,
const gchar *root);
void tracker_config_remove_no_watch_directory_roots (TrackerConfig *config,
const gchar *root);
void tracker_config_remove_disabled_modules (TrackerConfig *config,
const gchar *module);
void tracker_config_set_watch_directory_roots (TrackerConfig *config,
GSList *roots);
void tracker_config_set_crawl_directory_roots (TrackerConfig *config,
GSList *roots);
void tracker_config_set_no_watch_directory_roots (TrackerConfig *config,
GSList *roots);
void tracker_config_set_disabled_modules (TrackerConfig *config,
GSList *modules);
G_END_DECLS
#endif /* __LIBTRACKER_COMMON_CONFIG_H__ */
src/libtracker-common/tracker-language.c
View file @ 418559c4
......@@ -36,9 +36,9 @@ typedef struct _TrackerLanguagePriv TrackerLanguagePriv;
typedef struct _Languages Languages;
struct _TrackerLanguagePriv {
TrackerConfig *config;
GHashTable *stop_words;
gboolean enable_stemmer;
gchar *language_code;
GMutex *stemmer_mutex;
gpointer stemmer;
......@@ -70,8 +70,9 @@ static Languages all_langs[] = {
enum {
PROP_0,
PROP_CONFIG,
PROP_STOP_WORDS
PROP_ENABLE_STEMMER,
PROP_STOP_WORDS,
PROP_LANGUAGE_CODE,
};
static void language_finalize (GObject *object);
......@@ -83,9 +84,6 @@ static void language_set_property (GObject *object,
guint param_id,
const GValue *value,
GParamSpec *pspec);
static void language_notify_cb (TrackerConfig *config,
GParamSpec *param,
gpointer user_data);
G_DEFINE_TYPE (TrackerLanguage, tracker_language, G_TYPE_OBJECT);
......@@ -99,12 +97,12 @@ tracker_language_class_init (TrackerLanguageClass *klass)
object_class->set_property = language_set_property;
g_object_class_install_property (object_class,
PROP_CONFIG,
g_param_spec_object ("config",
"Config",
"Config",
tracker_config_get_type (),
G_PARAM_READWRITE));
PROP_ENABLE_STEMMER,
g_param_spec_boolean ("enable-stemmer",
"Enable stemmer",
"Enable stemmer",
TRUE,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
PROP_STOP_WORDS,
......@@ -114,6 +112,14 @@ tracker_language_class_init (TrackerLanguageClass *klass)
g_hash_table_get_type (),
G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_LANGUAGE_CODE,
g_param_spec_string ("language-code",
"Language code",
"Language code",
"en",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
g_type_class_add_private (object_class, sizeof (TrackerLanguagePriv));
}
......@@ -143,13 +149,6 @@ language_finalize (GObject *object)
priv = GET_PRIV (object);
if (priv->config) {
g_signal_handlers_disconnect_by_func (priv->config,
language_notify_cb,
TRACKER_LANGUAGE (object));
g_object_unref (priv->config);
}
if (priv->stemmer) {
g_mutex_lock (priv->stemmer_mutex);
sb_stemmer_delete (priv->stemmer);
......@@ -162,6 +161,8 @@ language_finalize (GObject *object)
g_hash_table_unref (priv->stop_words);
}
g_free (priv->language_code);
(G_OBJECT_CLASS (tracker_language_parent_class)->finalize) (object);
}
......@@ -176,12 +177,15 @@ language_get_property (GObject *object,
priv = GET_PRIV (object);
switch (param_id) {
case PROP_CONFIG:
g_value_set_object (value, priv->config);
case PROP_ENABLE_STEMMER:
g_value_set_boolean (value, priv->enable_stemmer);
break;
case PROP_STOP_WORDS:
g_value_set_boxed (value, priv->stop_words);
break;
case PROP_LANGUAGE_CODE:
g_value_set_string (value, priv->language_code);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
......@@ -196,9 +200,13 @@ language_set_property (GObject *object,
GParamSpec *pspec)
{
switch (param_id) {
case PROP_CONFIG:
tracker_language_set_config (TRACKER_LANGUAGE (object),
g_value_get_object (value));
case PROP_ENABLE_STEMMER:
tracker_language_set_enable_stemmer (TRACKER_LANGUAGE (object),
g_value_get_boolean (value));
break;
case PROP_LANGUAGE_CODE:
tracker_language_set_language_code (TRACKER_LANGUAGE (object),
g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
......@@ -306,46 +314,28 @@ language_set_stopword_list (TrackerLanguage *language,
g_free (stem_language_lower);
}
static void
language_notify_cb (TrackerConfig *config,
GParamSpec *param,
gpointer user_data)
{
TrackerLanguage *language;
language = (TrackerLanguage*) user_data;
language_set_stopword_list (language,
tracker_config_get_language (config));
}
TrackerLanguage *
tracker_language_new (TrackerConfig *config)
tracker_language_new (const gchar *language_code)
{
TrackerLanguage *language;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
language = g_object_new (TRACKER_TYPE_LANGUAGE,
"config", config,
language = g_object_new (TRACKER_TYPE_LANGUAGE,
"language-code", language_code,
NULL);
language_set_stopword_list (language,
tracker_config_get_language (config));
return language;
}
TrackerConfig *
tracker_language_get_config (TrackerLanguage *language)
gboolean
tracker_language_get_enable_stemmer (TrackerLanguage *language)
{
TrackerLanguagePriv *priv;
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), TRUE);
priv = GET_PRIV (language);
return priv->config;
return priv->enable_stemmer;
}
GHashTable *
......@@ -360,37 +350,54 @@ tracker_language_get_stop_words (TrackerLanguage *language)
return priv->stop_words;
}
const gchar *
tracker_language_get_language_code (TrackerLanguage *language)
{
TrackerLanguagePriv *priv;
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
priv = GET_PRIV (language);
return priv->language_code;
}
void
tracker_language_set_config (TrackerLanguage *language,
TrackerConfig *config)
tracker_language_set_enable_stemmer (TrackerLanguage *language,
gboolean value)
{
TrackerLanguagePriv *priv;
g_return_if_fail (TRACKER_IS_LANGUAGE (language));
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = GET_PRIV (language);
if (config) {
g_object_ref (config);
}
priv->enable_stemmer = value;
if (priv->config) {
g_signal_handlers_disconnect_by_func (priv->config,
G_CALLBACK (language_notify_cb),
language);
g_object_unref (priv->config);
}
g_object_notify (G_OBJECT (language), "enable-stemmer");
}
priv->config = config;
void
tracker_language_set_language_code (TrackerLanguage *language,
const gchar *value)
{
TrackerLanguagePriv *priv;
g_return_if_fail (TRACKER_IS_LANGUAGE (language));
if (priv->config) {
g_signal_connect (priv->config, "notify::language",
G_CALLBACK (language_notify_cb),
language);
priv = GET_PRIV (language);
g_free (priv->language_code);
priv->language_code = g_strdup (value);
if (!priv->language_code) {
priv->language_code = g_strdup ("en");
}
g_object_notify (G_OBJECT (language), "config");
language_set_stopword_list (language, priv->language_code);
g_object_notify (G_OBJECT (language), "language-code");
}
const gchar *
......@@ -405,7 +412,7 @@ tracker_language_stem_word (TrackerLanguage *language,
priv = GET_PRIV (language);
if (!tracker_config_get_enable_stemmer (priv->config)) {
if (!priv->enable_stemmer) {
return g_strdup (word);
}
......
src/libtracker-common/tracker-language.h
View file @ 418559c4
......@@ -24,8 +24,6 @@
#include <glib-object.h>
#include "tracker-global-config.h"
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
......@@ -50,25 +48,28 @@ struct _TrackerLanguageClass {
GObjectClass parent_class;
};
GType tracker_language_get_type (void) G_GNUC_CONST;
GType tracker_language_get_type (void) G_GNUC_CONST;
TrackerLanguage *tracker_language_new (const gchar *language_code);
TrackerLanguage *tracker_language_new (TrackerConfig *language);
TrackerConfig * tracker_language_get_config (TrackerLanguage *language);
GHashTable * tracker_language_get_stop_words (TrackerLanguage *language);
void tracker_language_set_config (TrackerLanguage *language,
TrackerConfig *config);
const gchar * tracker_language_stem_word (TrackerLanguage *language,
const gchar *word,
gint word_length);
gboolean tracker_language_get_enable_stemmer (TrackerLanguage *language);
GHashTable * tracker_language_get_stop_words (TrackerLanguage *language);
const gchar * tracker_language_get_language_code (TrackerLanguage *language);
/* Utility functions */
gboolean tracker_language_check_exists (const gchar *language_code);
gchar * tracker_language_get_default_code (void);
void tracker_language_set_enable_stemmer (TrackerLanguage *language,
gboolean value);
void tracker_language_set_language_code (TrackerLanguage *language,
const gchar *language_code);
GSList * tracker_language_get_all_by_code (void);
const gchar * tracker_language_stem_word (TrackerLanguage *language,
const gchar *word,
gint word_length);
const gchar * tracker_language_get_name_by_code (const gchar *language_code);
const gchar * tracker_language_get_code_by_name (const gchar *langauge_name);
/* Utility functions */
gboolean tracker_language_check_exists (const gchar *language_code);
gchar * tracker_language_get_default_code (void);
GSList * tracker_language_get_all_by_code (void);
const gchar * tracker_language_get_name_by_code (const gchar *language_code);
const gchar * tracker_language_get_code_by_name (const gchar *langauge_name);