X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=6d9aeaddce7b41f88c11950f72d57416446266df;hp=35c73a5270aa47a0c6769329ebfce7273569ca71;hb=5bb795e97e53ef92cb7b28ee3598ad2aa4ec65d3;hpb=fcbd2ee0b482ffead7c1acfcc7562f5d6c3016bd

diff --git a/src/main.c b/src/main.c
index 35c73a5..6d9aead 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,22 +21,43 @@
 #include <string.h>
 #include <getopt.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <json/json.h>
-#include "ttrss.h"
 #include <webkit/webkit.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "phttp.h"
+#include "http.h"
+#include "log.h"
+#include "ttrss.h"
+#include "ttrss_ws.h"
 #include "webbrowser.h"
 
 static const char *program_name;
 static GSettings *settings;
 
+static GtkPaned *w_panel;
+static GtkLabel *w_headline_title;
+static GtkLabel *w_headline_date;
+
+static int model_state;
+
+enum {
+	COL_FEED_TITLE,
+	COL_FEED_ID
+};
+
+enum {
+	COL_HEADLINE_TITLE,
+	COL_HEADLINE_ID
+};
 
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
+	{"debug", required_argument, 0, 'd'},
 	{0, 0, 0, 0}
 };
 
@@ -62,6 +83,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("");
 
@@ -70,42 +94,82 @@ static void print_help()
 	printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
 }
 
-GtkTreeView *w_treeview;
-GtkTreeView *w_headlineview;
+GtkTreeView *w_feedtree;
+GtkTreeView *w_headlinetree;
 
 void update()
 {
 	struct feed **feeds;
-	GtkTreeModel *model;
+	GtkTreeModel *model, *headlinemodel;
 	GtkTreeIter iter;
+	char *title;
 
-	ttrss_login(g_settings_get_string(settings, "url"),
-		    g_settings_get_string(settings, "user"),
-		    g_settings_get_string(settings, "password"));
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
 
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
+	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));
+	log_debug("update(): clear feed tree done.");
+	feeds = ttrss_get_feeds();
+	while (feeds && *feeds) {
+		if ((*feeds)->unread)
+			title = g_strdup_printf("<b>%s (%d)</b>",
+						(*feeds)->title,
+						(*feeds)->unread);
+		else
+			title = strdup((*feeds)->title);
+
 
-	for (feeds = ttrss_get_feeds(); *feeds; feeds++) {
 		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
-				   0, (*feeds)->title,
-				   1, (*feeds),
+				   COL_FEED_TITLE, title,
+				   COL_FEED_ID, (*feeds)->id,
 				   -1);
+		free(title);
+		feeds++;
+	}
+	model_state = 0;
+
+	log_debug("update() done");
+}
 
+void update_layout()
+{
+	int layout;
+
+	layout = g_settings_get_int(settings, "layout");
+
+	switch (layout) {
+	case 1:
+		gtk_orientable_set_orientation(GTK_ORIENTABLE(w_panel),
+					       GTK_ORIENTATION_HORIZONTAL);
+		break;
+	case 0:
+	default:
+		gtk_orientable_set_orientation(GTK_ORIENTABLE(w_panel),
+					       GTK_ORIENTATION_VERTICAL);
 	}
-	printf("refresh done\n");
 }
 
-void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
+void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
+{
+	log_debug("refresh_clicked_cbk()");
+	update();
+	log_debug("refresh_clicked_cbk() done");
+}
+
+void preferences_action_activate_cbk(GtkAction *action, gpointer data)
 {
 	GtkDialog *diag;
 	GtkBuilder *builder;
-	GtkEntry *e;
+	GtkEntry *login, *url, *pwd;
+	GtkComboBox *layout;
 
-	printf("settings_activate_cbk\n");
+	log_debug("settings_activate_cbk()");
 
 	builder = gtk_builder_new();
 
@@ -116,64 +180,144 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "settings_dialog"));
 
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "url"));
+	url = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry"));
+	gtk_entry_set_text(url, g_settings_get_string(settings, "url"));
+
+	login = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry"));
+	gtk_entry_set_text(login, g_settings_get_string(settings, "user"));
+
+	pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
+	gtk_entry_set_text(pwd, g_settings_get_string(settings, "password"));
+
+	layout = GTK_COMBO_BOX(gtk_builder_get_object(builder,
+						      "layout"));
+
+	gtk_combo_box_set_active(layout, g_settings_get_int(settings,
+							    "layout"));
 
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "user"));
+	if (gtk_dialog_run(diag)) {
+		g_settings_set_int(settings,
+				   "layout",
+				   gtk_combo_box_get_active(layout));
 
-	e = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
-	gtk_entry_set_text(e, g_settings_get_string(settings, "password"));
+		g_settings_set_string(settings,
+				      "password",
+				      gtk_entry_get_text(pwd));
+		g_settings_set_string(settings,
+				      "url",
+				      gtk_entry_get_text(url));
+		g_settings_set_string(settings,
+				      "user",
+				      gtk_entry_get_text(login));
 
-	printf("%d\n", gtk_dialog_run(diag));
+		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_layout();
+		update();
+	}
 
 	gtk_widget_destroy(GTK_WIDGET(diag));
 
 	g_object_unref(G_OBJECT(builder));
 }
 
-int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+static struct feed *get_selected_feed()
 {
 	GtkTreePath *path;
 	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
-	GtkTreeModel *model, *headline_model;
+	GtkTreeModel *model;
+	int id;
+
+	gtk_tree_view_get_cursor(w_feedtree, &path, &cols);
+
+	if (path) {
+		model = gtk_tree_view_get_model(w_feedtree);
+		gtk_tree_model_get_iter(model, &iter, path);
+		gtk_tree_model_get(model, &iter, 1, &id, -1);
+
+		gtk_tree_path_free(path);
+
+		return ttrss_get_feed(id);
+	}
+
+	return NULL;
+}
+
+static struct headline *get_selected_headline(GtkTreeIter *iter)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *cols;
+	GtkTreeModel *model;
+	int id;
+
+	gtk_tree_view_get_cursor(w_headlinetree, &path, &cols);
+
+	if (path) {
+		model = gtk_tree_view_get_model(w_headlinetree);
+		gtk_tree_model_get_iter(model, iter, path);
+		gtk_tree_model_get(model, iter, 1, &id, -1);
+
+		gtk_tree_path_free(path);
+
+		return ttrss_get_headline(id);
+	}
+
+	return NULL;
+}
+
+int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *headline_model;
 	GtkListStore *headline_store;
 	struct feed *feed;
 	struct headline **headlines;
 	char *title;
 
-	printf("feed_cursor_changed_cbk\n");
+	if (model_state)
+		return TRUE;
 
-	gtk_tree_view_get_cursor(treeview, &path, &cols);
+	log_debug("feed_cursor_changed_cbk()");
 
-	if (path) {
-		model = gtk_tree_view_get_model(treeview);
-		gtk_tree_model_get_iter(model, &iter, path);
-		gtk_tree_model_get(model, &iter, 1, &feed, -1);
+	feed = get_selected_feed();
 
-		headline_model = gtk_tree_view_get_model(w_headlineview);
+	if (feed) {
+		headline_model = gtk_tree_view_get_model(w_headlinetree);
 		headline_store = GTK_LIST_STORE(headline_model);
+		model_state = 1;
 		gtk_list_store_clear(headline_store);
-		for (headlines = feed->headlines; *headlines; headlines++) {
-			gtk_list_store_append(headline_store, &iter);
-
-			if ((*headlines)->unread)
-				title = g_strdup_printf("<b>%s</b>",
-							(*headlines)->title);
-			else
-				title = strdup((*headlines)->title);
-
-			gtk_list_store_set(headline_store,
-					   &iter,
-					   0, title,
-					   1, (*headlines),
-					   -1);
 
-			free(title);
+		if (feed) {
+			headlines = ttrss_feed_get_headlines(feed);
+			while (headlines && *headlines) {
+				gtk_list_store_append(headline_store, &iter);
+
+				if ((*headlines)->unread)
+					title = g_strdup_printf
+						("<b>%s</b>",
+						 (*headlines)->title);
+				else
+					title = strdup((*headlines)->title);
+
+				gtk_list_store_set(headline_store,
+						   &iter,
+						   COL_HEADLINE_TITLE,
+						   title,
+						   COL_HEADLINE_ID,
+						   (*headlines)->id,
+						   -1);
+
+				free(title);
+
+				headlines++;
+			}
 		}
 
-		gtk_tree_path_free(path);
+		model_state = 0;
 	}
 
 	return 1;
@@ -181,27 +325,140 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
-	printf("headline_cursor_changed_cbk\n");
-
-	GtkTreePath *path;
-	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
+	char *str;
 
-	gtk_tree_view_get_cursor(treeview, &path, &cols);
+	log_debug("headline_cursor_changed_cbk()");
 
-	if (path) {
-		model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
-		gtk_tree_model_get_iter(model, &iter, path);
-		gtk_tree_model_get(model, &iter, 1, &headline, -1);
+	if (model_state)
+		return TRUE;
 
-		web_load(((struct headline *)headline)->content);
+	headline = get_selected_headline(&iter);
 
-		gtk_tree_path_free(path);
+	if (headline) {
+		gtk_label_set_text(w_headline_title, headline->title);
+		gtk_label_set_text(w_headline_date, ctime(&headline->date));
+
+
+		str = ttrss_get_headline_content(headline);
+
+		if (str) {
+			web_load(str);
+			free(str);
+		} else {
+			web_load("");
+		}
+
+		if (headline->unread) {
+			ttrss_set_article_unread(headline->id, 0);
+			headline->unread = 0;
+		}
+
+		model = gtk_tree_view_get_model(w_headlinetree);
+		gtk_list_store_set(GTK_LIST_STORE(model),
+				   &iter,
+				   COL_HEADLINE_TITLE, headline->title,
+				   -1);
+	} else {
+		log_debug("headline not found");
 	}
 
-	return 1;
+	return TRUE;
+}
+
+void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
+{
+	GdkScreen *screen;
+	GError *error;
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	struct headline *h;
+	const char *url;
+	int id;
+
+	printf("headline_row_activated_cbk()");
+
+	selection = gtk_tree_view_get_selection(w_headlinetree);
+	model = gtk_tree_view_get_model(w_headlinetree);
+
+	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		gtk_tree_model_get(model, &iter, 1, &id, -1);
+
+		h = ttrss_get_headline(id);
+		if (h) {
+			url = h->url;
+
+			if (gtk_widget_has_screen(widget))
+				screen = gtk_widget_get_screen(widget);
+			else
+				screen = gdk_screen_get_default();
+
+			error = NULL;
+			gtk_show_uri(screen, url,
+				     gtk_get_current_event_time(), &error);
+		}
+	}
+}
+
+gboolean
+window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+	log_debug("window_delete_event_cbk");
+
+	gtk_main_quit();
+
+	return TRUE;
+}
+
+void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	log_debug("quit_activate_cbk");
+
+	gtk_main_quit();
+}
+
+void help_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	log_debug("help_activate_cbk");
+
+	gtk_show_about_dialog
+		(NULL,
+		 "comments",
+		 _("PRSS is a GTK+ client application for Tiny Tiny RSS"),
+		 "copyright",
+		 _("Copyright(c) 2010-2013\njeanfi@gmail.com"),
+		 "logo-icon-name", "prss",
+		 "program-name", "PRSS",
+		 "title", _("About PRSS"),
+		 "version", VERSION,
+		 "website", PACKAGE_URL,
+		 "website-label", _("PRSS Homepage"),
+		 NULL);
+}
+
+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)
@@ -220,9 +477,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);
@@ -241,25 +502,36 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	phttp_init();
+	log_init();
+
+	ws_init();
 
 	gtk_init(NULL, NULL);
 	settings = g_settings_new("prss");
 
+	ttrss_set_config(g_settings_get_string(settings, "url"),
+			 g_settings_get_string(settings, "user"),
+			 g_settings_get_string(settings, "password"));
+	ws_open_session();
+
 	builder = gtk_builder_new();
 	gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
 		 NULL);
 	window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder,
+	w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							  "feed_tree"));
-	w_headlineview = GTK_TREE_VIEW(gtk_builder_get_object(builder,
+	w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							      "headline_tree"));
 
-	gtk_builder_connect_signals(builder, NULL);
+	w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
+	w_headline_title
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_title"));
+	w_headline_date
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_date"));
 
-	update();
+	gtk_builder_connect_signals(builder, NULL);
 
 	panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
 
@@ -268,6 +540,7 @@ int main(int argc, char **argv)
 	g_object_unref(G_OBJECT(builder));
 
 	gtk_widget_show_all(window);
+	update_layout();
 
 	gtk_main();