X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=59f3999d8bce5fc8af7de3b32831fe6c27d6d15e;hp=13411c9aadd3b15ce817b326e7e1a80ef2031154;hb=c15a1b330bc1435c92221214108e398fd9dc1271;hpb=b2274ef4407e7794c89ef821944f5a16bb2de2df
diff --git a/src/main.c b/src/main.c
index 13411c9..59f3999 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,7 +51,8 @@ enum {
enum {
COL_HEADLINE_TITLE,
- COL_HEADLINE_ID
+ COL_HEADLINE_ID,
+ COL_HEADLINE_DATE
};
static struct option long_options[] = {
@@ -97,30 +98,34 @@ static void print_help()
GtkTreeView *w_feedtree;
GtkTreeView *w_headlinetree;
+static char *feed_get_formated_title(struct feed *f)
+{
+ if (f->unread)
+ return g_strdup_printf("%s (%d)",
+ f->title,
+ f->unread);
+ else
+ return strdup(f->title);
+}
+
void update()
{
struct feed **feeds;
- GtkTreeModel *model, *headlinemodel;
+ GtkTreeModel *model, *headline_model;
GtkTreeIter iter;
char *title;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
+ headline_model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_headlinetree));
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));
+ gtk_list_store_clear(GTK_LIST_STORE(headline_model));
log_debug("update(): clear feed tree done.");
feeds = ttrss_get_feeds();
while (feeds && *feeds) {
- if ((*feeds)->unread)
- title = g_strdup_printf("%s (%d)",
- (*feeds)->title,
- (*feeds)->unread);
- else
- title = strdup((*feeds)->title);
-
+ title = feed_get_formated_title(*feeds);
gtk_list_store_append(GTK_LIST_STORE(model), &iter);
@@ -129,9 +134,12 @@ void update()
COL_FEED_TITLE, title,
COL_FEED_ID, (*feeds)->id,
-1);
- free(title);
+ g_free(title);
feeds++;
}
+
+ ttrs_download_headline_content(feeds);
+
model_state = 0;
log_debug("update() done");
@@ -269,14 +277,37 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
return NULL;
}
+static char *headline_get_formated_headline(struct headline *h)
+{
+ if (h->unread)
+ return g_strdup_printf("%s", h->title);
+ else
+ return strdup(h->title);
+}
+
+static char *headline_get_date(struct headline *h)
+{
+ struct tm *tmp;
+ char date[200];
+
+ tmp = localtime(&h->date);
+
+ if (h->unread)
+ strftime(date, sizeof(date), "%D", tmp);
+ else
+ strftime(date, sizeof(date), "%D", tmp);
+
+ return strdup(date);
+}
+
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;
+ struct headline **headlines, *h;
+ char *title, *date;
if (model_state)
return TRUE;
@@ -296,22 +327,23 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
while (headlines && *headlines) {
gtk_list_store_append(headline_store, &iter);
- if ((*headlines)->unread)
- title = g_strdup_printf
- ("%s",
- (*headlines)->title);
- else
- title = strdup((*headlines)->title);
+ h = *headlines;
+
+ title = headline_get_formated_headline(h);
+ date = headline_get_date(h);
gtk_list_store_set(headline_store,
&iter,
COL_HEADLINE_TITLE,
title,
COL_HEADLINE_ID,
- (*headlines)->id,
+ h->id,
+ COL_HEADLINE_DATE,
+ date,
-1);
- free(title);
+ g_free(title);
+ free(date);
headlines++;
}
@@ -504,7 +536,6 @@ int main(int argc, char **argv)
log_init();
- http_init();
ws_init();
gtk_init(NULL, NULL);