Changeset 2028

Timestamp:

05/18/07 23:59:58 (6 years ago)

Author:

zecke

Message:

2007-05-18 Holger Freyther <zecke@…>

Start caching data

• src/application-data.h: Hold a MokoCache? object
• src/callbacks.c: Move the filling of the GtkListStore? into a method to be used by the method loading from a cache. (add_mrss_item): The refactored method (feed_update_thread): Move the code to add_mrss_item and cache the data. (load_data_from_cache): Empty stub
• src/callbacks.h:
• src/main.c: (main): Create the MokoCache?

Location:

trunk/src/target/OM-2007/applications/openmoko-rssreader

Files:

• ChangeLog (modified) (1 diff)
• src/application-data.h (modified) (1 diff)
• src/callbacks.c (modified) (6 diffs)
• src/callbacks.h (modified) (1 diff)
• src/main.c (modified) (1 diff)

trunk/src/target/OM-2007/applications/openmoko-rssreader/ChangeLog

@@ +1 @@
+2007-05-18  Holger Freyther  <zecke@selfish.org>
+
+        Start caching data
+
+        * src/application-data.h: Hold a MokoCache object
+        * src/callbacks.c: Move the filling of the GtkListStore into a method
+        to be used by the method loading from a cache. 
+        (add_mrss_item): The refactored method
+        (feed_update_thread): Move the code to add_mrss_item and cache the
+        data.
+        (load_data_from_cache): Empty stub
+        * src/callbacks.h:
+        * src/main.c:
+        (main): Create the MokoCache
+
 2007-05-18  Holger Freyther  <zecke@selfish.org>
 

trunk/src/target/OM-2007/applications/openmoko-rssreader/src/application-data.h

@@ -34 +34 @@
 #include <libmokoui/moko-tool-box.h>
 
+#include "moko_cache.h"
+
 #include <gtk/gtk.h>
 
 struct RSSReaderData {
     MokoApplication   *app;
+    MokoCache         *cache;
     GtkMenu           *menu;
     GtkMenu           *filter;

trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.c

@@ -30 +30 @@
 #include "callbacks.h"
 #include "rfcdate.h"
+#include "moko_cache.h"
 
 #include <libmokoui/moko-tool-box.h>
@@ -36 +37 @@
 #include <mrss.h>
 #include <string.h>
+#include <stdlib.h>
 
 struct FeedEntry {
@@ -94 +96 @@
 
 
+static
+void add_mrss_item ( struct RSSReaderData *data, const mrss_t *rss_data, const gchar *url, const gchar *category)
+{
+    GtkTreeIter iter;
+    mrss_item_t *item = rss_data->item;
+
+    while ( item ) {
+        gint content_type = RSS_READER_TEXT_TYPE_NONE;
+        gchar *description = item->description;
+
+        /*
+         * let us try to find the 'content' tag
+         * and then extract the type
+         */
+        if ( !description && rss_data->version == MRSS_VERSION_ATOM_1_0 && item->other_tags ) {
+            for ( mrss_tag_t *tag = item->other_tags; tag; tag = tag->next ) {
+                if ( strcmp( tag->name, "content" ) == 0 ) {
+                    description = tag->value;
+
+                    for ( mrss_attribute_t *attribute = tag->attributes; attribute; attribute = attribute->next ) {
+                        /*
+                         * Detect the type of the content. Currently we know about text/plain and html
+                         */
+                        if ( strcmp( attribute->name, "type" ) == 0 ) {
+                            if ( strcmp( attribute->value, "plain" ) == 0 ) {
+                                content_type = RSS_READER_TEXT_TYPE_PLAIN;
+                            } else if ( strcmp( attribute->name, "html" ) == 0 ) {
+                                content_type = RSS_READER_TEXT_TYPE_HTML;
+                            } else {
+                                content_type = RSS_READER_TEXT_TYPE_UNKNOWN;
+                            }
+                        }
+                    }
+
+                    /* we are done */
+                    break;
+                }
+            }
+        }
+
+        /*
+         * update the model here. The order in gtk_list_store_set must match
+         * with the order in application-data.h
+         */
+        RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
+        rss_rfc_date_set (date, item->pubDate);
+        gdk_threads_enter();
+        gtk_list_store_append( data->feed_data, &iter );
+        gtk_list_store_set   ( data->feed_data, &iter,
+                RSS_READER_COLUMN_AUTHOR, g_strdup( item->author  ),
+                RSS_READER_COLUMN_SUBJECT,g_strdup( item->title   ),
+                RSS_READER_COLUMN_DATE,   date,
+                RSS_READER_COLUMN_LINK,   g_strdup( item->link    ),
+                RSS_READER_COLUMN_TEXT,   g_strdup( description   ),
+                RSS_READER_COLUMN_TEXT_TYPE, content_type          ,
+                RSS_READER_COLUMN_CATEGORY, g_strdup( category ),
+                RSS_READER_COLUMN_SOURCE,  g_strdup( url ),
+                -1 );
+        gdk_threads_leave();
+        item = item->next;
+    }
+
+}
+
 /*
  * asynchronous update thread!
@@ -116 +182 @@
  */
 static void feed_update_thread( struct RSSReaderData *data ) {
-    GtkTreeIter iter;
-
     for ( int i = 0; i < NUMBER_OF_FEEDS; ++i ) {
         mrss_t *rss_data;
-        int ret = mrss_parse_url( s_feeds[i].url, &rss_data );
+        gchar *url = s_feeds[i].url;
+        int ret = mrss_parse_url( url, &rss_data );
         if ( ret ) {
             /* TODO use the footer to report error? */
@@ -127 +192 @@
         }
 
-        mrss_item_t *item = rss_data->item;
-        while ( item ) {
-            gint content_type = RSS_READER_TEXT_TYPE_NONE;
-            gchar *description = item->description;
-
-            /*
-             * let us try to find the 'content' tag
-             * and then extract the type
-             */
-            if ( !description && rss_data->version == MRSS_VERSION_ATOM_1_0 && item->other_tags ) {
-                for ( mrss_tag_t *tag = item->other_tags; tag; tag = tag->next ) {
-                    if ( strcmp( tag->name, "content" ) == 0 ) {
-                        description = tag->value;
-
-                        for ( mrss_attribute_t *attribute = tag->attributes; attribute; attribute = attribute->next ) {
-                            /*
-                             * Detect the type of the content. Currently we know about text/plain and html
-                             */
-                            if ( strcmp( attribute->name, "type" ) == 0 ) {
-                                if ( strcmp( attribute->value, "plain" ) == 0 ) {
-                                    content_type = RSS_READER_TEXT_TYPE_PLAIN;
-                                } else if ( strcmp( attribute->name, "html" ) == 0 ) {
-                                    content_type = RSS_READER_TEXT_TYPE_HTML;
-                                } else {
-                                    content_type = RSS_READER_TEXT_TYPE_UNKNOWN;
-                                }
-                            }
-                        }
-
-                        /* we are done */
-                        break;
-                    }
-                }
-            }
-
-            /*
-             * update the model here. The order in gtk_list_store_set must match
-             * with the order in application-data.h
-             */
-            RSSRFCDate *date = RSS_RFC_DATE(rss_rfc_date_new ());
-            rss_rfc_date_set (date, item->pubDate);
-            gdk_threads_enter();
-            gtk_list_store_append( data->feed_data, &iter );
-            gtk_list_store_set   ( data->feed_data, &iter,
-                                   RSS_READER_COLUMN_AUTHOR, g_strdup( item->author  ),
-                                   RSS_READER_COLUMN_SUBJECT,g_strdup( item->title   ),
-                                   RSS_READER_COLUMN_DATE,   date,
-                                   RSS_READER_COLUMN_LINK,   g_strdup( item->link    ),
-                                   RSS_READER_COLUMN_TEXT,   g_strdup( description   ),
-                                   RSS_READER_COLUMN_TEXT_TYPE, content_type          ,
-                                   RSS_READER_COLUMN_CATEGORY, g_strdup( s_feeds[i].category ),
-                                   RSS_READER_COLUMN_SOURCE,  g_strdup( s_feeds[i].url ),
-                                   -1 );
-            gdk_threads_leave();
-            item = item->next;
+        /*
+         * create the new item(s)
+         */
+        add_mrss_item (data, rss_data, url, s_feeds[i].category);
+
+        /*
+         * now cache the feed, a bit inefficient as we do not write to a file directly
+         */
+        char *buffer = NULL;
+        mrss_write_buffer (rss_data, &buffer);
+        if (buffer) {
+            moko_cache_write_object (data->cache, url, buffer, -1, NULL);
         }
 
-        mrss_free( data );
+        free (buffer);
+        mrss_free( rss_data );
     }
 
@@ -190 +213 @@
     filter_feeds( data );
     gdk_threads_leave();
+}
+
+/**
+ * read the feeds from disk
+ */
+void load_data_from_cache (struct RSSReaderData *data)
+{
 }
 

trunk/src/target/OM-2007/applications/openmoko-rssreader/src/callbacks.h

@@ -39 +39 @@
  * toolbox callbacks
  */
+void load_data_from_cache (struct RSSReaderData *data);
 void cb_subscribe_button_clicked  ( GtkButton *btn, struct RSSReaderData *d);
 void refresh_categories( struct RSSReaderData* );

trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c

@@ -293 +293 @@
     data->app = MOKO_APPLICATION( moko_application_get_instance() );
     g_set_application_name( _("FeedReader") );
+    data->cache = MOKO_CACHE(moko_cache_new ("rss-reader"));
 
     setup_ui( data );