aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Refactored creating new logs

Browse Source
This commit is contained in:
James Booth 2012-10-09 00:10:06 +01:00
parent f8160fc094
commit 3c5a50a664
1 changed files with 59 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
src/chat_log.c
View File

@ -39,6 +39,7 @@ struct dated_chat_log {
static void _close_file(gpointer key, gpointer value, gpointer user_data); static void _close_file(gpointer key, gpointer value, gpointer user_data);
static gboolean _log_roll_needed(struct dated_chat_log *dated_log); static gboolean _log_roll_needed(struct dated_chat_log *dated_log);
static struct dated_chat_log *_create_log(char *other, const char * const login);
void void
chat_log_init(void) chat_log_init(void)
@ -57,69 +58,18 @@ chat_log_chat(const gchar * const login, gchar *other,
// no log for user // no log for user
if (dated_log == NULL) { if (dated_log == NULL) {
GString *log_file = g_string_new(getenv("HOME")); dated_log = _create_log(other, login);
g_string_append(log_file, "/.profanity/log"); g_hash_table_insert(logs, other, dated_log);
create_dir(log_file->str);
gchar *login_dir = str_replace(login, "@", "_at_");
g_string_append_printf(log_file, "/%s", login_dir);
create_dir(log_file->str);
free(login_dir);
gchar *other_file = str_replace(other, "@", "_at_");
g_string_append_printf(log_file, "/%s", other_file);
GDateTime *dt = g_date_time_new_now_local();
gchar *date = g_date_time_format(dt, "_%d_%m_%Y.log");
g_string_append_printf(log_file, date);
logp = fopen(log_file->str, "a");
free(other_file);
g_string_free(log_file, TRUE);
struct dated_chat_log *new_log = malloc(sizeof(struct dated_chat_log));
new_log->logpp = logp;
new_log->date = dt;
g_hash_table_insert(logs, other, new_log);
// log exists but needs rolling // log exists but needs rolling
} else if (_log_roll_needed(dated_log)) { } else if (_log_roll_needed(dated_log)) {
fclose(dated_log->logpp); fclose(dated_log->logpp);
dated_log = _create_log(other, login);
GString *log_file = g_string_new(getenv("HOME")); g_hash_table_replace(logs, other, dated_log);
g_string_append(log_file, "/.profanity/log");
create_dir(log_file->str);
gchar *login_dir = str_replace(login, "@", "_at_");
g_string_append_printf(log_file, "/%s", login_dir);
create_dir(log_file->str);
free(login_dir);
gchar *other_file = str_replace(other, "@", "_at_");
g_string_append_printf(log_file, "/%s", other_file);
GDateTime *dt = g_date_time_new_now_local();
gchar *date = g_date_time_format(dt, "_%d_%m_%Y.log");
g_string_append_printf(log_file, date);
logp = fopen(log_file->str, "a");
free(other_file);
g_string_free(log_file, TRUE);
struct dated_chat_log *new_log = malloc(sizeof(struct dated_chat_log));
new_log->logpp = logp;
new_log->date = dt;
g_hash_table_replace(logs, other, new_log);
// log exists for user
} else {
logp = (FILE *) dated_log->logpp;
} }
logp = (FILE *) dated_log->logpp;
GDateTime *dt = g_date_time_new_now(tz); GDateTime *dt = g_date_time_new_now(tz);
gchar *date_fmt = g_date_time_format(dt, "%H:%M:%S"); gchar *date_fmt = g_date_time_format(dt, "%H:%M:%S");
@ -133,20 +83,6 @@ chat_log_chat(const gchar * const login, gchar *other,
g_date_time_unref(dt); g_date_time_unref(dt);
} }
static gboolean
_log_roll_needed(struct dated_chat_log *dated_log)
{
gboolean result = FALSE;
GDateTime *now = g_date_time_new_now_local();
if (g_date_time_get_day_of_year(dated_log->date) !=
g_date_time_get_day_of_year(now)) {
result = TRUE;
}
g_date_time_unref(now);
return result;
}
void void
chat_log_close(void) chat_log_close(void)
{ {
@ -154,6 +90,58 @@ chat_log_close(void)
g_time_zone_unref(tz); g_time_zone_unref(tz);
} }
static struct dated_chat_log *
_create_log(char *other, const char * const login)
{
GString *log_file = g_string_new(getenv("HOME"));
g_string_append(log_file, "/.profanity/log");
create_dir(log_file->str);
gchar *login_dir = str_replace(login, "@", "_at_");
g_string_append_printf(log_file, "/%s", login_dir);
create_dir(log_file->str);
free(login_dir);
gchar *other_file = str_replace(other, "@", "_at_");
g_string_append_printf(log_file, "/%s", other_file);
GDateTime *dt = g_date_time_new_now_local();
//gchar *date = g_date_time_format(dt, "_%d_%m_%Y.log");
gchar *date = g_date_time_format(dt, "_%d_%m_%Y_%H_%M.log");
g_string_append_printf(log_file, date);
gpointer logp = fopen(log_file->str, "a");
free(other_file);
g_string_free(log_file, TRUE);
struct dated_chat_log *new_log = malloc(sizeof(struct dated_chat_log));
new_log->logpp = logp;
new_log->date = dt;
return new_log;
}
static gboolean
_log_roll_needed(struct dated_chat_log *dated_log)
{
gboolean result = FALSE;
GDateTime *now = g_date_time_new_now_local();
if (g_date_time_get_minute(dated_log->date) !=
g_date_time_get_minute(now)) {
// if (g_date_time_get_day_of_year(dated_log->date) !=
// g_date_time_get_day_of_year(now)) {
result = TRUE;
}
g_date_time_unref(now);
return result;
}
static void static void
_close_file(gpointer key, gpointer value, gpointer user_data) _close_file(gpointer key, gpointer value, gpointer user_data)
{ {