diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/chat_session.c | 112 | ||||
| -rw-r--r-- | src/chat_session.h | 47 | ||||
| -rw-r--r-- | src/profanity.c | 2 | ||||
| -rw-r--r-- | tests/test_chat_session.c | 73 | ||||
| -rw-r--r-- | tests/testsuite.c | 1 | ||||
| -rw-r--r-- | tests/testsuite.h | 1 |
7 files changed, 240 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d4a8da4d..ff446943 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,13 +6,15 @@ profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \ src/contact_list.c src/input_win.c src/log.h src/profanity.c \ src/prof_history.c src/ui.h src/common.h src/ contact_list.h src/jabber.c \ src/main.c src/profanity.h src/prof_history.h src/chat_log.c \ - src/chat_log.h src/tinyurl.c src/tinyurl.h + src/chat_log.h src/tinyurl.c src/tinyurl.h src/chat_session.c \ + src/chat_session.h TESTS = tests/testsuite check_PROGRAMS = tests/testsuite tests_testsuite_SOURCES = tests/test_contact_list.c src/contact_list.c src/contact.c \ tests/test_common.c tests/test_prof_history.c src/prof_history.c src/common.c \ - tests/test_prof_autocomplete.c src/prof_autocomplete.c tests/testsuite.c + tests/test_prof_autocomplete.c src/prof_autocomplete.c tests/testsuite.c \ + tests/test_chat_session.c src/chat_session.c tests_testsuite_LDADD = -lheadunit -lstdc++ man_MANS = docs/profanity.1 diff --git a/src/chat_session.c b/src/chat_session.c new file mode 100644 index 00000000..ff51b29d --- /dev/null +++ b/src/chat_session.c @@ -0,0 +1,112 @@ +/* + * chat_session.c + * + * Copyright (C) 2012 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity 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 3 of the License, or + * (at your option) any later version. + * + * Profanity 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 Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdlib.h> +#include <string.h> + +#include <glib.h> + +#include "chat_session.h" + +static ChatSession _chat_session_new(char *recipient); +static void _chat_session_free(ChatSession session); + +struct chat_session_t { + char *recipient; + chat_state_t state; + gboolean sent; +}; + +static GHashTable *sessions; + +void +chat_session_init(void) +{ + sessions = g_hash_table_new_full(NULL, g_str_equal, g_free, + (GDestroyNotify)_chat_session_free); +} + +void +chat_session_start(char *recipient) +{ + ChatSession session = _chat_session_new(recipient); + g_hash_table_insert(sessions, recipient, session); +} + +void +chat_session_end(char *recipient) +{ + g_hash_table_remove(sessions, recipient); +} + +chat_state_t +chat_session_get_state(char *recipient) +{ + ChatSession session = g_hash_table_lookup(sessions, recipient); + if (session == NULL) { + return SESSION_ERR; + } else { + return session->state; + } +} + +void +chat_session_set_state(char *recipient, chat_state_t state) +{ + ChatSession session = g_hash_table_lookup(sessions, recipient); + session->state = state; +} + +gboolean +chat_session_get_sent(char *recipient) +{ + ChatSession session = g_hash_table_lookup(sessions, recipient); + return session->sent; +} + +void +chat_session_sent(char *recipient) +{ + ChatSession session = g_hash_table_lookup(sessions, recipient); + session->sent = TRUE; +} + +static ChatSession +_chat_session_new(char *recipient) +{ + ChatSession new_session = malloc(sizeof(struct chat_session_t)); + new_session->recipient = malloc(strlen(recipient) + 1); + strcpy(new_session->recipient, recipient); + new_session->state = ACTIVE; + new_session->sent = FALSE; + + return new_session; +} + +static void +_chat_session_free(ChatSession session) +{ + if (session != NULL) { + g_free(session->recipient); + g_free(session); + } +} diff --git a/src/chat_session.h b/src/chat_session.h new file mode 100644 index 00000000..8c0d9048 --- /dev/null +++ b/src/chat_session.h @@ -0,0 +1,47 @@ +/* + * chat_session.h + * + * Copyright (C) 2012 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity 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 3 of the License, or + * (at your option) any later version. + * + * Profanity 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 Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef CHAT_SESSION_H +#define CHAT_SESSION_H + +#include <glib.h> + +typedef struct chat_session_t *ChatSession; + +typedef enum { + ACTIVE, + INACTIVE, + GONE, + COMPOSING, + PAUSED, + SESSION_ERR +} chat_state_t; + +void chat_session_init(void); +void chat_session_start(char *recipient); +void chat_session_end(char *recipient); +chat_state_t chat_session_get_state(char *recipient); +void chat_session_set_state(char *recipient, chat_state_t state); +gboolean chat_session_get_sent(char *recipient); +void chat_session_sent(char *recipient); + +#endif diff --git a/src/profanity.c b/src/profanity.c index 521b277e..1a56f0cb 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -89,6 +89,8 @@ prof_run(const int disable_tls, char *log_level) inp[size++] = '\0'; cmd_result = _process_input(inp); } + + g_timer_destroy(timer); } void diff --git a/tests/test_chat_session.c b/tests/test_chat_session.c new file mode 100644 index 00000000..0a4dd262 --- /dev/null +++ b/tests/test_chat_session.c @@ -0,0 +1,73 @@ +#include <stdio.h> +#include <head-unit.h> +#include "chat_session.h" + +void setup(void) +{ + chat_session_init(); +} + +void adding_new_sets_state_to_active(void) +{ + chat_session_start("prof1@panesar"); + chat_state_t state = chat_session_get_state("prof1@panesar"); + + assert_int_equals(ACTIVE, state); +} + +void set_inactive(void) +{ + chat_session_start("prof2@panesar"); + chat_session_set_state("prof2@panesar", INACTIVE); + chat_state_t state = chat_session_get_state("prof2@panesar"); + + assert_int_equals(INACTIVE, state); +} + +void set_gone(void) +{ + chat_session_start("prof3@panesar"); + chat_session_set_state("prof3@panesar", GONE); + chat_state_t state = chat_session_get_state("prof3@panesar"); + + assert_int_equals(GONE, state); +} + +void set_composing(void) +{ + chat_session_start("prof4@panesar"); + chat_session_set_state("prof4@panesar", COMPOSING); + chat_state_t state = chat_session_get_state("prof4@panesar"); + + assert_int_equals(COMPOSING, state); +} + +void set_paused(void) +{ + chat_session_start("prof5@panesar"); + chat_session_set_state("prof5@panesar", PAUSED); + chat_state_t state = chat_session_get_state("prof5@panesar"); + + assert_int_equals(PAUSED, state); +} + +void end_session(void) +{ + chat_session_start(strdup("prof6@panesar")); + chat_session_end("prof6@panesar"); + chat_state_t state = chat_session_get_state("prof5@panesat"); + + assert_int_equals(SESSION_ERR, state); +} + +void register_chat_session_tests(void) +{ + TEST_MODULE("chat_session_tests"); + SETUP(setup); + TEST(adding_new_sets_state_to_active); + TEST(set_inactive); + TEST(set_gone); + TEST(set_composing); + TEST(set_paused); + TEST(end_session); +} diff --git a/tests/testsuite.c b/tests/testsuite.c index e7a23005..b4001ef1 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -7,6 +7,7 @@ int main(void) register_contact_list_tests(); register_common_tests(); register_prof_autocomplete_tests(); + register_chat_session_tests(); run_suite(); return 0; } diff --git a/tests/testsuite.h b/tests/testsuite.h index 45145c9b..cd836622 100644 --- a/tests/testsuite.h +++ b/tests/testsuite.h @@ -5,5 +5,6 @@ void register_prof_history_tests(void); void register_contact_list_tests(void); void register_common_tests(void); void register_prof_autocomplete_tests(void); +void register_chat_session_tests(void); #endif |