X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=be1bd04fe602b16432a5978ffdfb46d78208330b;hp=5b237208b5cffbf0446539e996992c0b518b8163;hb=09a826a93753ebb1b82fbc30574c034f084e02b8;hpb=ba998dd7b5a61fc2a1fa25538dc370eff0368c2c

diff --git a/src/main.c b/src/main.c
index 5b23720..be1bd04 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,13 +21,18 @@
 #include <string.h>
 #include <getopt.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <json/json.h>
 #include <webkit/webkit.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include "http.h"
+#include "log.h"
 #include "ttrss.h"
+#include "ttrss_ws.h"
 #include "webbrowser.h"
 
 static const char *program_name;
@@ -48,6 +53,7 @@ enum {
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
+	{"debug", required_argument, 0, 'd'},
 	{0, 0, 0, 0}
 };
 
@@ -73,6 +79,9 @@ static void print_help()
 	puts(_("Options:"));
 	puts(_("  -h, --help          display this help and exit\n"
 	       "  -v, --version       display version information and exit"));
+	puts("");
+	puts(_("  -d, --debug=LEVEL   "
+	       "set the debug level, integer between 0 and 3"));
 
 	puts("");
 
@@ -93,12 +102,12 @@ void update()
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
 
-	printf("update(): clear feed tree\n");
+	log_debug("update(): clear feed tree.");
 	model_state = 1;
 	gtk_list_store_clear(GTK_LIST_STORE(model));
 	headlinemodel = gtk_tree_view_get_model(w_headlinetree);
 	gtk_list_store_clear(GTK_LIST_STORE(headlinemodel));
-	printf("update(): clear feed tree done\n");
+	log_debug("update(): clear feed tree done.");
 	feeds = ttrss_get_feeds();
 	while (feeds && *feeds) {
 		if ((*feeds)->unread)
@@ -121,13 +130,14 @@ void update()
 	}
 	model_state = 0;
 
-	printf("refresh done\n");
+	log_debug("update() done");
 }
 
 void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 {
-	printf("refresh_clicked_cbk\n");
+	log_debug("refresh_clicked_cbk()");
 	update();
+	log_debug("refresh_clicked_cbk() done");
 }
 
 void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
@@ -136,7 +146,7 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 	GtkBuilder *builder;
 	GtkEntry *login, *url, *pwd;
 
-	printf("settings_activate_cbk\n");
+	log_debug("settings_activate_cbk()");
 
 	builder = gtk_builder_new();
 
@@ -167,6 +177,11 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 				      "user",
 				      gtk_entry_get_text(login));
 
+		ttrss_set_config(g_settings_get_string(settings, "url"),
+				 g_settings_get_string(settings, "user"),
+				 g_settings_get_string(settings, "password"));
+		ws_open_session();
+
 		update();
 	}
 
@@ -232,7 +247,7 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	if (model_state)
 		return TRUE;
 
-	printf("feed_cursor_changed_cbk\n");
+	log_debug("feed_cursor_changed_cbk()");
 
 	feed = get_selected_feed();
 
@@ -279,7 +294,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	struct headline *headline;
 	char *str;
 
-	printf("headline_cursor_changed_cbk\n");
+	log_debug("headline_cursor_changed_cbk()");
 
 	if (model_state)
 		return TRUE;
@@ -307,7 +322,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 				   0, headline->title,
 				   -1);
 	} else {
-		printf("headline not found\n");
+		log_debug("headline not found");
 	}
 
 	return TRUE;
@@ -324,7 +339,7 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 	const char *url;
 	int id;
 
-	printf("headline_row_activated_cbk\n");
+	printf("headline_row_activated_cbk()");
 
 	selection = gtk_tree_view_get_selection(w_headlinetree);
 	model = gtk_tree_view_get_model(w_headlinetree);
@@ -351,13 +366,35 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-	printf("window_delete_event_cbk\n");
+	log_debug("window_delete_event_cbk");
 
 	gtk_main_quit();
 
 	return TRUE;
 }
 
+static void log_init()
+{
+	char *home, *path, *dir;
+
+	home = getenv("HOME");
+
+	if (!home)
+		return ;
+
+	dir = malloc(strlen(home)+1+strlen(".prss")+1);
+	sprintf(dir, "%s/%s", home, ".prss");
+	mkdir(dir, 0777);
+
+	path = malloc(strlen(dir)+1+strlen("log")+1);
+	sprintf(path, "%s/%s", dir, "log");
+
+	log_open(path);
+
+	free(dir);
+	free(path);
+}
+
 int main(int argc, char **argv)
 {
 	GtkWidget *window, *panh;
@@ -374,9 +411,13 @@ int main(int argc, char **argv)
 #endif
 
 	cmdok = 1;
-	while ((optc = getopt_long(argc, argv, "vh", long_options,
+	while ((optc = getopt_long(argc, argv, "vhd:", long_options,
 				   &opti)) != -1) {
 		switch (optc) {
+		case 'd':
+			log_level = atoi(optarg);
+			log_info(_("Enables debug mode."));
+			break;
 		case 'h':
 			print_help();
 			exit(EXIT_SUCCESS);
@@ -395,6 +436,8 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
+	log_init();
+
 	http_init();
 
 	gtk_init(NULL, NULL);