empathy r2545 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r2545 - trunk/libempathy
- Date: Tue, 3 Mar 2009 09:24:19 +0000 (UTC)
Author: xclaesse
Date: Tue Mar 3 09:24:19 2009
New Revision: 2545
URL: http://svn.gnome.org/viewvc/empathy?rev=2545&view=rev
Log:
Started splitting empathy log code from the log manager to make logging more pluggable. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>
Added:
trunk/libempathy/empathy-log-source-empathy.c
- copied, changed from r2534, /trunk/libempathy/empathy-log-manager.c
trunk/libempathy/empathy-log-source-empathy.h
Modified:
trunk/libempathy/Makefile.am
trunk/libempathy/empathy-log-manager.c
trunk/libempathy/empathy-log-manager.h
Modified: trunk/libempathy/Makefile.am
==============================================================================
--- trunk/libempathy/Makefile.am (original)
+++ trunk/libempathy/Makefile.am Tue Mar 3 09:24:19 2009
@@ -36,6 +36,7 @@
empathy-irc-network-manager.c \
empathy-irc-server.c \
empathy-log-manager.c \
+ empathy-log-source-empathy.c \
empathy-message.c \
empathy-status-presets.c \
empathy-time.c \
Modified: trunk/libempathy/empathy-log-manager.c
==============================================================================
--- trunk/libempathy/empathy-log-manager.c (original)
+++ trunk/libempathy/empathy-log-manager.c Tue Mar 3 09:24:19 2009
@@ -19,6 +19,7 @@
* Boston, MA 02111-1307, USA.
*
* Authors: Xavier Claessens <xclaesse gmail com>
+ * Jonny Lamb <jonny lamb collabora co uk>
*/
#include <config.h>
@@ -29,57 +30,17 @@
#include <glib/gstdio.h>
#include "empathy-log-manager.h"
-#include "empathy-contact.h"
-#include "empathy-time.h"
+#include "empathy-log-source-empathy.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
-#define LOG_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
-#define LOG_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
-#define LOG_DIR_CHATROOMS "chatrooms"
-#define LOG_FILENAME_SUFFIX ".log"
-#define LOG_TIME_FORMAT_FULL "%Y%m%dT%H:%M:%S"
-#define LOG_TIME_FORMAT "%Y%m%d"
-#define LOG_HEADER \
- "<?xml version='1.0' encoding='utf-8'?>\n" \
- "<?xml-stylesheet type=\"text/xsl\" href=\"empathy-log.xsl\"?>\n" \
- "<log>\n"
-
-#define LOG_FOOTER \
- "</log>\n"
-
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLogManager)
typedef struct {
- gchar *basedir;
+ GList *sources;
} EmpathyLogManagerPriv;
-static const gchar * log_manager_get_basedir (EmpathyLogManager *manager);
-static GList * log_manager_get_all_files (EmpathyLogManager *manager,
- const gchar *dir);
-static GList * log_manager_get_chats (EmpathyLogManager *manager,
- const gchar *dir,
- gboolean is_chatroom);
-static gchar * log_manager_get_dir (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom);
-static gchar * log_manager_get_filename (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom);
-static gchar * log_manager_get_filename_for_date (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom,
- const gchar *date);
-static gchar * log_manager_get_timestamp_filename (void);
-static gchar * log_manager_get_timestamp_from_message (EmpathyMessage *message);
-static EmpathyLogSearchHit *log_manager_search_hit_new (EmpathyLogManager *manager,
- const gchar *filename);
-static void log_manager_search_hit_free (EmpathyLogSearchHit *hit);
-
G_DEFINE_TYPE (EmpathyLogManager, empathy_log_manager, G_TYPE_OBJECT);
static EmpathyLogManager * manager_singleton = NULL;
@@ -89,7 +50,6 @@
{
EmpathyLogManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
EMPATHY_TYPE_LOG_MANAGER, EmpathyLogManagerPriv);
-
manager->priv = priv;
}
@@ -97,10 +57,15 @@
log_manager_finalize (GObject *object)
{
EmpathyLogManagerPriv *priv;
+ GList *l;
priv = GET_PRIV (object);
- g_free (priv->basedir);
+ for (l = priv->sources; l; l = l->next) {
+ g_slice_free (EmpathyLogSource, l->data);
+ }
+
+ g_list_free (priv->sources);
}
static GObject *
@@ -146,89 +111,23 @@
gboolean chatroom,
EmpathyMessage *message)
{
- FILE *file;
- McAccount *account;
- EmpathyContact *sender;
- const gchar *body_str;
- const gchar *str;
- EmpathyAvatar *avatar;
- gchar *avatar_token = NULL;
- gchar *filename;
- gchar *basedir;
- gchar *body;
- gchar *timestamp;
- gchar *contact_name;
- gchar *contact_id;
- TpChannelTextMessageType msg_type;
+ EmpathyLogManagerPriv *priv;
+ GList *l;
g_return_if_fail (EMPATHY_IS_LOG_MANAGER (manager));
g_return_if_fail (chat_id != NULL);
g_return_if_fail (EMPATHY_IS_MESSAGE (message));
- sender = empathy_message_get_sender (message);
- account = empathy_contact_get_account (sender);
- body_str = empathy_message_get_body (message);
- msg_type = empathy_message_get_tptype (message);
-
- if (EMP_STR_EMPTY (body_str)) {
- return;
- }
-
- filename = log_manager_get_filename (manager, account, chat_id, chatroom);
- basedir = g_path_get_dirname (filename);
- if (!g_file_test (basedir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
- DEBUG ("Creating directory:'%s'", basedir);
+ priv = GET_PRIV (manager);
- g_mkdir_with_parents (basedir, LOG_DIR_CREATE_MODE);
- }
- g_free (basedir);
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
- DEBUG ("Adding message: '%s' to file: '%s'", body_str, filename);
+ if (!source->add_message)
+ continue;
- if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
- file = g_fopen (filename, "w+");
- if (file) {
- g_fprintf (file, LOG_HEADER);
- }
- g_chmod (filename, LOG_FILE_CREATE_MODE);
- } else {
- file = g_fopen (filename, "r+");
- if (file) {
- fseek (file, - strlen (LOG_FOOTER), SEEK_END);
- }
+ source->add_message (manager, chat_id, chatroom, message);
}
-
- body = g_markup_escape_text (body_str, -1);
- timestamp = log_manager_get_timestamp_from_message (message);
-
- str = empathy_contact_get_name (sender);
- contact_name = g_markup_escape_text (str, -1);
-
- str = empathy_contact_get_id (sender);
- contact_id = g_markup_escape_text (str, -1);
-
- avatar = empathy_contact_get_avatar (sender);
- if (avatar) {
- avatar_token = g_markup_escape_text (avatar->token, -1);
- }
-
- g_fprintf (file,
- "<message time='%s' id='%s' name='%s' token='%s' isuser='%s' type='%s'>%s</message>\n" LOG_FOOTER,
- timestamp,
- contact_id,
- contact_name,
- avatar_token ? avatar_token : "",
- empathy_contact_is_user (sender) ? "true" : "false",
- empathy_message_type_to_str (msg_type),
- body);
-
- fclose (file);
- g_free (filename);
- g_free (contact_id);
- g_free (contact_name);
- g_free (timestamp);
- g_free (body);
- g_free (avatar_token);
}
gboolean
@@ -237,180 +136,59 @@
const gchar *chat_id,
gboolean chatroom)
{
- gchar *dir;
- gboolean exists;
-
- dir = log_manager_get_dir (manager, account, chat_id, chatroom);
- exists = g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
- g_free (dir);
-
- return exists;
-}
-
-GList *
-empathy_log_manager_get_dates (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
-{
- GList *dates = NULL;
- gchar *date;
- gchar *directory;
- GDir *dir;
- const gchar *filename;
- const gchar *p;
-
- g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- g_return_val_if_fail (chat_id != NULL, NULL);
+ GList *l;
+ EmpathyLogManagerPriv *priv;
- directory = log_manager_get_dir (manager, account, chat_id, chatroom);
- dir = g_dir_open (directory, 0, NULL);
- if (!dir) {
- DEBUG ("Could not open directory:'%s'", directory);
- g_free (directory);
- return NULL;
- }
+ g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), FALSE);
+ g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE);
+ g_return_val_if_fail (chat_id != NULL, FALSE);
- DEBUG ("Collating a list of dates in:'%s'", directory);
+ priv = GET_PRIV (manager);
- while ((filename = g_dir_read_name (dir)) != NULL) {
- if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
- continue;
- }
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
- p = strstr (filename, LOG_FILENAME_SUFFIX);
- date = g_strndup (filename, p - filename);
- if (!date) {
+ if (!source->exists)
continue;
- }
- if (!g_regex_match_simple ("\\d{8}", date, 0, 0)) {
- continue;
+ if (source->exists (manager, account, chat_id, chatroom)) {
+ return TRUE;
}
-
- dates = g_list_insert_sorted (dates, date, (GCompareFunc) strcmp);
}
- g_free (directory);
- g_dir_close (dir);
-
- DEBUG ("Parsed %d dates", g_list_length (dates));
-
- return dates;
+ return FALSE;
}
GList *
-empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
- const gchar *filename)
+empathy_log_manager_get_dates (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom)
{
- GList *messages = NULL;
- xmlParserCtxtPtr ctxt;
- xmlDocPtr doc;
- xmlNodePtr log_node;
- xmlNodePtr node;
- EmpathyLogSearchHit *hit;
- McAccount *account;
+ GList *l, *out = NULL;
+ EmpathyLogManagerPriv *priv;
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
- g_return_val_if_fail (filename != NULL, NULL);
+ g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+ g_return_val_if_fail (chat_id != NULL, NULL);
- DEBUG ("Attempting to parse filename:'%s'...", filename);
+ priv = GET_PRIV (manager);
- if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
- DEBUG ("Filename:'%s' does not exist", filename);
- return NULL;
- }
-
- /* Get the account from the filename */
- hit = log_manager_search_hit_new (manager, filename);
- account = g_object_ref (hit->account);
- log_manager_search_hit_free (hit);
-
- /* Create parser. */
- ctxt = xmlNewParserCtxt ();
-
- /* Parse and validate the file. */
- doc = xmlCtxtReadFile (ctxt, filename, NULL, 0);
- if (!doc) {
- g_warning ("Failed to parse file:'%s'", filename);
- xmlFreeParserCtxt (ctxt);
- return NULL;
- }
-
- /* The root node, presets. */
- log_node = xmlDocGetRootElement (doc);
- if (!log_node) {
- xmlFreeDoc (doc);
- xmlFreeParserCtxt (ctxt);
- return NULL;
- }
-
- /* Now get the messages. */
- for (node = log_node->children; node; node = node->next) {
- EmpathyMessage *message;
- EmpathyContact *sender;
- gchar *time;
- time_t t;
- gchar *sender_id;
- gchar *sender_name;
- gchar *sender_avatar_token;
- gchar *body;
- gchar *is_user_str;
- gboolean is_user = FALSE;
- gchar *msg_type_str;
- TpChannelTextMessageType msg_type = TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL;
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
- if (strcmp (node->name, "message") != 0) {
+ if (!source->get_dates)
continue;
- }
- body = xmlNodeGetContent (node);
- time = xmlGetProp (node, "time");
- sender_id = xmlGetProp (node, "id");
- sender_name = xmlGetProp (node, "name");
- sender_avatar_token = xmlGetProp (node, "token");
- is_user_str = xmlGetProp (node, "isuser");
- msg_type_str = xmlGetProp (node, "type");
-
- if (is_user_str) {
- is_user = strcmp (is_user_str, "true") == 0;
- }
- if (msg_type_str) {
- msg_type = empathy_message_type_from_str (msg_type_str);
+ if (!out) {
+ out = source->get_dates (manager, account, chat_id, chatroom);
+ } else {
+ /* TODO fix this */
+ out = g_list_concat (out, source->get_dates (manager, account, chat_id, chatroom));
}
-
- t = empathy_time_parse (time);
-
- sender = empathy_contact_new_full (account, sender_id, sender_name);
- empathy_contact_set_is_user (sender, is_user);
- if (!EMP_STR_EMPTY (sender_avatar_token)) {
- empathy_contact_load_avatar_cache (sender,
- sender_avatar_token);
- }
-
- message = empathy_message_new (body);
- empathy_message_set_sender (message, sender);
- empathy_message_set_timestamp (message, t);
- empathy_message_set_tptype (message, msg_type);
-
- messages = g_list_append (messages, message);
-
- g_object_unref (sender);
- xmlFree (time);
- xmlFree (sender_id);
- xmlFree (sender_name);
- xmlFree (body);
- xmlFree (is_user_str);
- xmlFree (msg_type_str);
}
- DEBUG ("Parsed %d messages", g_list_length (messages));
-
- xmlFreeDoc (doc);
- xmlFreeParserCtxt (ctxt);
-
- return messages;
+ return out;
}
GList *
@@ -420,18 +198,29 @@
gboolean chatroom,
const gchar *date)
{
- gchar *filename;
- GList *messages;
+ GList *l, *out = NULL;
+ EmpathyLogManagerPriv *priv;
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
g_return_val_if_fail (chat_id != NULL, NULL);
- filename = log_manager_get_filename_for_date (manager, account, chat_id, chatroom, date);
- messages = empathy_log_manager_get_messages_for_file (manager, filename);
- g_free (filename);
+ priv = GET_PRIV (manager);
+
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
- return messages;
+ if (!source->get_messages_for_date)
+ continue;
+
+ if (!out) {
+ out = source->get_messages_for_date (manager, account, chat_id, chatroom, date);
+ } else {
+ out = g_list_concat (out, source->get_messages_for_date (manager, account, chat_id, chatroom, date));
+ }
+ }
+
+ return out;
}
GList *
@@ -440,102 +229,101 @@
const gchar *chat_id,
gboolean chatroom)
{
- GList *messages = NULL;
- GList *dates;
- GList *l;
+ GList *l, *out = NULL;
+ EmpathyLogManagerPriv *priv;
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
g_return_val_if_fail (chat_id != NULL, NULL);
- dates = empathy_log_manager_get_dates (manager, account, chat_id, chatroom);
+ priv = GET_PRIV (manager);
- l = g_list_last (dates);
- if (l) {
- messages = empathy_log_manager_get_messages_for_date (manager,
- account,
- chat_id,
- chatroom,
- l->data);
- }
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
- g_list_foreach (dates, (GFunc) g_free, NULL);
- g_list_free (dates);
+ if (!source->get_last_messages)
+ continue;
+
+ if (!out) {
+ out = source->get_last_messages (manager, account, chat_id, chatroom);
+ } else {
+ out = g_list_concat (out, source->get_last_messages (manager, account, chat_id, chatroom));
+ }
+ }
- return messages;
+ return out;
}
GList *
empathy_log_manager_get_chats (EmpathyLogManager *manager,
McAccount *account)
{
- const gchar *basedir;
- gchar *dir;
+ GList *l, *out = NULL;
+ EmpathyLogManagerPriv *priv;
- basedir = log_manager_get_basedir (manager);
- dir = g_build_filename (basedir,
- mc_account_get_unique_name (account),
- NULL);
+ g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+ g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+
+ priv = GET_PRIV (manager);
+
+ DEBUG ("size of sources is %i", g_list_length (priv->sources));
+
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
+
+ if (!source->get_chats)
+ continue;
- return log_manager_get_chats (manager, dir, FALSE);
+ if (!out) {
+ out = source->get_chats (manager, account);
+ } else {
+ out = g_list_concat (out, source->get_chats (manager, account));
+ }
+ }
+
+ return out;
}
GList *
empathy_log_manager_search_new (EmpathyLogManager *manager,
const gchar *text)
{
- GList *files, *l;
- GList *hits = NULL;
- gchar *text_casefold;
+ GList *l, *out = NULL;
+ EmpathyLogManagerPriv *priv;
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
g_return_val_if_fail (!EMP_STR_EMPTY (text), NULL);
- text_casefold = g_utf8_casefold (text, -1);
-
- files = log_manager_get_all_files (manager, NULL);
- DEBUG ("Found %d log files in total", g_list_length (files));
-
- for (l = files; l; l = l->next) {
- gchar *filename;
- GMappedFile *file;
- gsize length;
- gchar *contents;
- gchar *contents_casefold;
+ priv = GET_PRIV (manager);
- filename = l->data;
+ for (l = priv->sources; l; l = l->next) {
+ EmpathyLogSource *source = (EmpathyLogSource *) l->data;
- file = g_mapped_file_new (filename, FALSE, NULL);
- if (!file) {
+ if (!source->search_new)
continue;
- }
- length = g_mapped_file_get_length (file);
- contents = g_mapped_file_get_contents (file);
- contents_casefold = g_utf8_casefold (contents, length);
-
- g_mapped_file_free (file);
-
- if (strstr (contents_casefold, text_casefold)) {
- EmpathyLogSearchHit *hit;
-
- hit = log_manager_search_hit_new (manager, filename);
-
- if (hit) {
- hits = g_list_prepend (hits, hit);
- DEBUG ("Found text:'%s' in file:'%s' on date:'%s'",
- text, hit->filename, hit->date);
- }
+ if (!out) {
+ out = source->search_new (manager, text);
+ } else {
+ out = g_list_concat (out, source->search_new (manager, text));
}
+ }
- g_free (contents_casefold);
- g_free (filename);
+ return out;
+}
+
+void
+empathy_log_manager_search_hit_free (EmpathyLogSearchHit *hit)
+{
+ if (hit->account) {
+ g_object_unref (hit->account);
}
- g_list_free (files);
- g_free (text_casefold);
+ g_free (hit->date);
+ g_free (hit->filename);
+ g_free (hit->chat_id);
- return hits;
+ g_slice_free (EmpathyLogSearchHit, hit);
}
void
@@ -544,7 +332,7 @@
GList *l;
for (l = hits; l; l = l->next) {
- log_manager_search_hit_free (l->data);
+ empathy_log_manager_search_hit_free (l->data);
}
g_list_free (hits);
@@ -560,246 +348,3 @@
return empathy_time_to_string_local (t, "%a %d %b %Y");
}
-
-static const gchar *
-log_manager_get_basedir (EmpathyLogManager *manager)
-{
- EmpathyLogManagerPriv *priv;
-
- priv = GET_PRIV (manager);
-
- if (priv->basedir) {
- return priv->basedir;
- }
-
- priv->basedir = g_build_path (G_DIR_SEPARATOR_S,
- g_get_home_dir (),
- ".gnome2",
- PACKAGE_NAME,
- "logs",
- NULL);
-
- return priv->basedir;
-}
-
-static GList *
-log_manager_get_all_files (EmpathyLogManager *manager,
- const gchar *dir)
-{
- GDir *gdir;
- GList *files = NULL;
- const gchar *name;
-
- if (!dir) {
- dir = log_manager_get_basedir (manager);
- }
-
- gdir = g_dir_open (dir, 0, NULL);
- if (!gdir) {
- return NULL;
- }
-
- while ((name = g_dir_read_name (gdir)) != NULL) {
- gchar *filename;
-
- filename = g_build_filename (dir, name, NULL);
- if (g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
- files = g_list_prepend (files, filename);
- continue;
- }
-
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- /* Recursively get all log files */
- files = g_list_concat (files, log_manager_get_all_files (manager, filename));
- }
- g_free (filename);
- }
-
- g_dir_close (gdir);
-
- return files;
-}
-
-static GList *
-log_manager_get_chats (EmpathyLogManager *manager,
- const gchar *dir,
- gboolean is_chatroom)
-{
- GDir *gdir;
- GList *hits = NULL;
- const gchar *name;
-
- gdir = g_dir_open (dir, 0, NULL);
- if (!gdir) {
- return NULL;
- }
-
- while ((name = g_dir_read_name (gdir)) != NULL) {
- EmpathyLogSearchHit *hit;
- gchar *filename;
-
- filename = g_build_filename (dir, name, NULL);
- if (strcmp (name, LOG_DIR_CHATROOMS) == 0) {
- hits = g_list_concat (hits, log_manager_get_chats (manager, filename, TRUE));
- g_free (filename);
- continue;
- }
-
- hit = g_slice_new0 (EmpathyLogSearchHit);
- hit->chat_id = g_strdup (name);
- hit->is_chatroom = is_chatroom;
-
- hits = g_list_prepend (hits, hit);
- }
-
- g_dir_close (gdir);
-
- return hits;
-}
-
-static gchar *
-log_manager_get_dir (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
-{
- const gchar *account_id;
- gchar *basedir;
-
- account_id = mc_account_get_unique_name (account);
-
- if (chatroom) {
- basedir = g_build_path (G_DIR_SEPARATOR_S,
- log_manager_get_basedir (manager),
- account_id,
- LOG_DIR_CHATROOMS,
- chat_id,
- NULL);
- } else {
- basedir = g_build_path (G_DIR_SEPARATOR_S,
- log_manager_get_basedir (manager),
- account_id,
- chat_id,
- NULL);
- }
-
- return basedir;
-}
-
-static gchar *
-log_manager_get_filename (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
-{
- gchar *basedir;
- gchar *timestamp;
- gchar *filename;
-
- basedir = log_manager_get_dir (manager, account, chat_id, chatroom);
- timestamp = log_manager_get_timestamp_filename ();
- filename = g_build_filename (basedir, timestamp, NULL);
-
- g_free (basedir);
- g_free (timestamp);
-
- return filename;
-}
-
-static gchar *
-log_manager_get_filename_for_date (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom,
- const gchar *date)
-{
- gchar *basedir;
- gchar *timestamp;
- gchar *filename;
-
- basedir = log_manager_get_dir (manager, account, chat_id, chatroom);
- timestamp = g_strconcat (date, LOG_FILENAME_SUFFIX, NULL);
- filename = g_build_filename (basedir, timestamp, NULL);
-
- g_free (basedir);
- g_free (timestamp);
-
- return filename;
-}
-
-static gchar *
-log_manager_get_timestamp_filename (void)
-{
- time_t t;
- gchar *time_str;
- gchar *filename;
-
- t = empathy_time_get_current ();
- time_str = empathy_time_to_string_local (t, LOG_TIME_FORMAT);
- filename = g_strconcat (time_str, LOG_FILENAME_SUFFIX, NULL);
-
- g_free (time_str);
-
- return filename;
-}
-
-static gchar *
-log_manager_get_timestamp_from_message (EmpathyMessage *message)
-{
- time_t t;
-
- t = empathy_message_get_timestamp (message);
-
- /* We keep the timestamps in the messages as UTC. */
- return empathy_time_to_string_utc (t, LOG_TIME_FORMAT_FULL);
-}
-
-static EmpathyLogSearchHit *
-log_manager_search_hit_new (EmpathyLogManager *manager,
- const gchar *filename)
-{
- EmpathyLogSearchHit *hit;
- const gchar *account_name;
- const gchar *end;
- gchar **strv;
- guint len;
-
- if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
- return NULL;
- }
-
- strv = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
- len = g_strv_length (strv);
-
- hit = g_slice_new0 (EmpathyLogSearchHit);
-
- end = strstr (strv[len-1], LOG_FILENAME_SUFFIX);
- hit->date = g_strndup (strv[len-1], end - strv[len-1]);
- hit->chat_id = g_strdup (strv[len-2]);
- hit->is_chatroom = (strcmp (strv[len-3], LOG_DIR_CHATROOMS) == 0);
- if (hit->is_chatroom) {
- account_name = strv[len-4];
- } else {
- account_name = strv[len-3];
- }
- hit->account = mc_account_lookup (account_name);
- hit->filename = g_strdup (filename);
-
- g_strfreev (strv);
-
- return hit;
-}
-
-static void
-log_manager_search_hit_free (EmpathyLogSearchHit *hit)
-{
- if (hit->account) {
- g_object_unref (hit->account);
- }
-
- g_free (hit->date);
- g_free (hit->filename);
- g_free (hit->chat_id);
-
- g_slice_free (EmpathyLogSearchHit, hit);
-}
Modified: trunk/libempathy/empathy-log-manager.h
==============================================================================
--- trunk/libempathy/empathy-log-manager.h (original)
+++ trunk/libempathy/empathy-log-manager.h Tue Mar 3 09:24:19 2009
@@ -19,6 +19,7 @@
* Boston, MA 02111-1307, USA.
*
* Authors: Xavier Claessens <xclaesse gmail com>
+ * Jonny Lamb <jonny lamb collabora co uk>
*/
#ifndef __EMPATHY_LOG_MANAGER_H__
@@ -42,6 +43,7 @@
typedef struct _EmpathyLogManager EmpathyLogManager;
typedef struct _EmpathyLogManagerClass EmpathyLogManagerClass;
typedef struct _EmpathyLogSearchHit EmpathyLogSearchHit;
+typedef struct _EmpathyLogSource EmpathyLogSource;
struct _EmpathyLogManager {
GObject parent;
@@ -60,6 +62,40 @@
gchar *date;
};
+struct _EmpathyLogSource {
+ gboolean (*exists) (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom);
+
+ void (*add_message) (EmpathyLogManager *manager,
+ const gchar *chat_id,
+ gboolean chatroom,
+ EmpathyMessage *message);
+
+ GList * (*get_dates) (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom);
+
+ GList * (*get_messages_for_date) (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom,
+ const gchar *date);
+
+ GList * (*get_last_messages) (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom);
+
+ GList * (*get_chats) (EmpathyLogManager *manager,
+ McAccount *account);
+
+ GList * (*search_new) (EmpathyLogManager *manager,
+ const gchar *text);
+};
+
GType empathy_log_manager_get_type (void) G_GNUC_CONST;
EmpathyLogManager *empathy_log_manager_dup_singleton (void);
void empathy_log_manager_add_message (EmpathyLogManager *manager,
@@ -74,8 +110,6 @@
McAccount *account,
const gchar *chat_id,
gboolean chatroom);
-GList * empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
- const gchar *filename);
GList * empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
McAccount *account,
const gchar *chat_id,
@@ -85,14 +119,13 @@
McAccount *account,
const gchar *chat_id,
gboolean chatroom);
-GList * empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
- const gchar *filename);
GList * empathy_log_manager_get_chats (EmpathyLogManager *manager,
McAccount *account);
GList * empathy_log_manager_search_new (EmpathyLogManager *manager,
const gchar *text);
void empathy_log_manager_search_free (GList *hits);
gchar * empathy_log_manager_get_date_readable (const gchar *date);
+void empathy_log_manager_search_hit_free (EmpathyLogSearchHit *hit);
G_END_DECLS
Copied: trunk/libempathy/empathy-log-source-empathy.c (from r2534, /trunk/libempathy/empathy-log-manager.c)
==============================================================================
--- /trunk/libempathy/empathy-log-manager.c (original)
+++ trunk/libempathy/empathy-log-source-empathy.c Tue Mar 3 09:24:19 2009
@@ -29,6 +29,7 @@
#include <glib/gstdio.h>
#include "empathy-log-manager.h"
+#include "empathy-log-source-empathy.h"
#include "empathy-contact.h"
#include "empathy-time.h"
#include "empathy-utils.h"
@@ -50,101 +51,102 @@
#define LOG_FOOTER \
"</log>\n"
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLogManager)
-typedef struct {
- gchar *basedir;
-} EmpathyLogManagerPriv;
+static gchar *
+log_source_empathy_get_basedir (void)
+{
+ return g_build_path (G_DIR_SEPARATOR_S,
+ g_get_home_dir (),
+ ".gnome2",
+ PACKAGE_NAME,
+ "logs",
+ NULL);
+}
-static const gchar * log_manager_get_basedir (EmpathyLogManager *manager);
-static GList * log_manager_get_all_files (EmpathyLogManager *manager,
- const gchar *dir);
-static GList * log_manager_get_chats (EmpathyLogManager *manager,
- const gchar *dir,
- gboolean is_chatroom);
-static gchar * log_manager_get_dir (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom);
-static gchar * log_manager_get_filename (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom);
-static gchar * log_manager_get_filename_for_date (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom,
- const gchar *date);
-static gchar * log_manager_get_timestamp_filename (void);
-static gchar * log_manager_get_timestamp_from_message (EmpathyMessage *message);
-static EmpathyLogSearchHit *log_manager_search_hit_new (EmpathyLogManager *manager,
- const gchar *filename);
-static void log_manager_search_hit_free (EmpathyLogSearchHit *hit);
+static gchar *
+log_source_empathy_get_dir (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom)
+{
+ const gchar *account_id;
+ gchar *basedir, *log_dir;
-G_DEFINE_TYPE (EmpathyLogManager, empathy_log_manager, G_TYPE_OBJECT);
+ account_id = mc_account_get_unique_name (account);
-static EmpathyLogManager * manager_singleton = NULL;
+ log_dir = log_source_empathy_get_basedir ();
-static void
-empathy_log_manager_init (EmpathyLogManager *manager)
-{
- EmpathyLogManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
- EMPATHY_TYPE_LOG_MANAGER, EmpathyLogManagerPriv);
+ if (chatroom) {
+ basedir = g_build_path (G_DIR_SEPARATOR_S,
+ log_dir,
+ account_id,
+ LOG_DIR_CHATROOMS,
+ chat_id,
+ NULL);
+ } else {
+ basedir = g_build_path (G_DIR_SEPARATOR_S,
+ log_dir,
+ account_id,
+ chat_id,
+ NULL);
+ }
+
+ g_free (log_dir);
- manager->priv = priv;
+ return basedir;
}
-static void
-log_manager_finalize (GObject *object)
+static gchar *
+log_source_empathy_get_timestamp_filename (void)
{
- EmpathyLogManagerPriv *priv;
+ time_t t;
+ gchar *time_str;
+ gchar *filename;
- priv = GET_PRIV (object);
+ t = empathy_time_get_current ();
+ time_str = empathy_time_to_string_local (t, LOG_TIME_FORMAT);
+ filename = g_strconcat (time_str, LOG_FILENAME_SUFFIX, NULL);
+
+ g_free (time_str);
- g_free (priv->basedir);
+ return filename;
}
-static GObject *
-log_manager_constructor (GType type,
- guint n_props,
- GObjectConstructParam *props)
+static gchar *
+log_source_empathy_get_timestamp_from_message (EmpathyMessage *message)
{
- GObject *retval;
-
- if (manager_singleton) {
- retval = g_object_ref (manager_singleton);
- } else {
- retval = G_OBJECT_CLASS (empathy_log_manager_parent_class)->constructor
- (type, n_props, props);
+ time_t t;
- manager_singleton = EMPATHY_LOG_MANAGER (retval);
- g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
- }
+ t = empathy_message_get_timestamp (message);
- return retval;
+ /* We keep the timestamps in the messages as UTC. */
+ return empathy_time_to_string_utc (t, LOG_TIME_FORMAT_FULL);
}
-static void
-empathy_log_manager_class_init (EmpathyLogManagerClass *klass)
+static gchar *
+log_source_empathy_get_filename (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ gchar *basedir;
+ gchar *timestamp;
+ gchar *filename;
- object_class->finalize = log_manager_finalize;
- object_class->constructor = log_manager_constructor;
+ basedir = log_source_empathy_get_dir (manager, account, chat_id, chatroom);
+ timestamp = log_source_empathy_get_timestamp_filename ();
+ filename = g_build_filename (basedir, timestamp, NULL);
- g_type_class_add_private (object_class, sizeof (EmpathyLogManagerPriv));
-}
+ g_free (basedir);
+ g_free (timestamp);
-EmpathyLogManager *
-empathy_log_manager_dup_singleton (void)
-{
- return g_object_new (EMPATHY_TYPE_LOG_MANAGER, NULL);
+ return filename;
}
-void
-empathy_log_manager_add_message (EmpathyLogManager *manager,
- const gchar *chat_id,
- gboolean chatroom,
- EmpathyMessage *message)
+static void
+log_source_empathy_add_message (EmpathyLogManager *manager,
+ const gchar *chat_id,
+ gboolean chatroom,
+ EmpathyMessage *message)
{
FILE *file;
McAccount *account;
@@ -170,11 +172,11 @@
body_str = empathy_message_get_body (message);
msg_type = empathy_message_get_tptype (message);
- if (EMP_STR_EMPTY (body_str)) {
+ if (G_STR_EMPTY (body_str)) {
return;
}
- filename = log_manager_get_filename (manager, account, chat_id, chatroom);
+ filename = log_source_empathy_get_filename (manager, account, chat_id, chatroom);
basedir = g_path_get_dirname (filename);
if (!g_file_test (basedir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
DEBUG ("Creating directory:'%s'", basedir);
@@ -199,7 +201,7 @@
}
body = g_markup_escape_text (body_str, -1);
- timestamp = log_manager_get_timestamp_from_message (message);
+ timestamp = log_source_empathy_get_timestamp_from_message (message);
str = empathy_contact_get_name (sender);
contact_name = g_markup_escape_text (str, -1);
@@ -209,7 +211,7 @@
avatar = empathy_contact_get_avatar (sender);
if (avatar) {
- avatar_token = g_markup_escape_text (avatar->token, -1);
+ avatar_token = g_markup_escape_text (avatar->token, -1);
}
g_fprintf (file,
@@ -231,27 +233,27 @@
g_free (avatar_token);
}
-gboolean
-empathy_log_manager_exists (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
+static gboolean
+log_source_empathy_exists (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom)
{
gchar *dir;
gboolean exists;
- dir = log_manager_get_dir (manager, account, chat_id, chatroom);
+ dir = log_source_empathy_get_dir (manager, account, chat_id, chatroom);
exists = g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
g_free (dir);
return exists;
}
-GList *
-empathy_log_manager_get_dates (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
+static GList *
+log_source_empathy_get_dates (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom)
{
GList *dates = NULL;
gchar *date;
@@ -264,7 +266,7 @@
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
g_return_val_if_fail (chat_id != NULL, NULL);
- directory = log_manager_get_dir (manager, account, chat_id, chatroom);
+ directory = log_source_empathy_get_dir (manager, account, chat_id, chatroom);
dir = g_dir_open (directory, 0, NULL);
if (!dir) {
DEBUG ("Could not open directory:'%s'", directory);
@@ -300,9 +302,66 @@
return dates;
}
-GList *
-empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
- const gchar *filename)
+static gchar *
+log_source_empathy_get_filename_for_date (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom,
+ const gchar *date)
+{
+ gchar *basedir;
+ gchar *timestamp;
+ gchar *filename;
+
+ basedir = log_source_empathy_get_dir (manager, account, chat_id, chatroom);
+ timestamp = g_strconcat (date, LOG_FILENAME_SUFFIX, NULL);
+ filename = g_build_filename (basedir, timestamp, NULL);
+
+ g_free (basedir);
+ g_free (timestamp);
+
+ return filename;
+}
+
+static EmpathyLogSearchHit *
+log_source_empathy_search_hit_new (EmpathyLogManager *manager,
+ const gchar *filename)
+{
+ EmpathyLogSearchHit *hit;
+ const gchar *account_name;
+ const gchar *end;
+ gchar **strv;
+ guint len;
+
+ if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
+ return NULL;
+ }
+
+ strv = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
+ len = g_strv_length (strv);
+
+ hit = g_slice_new0 (EmpathyLogSearchHit);
+
+ end = strstr (strv[len-1], LOG_FILENAME_SUFFIX);
+ hit->date = g_strndup (strv[len-1], end - strv[len-1]);
+ hit->chat_id = g_strdup (strv[len-2]);
+ hit->is_chatroom = (strcmp (strv[len-3], LOG_DIR_CHATROOMS) == 0);
+ if (hit->is_chatroom) {
+ account_name = strv[len-4];
+ } else {
+ account_name = strv[len-3];
+ }
+ hit->account = mc_account_lookup (account_name);
+ hit->filename = g_strdup (filename);
+
+ g_strfreev (strv);
+
+ return hit;
+}
+
+static GList *
+log_source_empathy_get_messages_for_file (EmpathyLogManager *manager,
+ const gchar *filename)
{
GList *messages = NULL;
xmlParserCtxtPtr ctxt;
@@ -323,9 +382,9 @@
}
/* Get the account from the filename */
- hit = log_manager_search_hit_new (manager, filename);
+ hit = log_source_empathy_search_hit_new (manager, filename);
account = g_object_ref (hit->account);
- log_manager_search_hit_free (hit);
+ empathy_log_manager_search_hit_free (hit);
/* Create parser. */
ctxt = xmlNewParserCtxt ();
@@ -384,7 +443,7 @@
sender = empathy_contact_new_full (account, sender_id, sender_name);
empathy_contact_set_is_user (sender, is_user);
- if (!EMP_STR_EMPTY (sender_avatar_token)) {
+ if (!G_STR_EMPTY (sender_avatar_token)) {
empathy_contact_load_avatar_cache (sender,
sender_avatar_token);
}
@@ -413,75 +472,47 @@
return messages;
}
-GList *
-empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom,
- const gchar *date)
-{
- gchar *filename;
- GList *messages;
-
- g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- g_return_val_if_fail (chat_id != NULL, NULL);
-
- filename = log_manager_get_filename_for_date (manager, account, chat_id, chatroom, date);
- messages = empathy_log_manager_get_messages_for_file (manager, filename);
- g_free (filename);
-
- return messages;
-}
-
-GList *
-empathy_log_manager_get_last_messages (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
+static GList *
+log_source_empathy_get_all_files (EmpathyLogManager *manager,
+ const gchar *dir)
{
- GList *messages = NULL;
- GList *dates;
- GList *l;
-
- g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- g_return_val_if_fail (chat_id != NULL, NULL);
+ GDir *gdir;
+ GList *files = NULL;
+ const gchar *name;
+ gchar *basedir;
- dates = empathy_log_manager_get_dates (manager, account, chat_id, chatroom);
+ basedir = dir ? g_strdup (dir) : log_source_empathy_get_basedir ();
- l = g_list_last (dates);
- if (l) {
- messages = empathy_log_manager_get_messages_for_date (manager,
- account,
- chat_id,
- chatroom,
- l->data);
+ gdir = g_dir_open (basedir, 0, NULL);
+ if (!gdir) {
+ g_free (basedir);
+ return NULL;
}
- g_list_foreach (dates, (GFunc) g_free, NULL);
- g_list_free (dates);
+ while ((name = g_dir_read_name (gdir)) != NULL) {
+ gchar *filename;
- return messages;
-}
+ filename = g_build_filename (basedir, name, NULL);
+ if (g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
+ files = g_list_prepend (files, filename);
+ continue;
+ }
-GList *
-empathy_log_manager_get_chats (EmpathyLogManager *manager,
- McAccount *account)
-{
- const gchar *basedir;
- gchar *dir;
+ if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
+ /* Recursively get all log files */
+ files = g_list_concat (files, log_source_empathy_get_all_files (manager, filename));
+ }
+ g_free (filename);
+ }
- basedir = log_manager_get_basedir (manager);
- dir = g_build_filename (basedir,
- mc_account_get_unique_name (account),
- NULL);
+ g_dir_close (gdir);
+ g_free (basedir);
- return log_manager_get_chats (manager, dir, FALSE);
+ return files;
}
-GList *
-empathy_log_manager_search_new (EmpathyLogManager *manager,
+static GList *
+log_source_empathy_search_new (EmpathyLogManager *manager,
const gchar *text)
{
GList *files, *l;
@@ -489,11 +520,11 @@
gchar *text_casefold;
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
- g_return_val_if_fail (!EMP_STR_EMPTY (text), NULL);
+ g_return_val_if_fail (!G_STR_EMPTY (text), NULL);
text_casefold = g_utf8_casefold (text, -1);
- files = log_manager_get_all_files (manager, NULL);
+ files = log_source_empathy_get_all_files (manager, NULL);
DEBUG ("Found %d log files in total", g_list_length (files));
for (l = files; l; l = l->next) {
@@ -519,7 +550,7 @@
if (strstr (contents_casefold, text_casefold)) {
EmpathyLogSearchHit *hit;
- hit = log_manager_search_hit_new (manager, filename);
+ hit = log_source_empathy_search_hit_new (manager, filename);
if (hit) {
hits = g_list_prepend (hits, hit);
@@ -538,92 +569,10 @@
return hits;
}
-void
-empathy_log_manager_search_free (GList *hits)
-{
- GList *l;
-
- for (l = hits; l; l = l->next) {
- log_manager_search_hit_free (l->data);
- }
-
- g_list_free (hits);
-}
-
-/* Format is just date, 20061201. */
-gchar *
-empathy_log_manager_get_date_readable (const gchar *date)
-{
- time_t t;
-
- t = empathy_time_parse (date);
-
- return empathy_time_to_string_local (t, "%a %d %b %Y");
-}
-
-static const gchar *
-log_manager_get_basedir (EmpathyLogManager *manager)
-{
- EmpathyLogManagerPriv *priv;
-
- priv = GET_PRIV (manager);
-
- if (priv->basedir) {
- return priv->basedir;
- }
-
- priv->basedir = g_build_path (G_DIR_SEPARATOR_S,
- g_get_home_dir (),
- ".gnome2",
- PACKAGE_NAME,
- "logs",
- NULL);
-
- return priv->basedir;
-}
-
static GList *
-log_manager_get_all_files (EmpathyLogManager *manager,
- const gchar *dir)
-{
- GDir *gdir;
- GList *files = NULL;
- const gchar *name;
-
- if (!dir) {
- dir = log_manager_get_basedir (manager);
- }
-
- gdir = g_dir_open (dir, 0, NULL);
- if (!gdir) {
- return NULL;
- }
-
- while ((name = g_dir_read_name (gdir)) != NULL) {
- gchar *filename;
-
- filename = g_build_filename (dir, name, NULL);
- if (g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
- files = g_list_prepend (files, filename);
- continue;
- }
-
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- /* Recursively get all log files */
- files = g_list_concat (files, log_manager_get_all_files (manager, filename));
- }
- g_free (filename);
- }
-
- g_dir_close (gdir);
-
- return files;
-}
-
-static GList *
-log_manager_get_chats (EmpathyLogManager *manager,
- const gchar *dir,
- gboolean is_chatroom)
+log_source_empathy_get_chats_for_dir (EmpathyLogManager *manager,
+ const gchar *dir,
+ gboolean is_chatroom)
{
GDir *gdir;
GList *hits = NULL;
@@ -640,7 +589,7 @@
filename = g_build_filename (dir, name, NULL);
if (strcmp (name, LOG_DIR_CHATROOMS) == 0) {
- hits = g_list_concat (hits, log_manager_get_chats (manager, filename, TRUE));
+ hits = g_list_concat (hits, log_source_empathy_get_chats_for_dir (manager, dir, TRUE));
g_free (filename);
continue;
}
@@ -657,149 +606,93 @@
return hits;
}
-static gchar *
-log_manager_get_dir (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
-{
- const gchar *account_id;
- gchar *basedir;
-
- account_id = mc_account_get_unique_name (account);
-
- if (chatroom) {
- basedir = g_build_path (G_DIR_SEPARATOR_S,
- log_manager_get_basedir (manager),
- account_id,
- LOG_DIR_CHATROOMS,
- chat_id,
- NULL);
- } else {
- basedir = g_build_path (G_DIR_SEPARATOR_S,
- log_manager_get_basedir (manager),
- account_id,
- chat_id,
- NULL);
- }
-
- return basedir;
-}
-
-static gchar *
-log_manager_get_filename (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom)
-{
- gchar *basedir;
- gchar *timestamp;
- gchar *filename;
-
- basedir = log_manager_get_dir (manager, account, chat_id, chatroom);
- timestamp = log_manager_get_timestamp_filename ();
- filename = g_build_filename (basedir, timestamp, NULL);
-
- g_free (basedir);
- g_free (timestamp);
-
- return filename;
-}
-static gchar *
-log_manager_get_filename_for_date (EmpathyLogManager *manager,
- McAccount *account,
- const gchar *chat_id,
- gboolean chatroom,
- const gchar *date)
+static GList *
+log_source_empathy_get_messages_for_date (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom,
+ const gchar *date)
{
- gchar *basedir;
- gchar *timestamp;
gchar *filename;
+ GList *messages;
- basedir = log_manager_get_dir (manager, account, chat_id, chatroom);
- timestamp = g_strconcat (date, LOG_FILENAME_SUFFIX, NULL);
- filename = g_build_filename (basedir, timestamp, NULL);
+ g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+ g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+ g_return_val_if_fail (chat_id != NULL, NULL);
- g_free (basedir);
- g_free (timestamp);
+ filename = log_source_empathy_get_filename_for_date (manager, account, chat_id, chatroom, date);
+ messages = log_source_empathy_get_messages_for_file (manager, filename);
+ g_free (filename);
- return filename;
+ return messages;
}
-static gchar *
-log_manager_get_timestamp_filename (void)
+static GList *
+log_source_empathy_get_last_messages (EmpathyLogManager *manager,
+ McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom)
{
- time_t t;
- gchar *time_str;
- gchar *filename;
-
- t = empathy_time_get_current ();
- time_str = empathy_time_to_string_local (t, LOG_TIME_FORMAT);
- filename = g_strconcat (time_str, LOG_FILENAME_SUFFIX, NULL);
+ GList *messages = NULL;
+ GList *dates;
+ GList *l;
- g_free (time_str);
+ g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+ g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+ g_return_val_if_fail (chat_id != NULL, NULL);
- return filename;
-}
+ dates = log_source_empathy_get_dates (manager, account, chat_id, chatroom);
-static gchar *
-log_manager_get_timestamp_from_message (EmpathyMessage *message)
-{
- time_t t;
+ l = g_list_last (dates);
+ if (l) {
+ messages = log_source_empathy_get_messages_for_date (manager,
+ account,
+ chat_id,
+ chatroom,
+ l->data);
+ }
- t = empathy_message_get_timestamp (message);
+ g_list_foreach (dates, (GFunc) g_free, NULL);
+ g_list_free (dates);
- /* We keep the timestamps in the messages as UTC. */
- return empathy_time_to_string_utc (t, LOG_TIME_FORMAT_FULL);
+ return messages;
}
-static EmpathyLogSearchHit *
-log_manager_search_hit_new (EmpathyLogManager *manager,
- const gchar *filename)
+static GList *
+log_source_empathy_get_chats (EmpathyLogManager *manager,
+ McAccount *account)
{
- EmpathyLogSearchHit *hit;
- const gchar *account_name;
- const gchar *end;
- gchar **strv;
- guint len;
-
- if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
- return NULL;
- }
-
- strv = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
- len = g_strv_length (strv);
+ gchar *basedir;
+ gchar *dir;
+ GList *hits;
- hit = g_slice_new0 (EmpathyLogSearchHit);
+ basedir = log_source_empathy_get_basedir ();
+ dir = g_build_filename (basedir,
+ mc_account_get_unique_name (account),
+ NULL);
+ g_free (basedir);
- end = strstr (strv[len-1], LOG_FILENAME_SUFFIX);
- hit->date = g_strndup (strv[len-1], end - strv[len-1]);
- hit->chat_id = g_strdup (strv[len-2]);
- hit->is_chatroom = (strcmp (strv[len-3], LOG_DIR_CHATROOMS) == 0);
- if (hit->is_chatroom) {
- account_name = strv[len-4];
- } else {
- account_name = strv[len-3];
- }
- hit->account = mc_account_lookup (account_name);
- hit->filename = g_strdup (filename);
+ hits = log_source_empathy_get_chats_for_dir (manager, dir, FALSE);
- g_strfreev (strv);
+ g_free (dir);
- return hit;
+ return hits;
}
-static void
-log_manager_search_hit_free (EmpathyLogSearchHit *hit)
+EmpathyLogSource *
+empathy_log_source_empathy_get_source (void)
{
- if (hit->account) {
- g_object_unref (hit->account);
- }
+ EmpathyLogSource *source;
+ source = g_slice_new0 (EmpathyLogSource);
- g_free (hit->date);
- g_free (hit->filename);
- g_free (hit->chat_id);
+ source->exists = log_source_empathy_exists;
+ source->add_message = log_source_empathy_add_message;
+ source->get_dates = log_source_empathy_get_dates;
+ source->get_last_messages = log_source_empathy_get_last_messages;
+ source->get_messages_for_date = log_source_empathy_get_messages_for_date;
+ source->get_chats = log_source_empathy_get_chats;
+ source->search_new = log_source_empathy_search_new;
- g_slice_free (EmpathyLogSearchHit, hit);
+ return source;
}
Added: trunk/libempathy/empathy-log-source-empathy.h
==============================================================================
--- (empty file)
+++ trunk/libempathy/empathy-log-source-empathy.h Tue Mar 3 09:24:19 2009
@@ -0,0 +1,28 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2003-2007 Imendio AB
+ * Copyright (C) 2007-2008 Collabora Ltd.
+ *
+ * This program 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 program 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 program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Xavier Claessens <xclaesse gmail com>
+ */
+
+#include <config.h>
+
+#include "empathy-log-manager.h"
+
+EmpathyLogSource * empathy_log_source_empathy_get_source (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
