Replacing GFile/GIO with libsoup

(i.e. one insane dependency with another)

diff --git a/configure.ac b/configure.ac
index 1bd02f5ca69750ec9559dfbde99720f12a3189a1..d8946640ea22d0d78859004f34a0cce2faae655b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,9 @@ PKG_PROG_PKG_CONFIG
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages

-PKG_CHECK_MODULES(GTK,  gtk+-2.0 gtkglext-1.0 gio-2.0 gmodule-export-2.0 gobject-2.0 gthread-2.0)
+PKG_CHECK_MODULES(SOUP, libsoup-2.4)
+PKG_CHECK_MODULES(GLIB, gio-2.0 gmodule-export-2.0 gobject-2.0 gthread-2.0)
+PKG_CHECK_MODULES(GTK,  gtk+-2.0 gtkglext-1.0)

 
 # Define odd RSL install location
 #AC_SUBST(RSL_CFLAGS, "-I/usr/local/trmm/GVBOX/include/")
 
 # Define odd RSL install location
 #AC_SUBST(RSL_CFLAGS, "-I/usr/local/trmm/GVBOX/include/")

diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index da397790667c16994f452632cb649c2c8f878999..222d5f8f7354992eafd69860724fa43e59a5dd69 100644 (file)
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS=$(GTK_CFLAGS)
-GTKDOC_LIBS=$(GTK_LIBS) $(RSL_LIBS) \
+AM_CPPFLAGS= $(RSL_CFLAGS) $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+GTKDOC_LIBS=$(RSL_LIBS) $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS) \

        $(top_srcdir)/src/aweather-aweather-*.o \
        $(top_srcdir)/src/aweather-plugin-*.o \
        $(top_srcdir)/src/aweather-data.o \
        $(top_srcdir)/src/aweather-aweather-*.o \
        $(top_srcdir)/src/aweather-plugin-*.o \
        $(top_srcdir)/src/aweather-data.o \

diff --git a/src/Makefile.am b/src/Makefile.am
index 10c83f051789f8f84f4f32a12b604ed1b45ad131..645fbed0a6dff86e771f8ff4b96a167197bacaa7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-AM_LDFLAGS    = $(RSL_LIBS) $(GTK_LIBS)

 AM_CFLAGS     = -Wall -Werror -Wno-unused --std=gnu99 
 bin_PROGRAMS  = aweather wsr88ddec
 
 AM_CFLAGS     = -Wall -Werror -Wno-unused --std=gnu99 
 bin_PROGRAMS  = aweather wsr88ddec
 


@@ -15,7 +14,9 @@ aweather_SOURCES  = main.c \
        plugin-radar-colormap.c             \
        plugin-ridge.c    plugin-ridge.h    \
        plugin-example.c  plugin-example.h
        plugin-radar-colormap.c             \
        plugin-ridge.c    plugin-ridge.h    \
        plugin-example.c  plugin-example.h

-aweather_CPPFLAGS = $(RSL_CFLAGS) $(GTK_CFLAGS) -DDATADIR="\"$(datadir)\"" 
+aweather_CPPFLAGS = -DDATADIR="\"$(datadir)\"" \
+       $(RSL_CFLAGS) $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+aweather_LDADD    = $(RSL_LIBS) $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)

 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = -lbz2
 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = -lbz2

diff --git a/src/data.c b/src/data.c
index d57a8c713c706b8a4fbadfe95d69413860ad5f34..9878bdc2278c0eb17ba95a2baea505d0002430f2 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -16,84 +16,76 @@
  */
 
 #include <config.h>
  */
 
 #include <config.h>

+#include <stdio.h>

 #include <glib.h>
 #include <glib.h>

-#include <gio/gio.h>
+#include <libsoup/soup.h>

 
 #include "data.h"
 
 typedef struct {
        AWeatherCacheDoneCallback callback;
 
 #include "data.h"
 
 typedef struct {
        AWeatherCacheDoneCallback callback;

-       GFile *src;
-       GFile *dst;
-       gchar *user_data;
+       gpointer user_data;
+       gchar *local;
+       FILE  *fp;

 } cache_file_end_t;
 
 } cache_file_end_t;
 

-static goffset g_file_get_size(GFile *file)
+/*
+ * Open a file, creating parent directories if needed
+ */
+static FILE *fopen_p(const gchar *path, const gchar *mode)

 {
 {

-       GError *error = NULL;
-       GFileInfo *info = g_file_query_info(file,
-                       G_FILE_ATTRIBUTE_STANDARD_SIZE, 0, NULL, &error);
-       if (error){
-               g_warning("unable to get file size: %s", error->message);
-               g_error_free(error);
-       }
-       goffset size = g_file_info_get_size(info);
-       g_file_info_remove_attribute(info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
-       g_object_unref(info);
-       return size;
+       gchar *parent = g_path_get_dirname(path);
+       if (!g_file_test(parent, G_FILE_TEST_EXISTS))
+               g_mkdir_with_parents(path, 0755);
+       g_free(parent);
+       return fopen(path, mode);

 }
 
 }
 

-static void cache_file_cb(GObject *source_object, GAsyncResult *res, gpointer _info)
+static void cache_file_cb(SoupSession *session, SoupMessage *message, gpointer _info)

 {
 {

-       g_debug("data: cache_file_cb");

        cache_file_end_t *info = _info;
        cache_file_end_t *info = _info;

-       char   *url   = g_file_get_path(info->src);
-       char   *local = g_file_get_path(info->dst);
-       GError *error = NULL;
-       g_file_copy_finish(G_FILE(source_object), res, &error);
-       if (error) {
-               g_warning("data: error copying file ([%s]->[%s]): %s",
-                       url, local, error->message);
-               g_error_free(error);
+       gchar *uri = soup_uri_to_string(soup_message_get_uri(message), FALSE);
+       g_debug("data: cache_file_cb ([%s]->[%s])", uri, info->local);
+
+       if (!SOUP_STATUS_IS_SUCCESSFUL(message->status_code)) {
+               g_warning("data: error copying file ([%s]->[%s])", uri, info->local);

        } else {
        } else {

-               info->callback(local, TRUE, info->user_data);
+               gint wrote = fwrite(message->response_body->data,  1,
+                               message->response_body->length, info->fp);
+               g_debug("data: status=%u wrote=%d/%lld",
+                               message->status_code,
+                               wrote, message->response_body->length);
+               fclose(info->fp);
+               info->callback(info->local, TRUE, info->user_data);

        }
        }

-       g_object_unref(info->src);
-       g_object_unref(info->dst);
-       g_free(info);
-       g_free(url);
-       g_free(local);
+       g_free(uri);
+       g_free(info->local);
+       g_object_unref(session);

 }
 
 }
 

-static void do_cache(GFile *src, GFile *dst, char *reason,
+static void do_cache(gchar *uri, gchar *local, gboolean truncate, gchar *reason,

                AWeatherCacheDoneCallback callback, gpointer user_data)
 {
                AWeatherCacheDoneCallback callback, gpointer user_data)
 {

-       char *name = g_file_get_basename(dst);
+       char *name = g_path_get_basename(uri);

        g_debug("data: do_cache - Caching file %s: %s", name, reason);
        g_free(name);
 
        g_debug("data: do_cache - Caching file %s: %s", name, reason);
        g_free(name);
 

-       GFile *parent = g_file_get_parent(dst);
-       if (!g_file_query_exists(parent, NULL)) {
-               char *path = g_file_get_path(parent);
-               g_mkdir_with_parents(path, 0755);
-               g_free(path);
-       }
-       g_object_unref(parent);
-

        cache_file_end_t *info = g_malloc0(sizeof(cache_file_end_t));
        info->callback  = callback;
        cache_file_end_t *info = g_malloc0(sizeof(cache_file_end_t));
        info->callback  = callback;

-       info->src       = src;
-       info->dst       = dst;

        info->user_data = user_data;
        info->user_data = user_data;

-       g_file_copy_async(src, dst,
-               G_FILE_COPY_OVERWRITE,   // GFileCopyFlags flags,
-               G_PRIORITY_DEFAULT_IDLE, // int io_priority,
-               NULL,                    // GCancellable *cancellable,
-               NULL,                    // GFileProgressCallback progress_callback,
-               NULL,                    // gpointer progress_callback_data,
-               cache_file_cb,           // GAsyncReadyCallback callback,
-               info);                   // gpointer user_data
-       return;
+       info->local     = local;
+
+       if (truncate) info->fp = fopen_p(local, "w");
+       else          info->fp = fopen_p(local, "a");
+       long bytes = ftell(info->fp);
+
+       SoupSession *session = soup_session_async_new();
+       SoupMessage *message = soup_message_new("GET", uri);
+       if (message == NULL)
+               g_error("message is null, cannot parse uri");
+       if (bytes != 0)
+               soup_message_headers_set_range(message->request_headers, bytes, -1);
+       soup_session_queue_message(session, message, cache_file_cb, info);

 }
 
 /*
 }
 
 /*


@@ -101,28 +93,27 @@ static void do_cache(GFile *src, GFile *dst, char *reason,
  * \param  path  Path to the Ridge file, starting after /ridge/
  * \return The local path to the cached image
  */
  * \param  path  Path to the Ridge file, starting after /ridge/
  * \return The local path to the cached image
  */

-void cache_file(char *base, char *path, AWeatherPolicyType update,
+void cache_file(char *base, char *path, AWeatherCacheType update,

                AWeatherCacheDoneCallback callback, gpointer user_data)
 {
                AWeatherCacheDoneCallback callback, gpointer user_data)
 {

-       gchar *url   = g_strconcat(base, path, NULL);
+       gchar *uri   = g_strconcat(base, path, NULL);

        gchar *local = g_build_filename(g_get_user_cache_dir(), PACKAGE, path, NULL);
        gchar *local = g_build_filename(g_get_user_cache_dir(), PACKAGE, path, NULL);

-       GFile *src   = g_file_new_for_uri(url);
-       GFile *dst   = g_file_new_for_path(local);

 
 

-       if (update == AWEATHER_ALWAYS)
-               return do_cache(src, dst, "cache forced", callback, user_data);
+       if (update == AWEATHER_REFRESH)
+               return do_cache(uri, local, TRUE, "cache forced",
+                               callback, user_data);

 
 

-       if (!g_file_test(local, G_FILE_TEST_EXISTS))
-               return do_cache(src, dst, "local does not exist", callback, user_data);
+       if (update == AWEATHER_UPDATE)
+               return do_cache(uri, local, FALSE, "attempting updating",
+                               callback, user_data);

 
 

-       if (update == AWEATHER_AUTOMATIC && g_file_get_size(src) != g_file_get_size(dst))
-               return do_cache(src, dst, "size mismatch", callback, user_data);
+       if (update == AWEATHER_ONCE && !g_file_test(local, G_FILE_TEST_EXISTS))
+               return do_cache(uri, local, TRUE, "local does not exist",
+                               callback, user_data);

 
        /* No nead to cache, run the callback now and clean up */
        callback(local, FALSE, user_data);
 
        /* No nead to cache, run the callback now and clean up */
        callback(local, FALSE, user_data);

-       g_object_unref(src);
-       g_object_unref(dst);

        g_free(local);
        g_free(local);

-       g_free(url);
+       g_free(uri);

        return;
 }
        return;
 }

diff --git a/src/data.h b/src/data.h
index b0ecf61e81cc847da742252108f8aae8859ba566..dacde3bc2c877aff10268f082691d1f28c1f5def 100644 (file)
--- a/src/data.h
+++ b/src/data.h
@@ -19,15 +19,15 @@
 #define __DATA_H__
 
 typedef enum {
 #define __DATA_H__
 
 typedef enum {

-       AWEATHER_ALWAYS,
-       AWEATHER_AUTOMATIC,
-       AWEATHER_NEVER,
-} AWeatherPolicyType;
+       AWEATHER_ONCE,    // Cache the file if it does not exist
+       AWEATHER_UPDATE,  // Append additional data to cached copy (resume)
+       AWEATHER_REFRESH, // Delete existing file and cache a new copy
+} AWeatherCacheType;

 
 typedef void (*AWeatherCacheDoneCallback)(gchar *file, gboolean updated,
                gpointer user_data);
 
 
 typedef void (*AWeatherCacheDoneCallback)(gchar *file, gboolean updated,
                gpointer user_data);
 

-void cache_file(char *base, char *path, AWeatherPolicyType update,
+void cache_file(char *base, char *path, AWeatherCacheType update,

                AWeatherCacheDoneCallback callback, gpointer user_data);
 
 #endif
                AWeatherCacheDoneCallback callback, gpointer user_data);
 
 #endif

diff --git a/src/plugin-radar.c b/src/plugin-radar.c
index 6284c4e4e9e9645cf06512aee377e85bed2dc5ac..30f58168ad54093c44308d330861628a81b181dc 100644 (file)
--- a/src/plugin-radar.c
+++ b/src/plugin-radar.c
@@ -379,7 +379,7 @@ static void on_time_changed(AWeatherView *view, char *time, gpointer _self)
        aweather_gui_gl_redraw(self->gui);
 
        /* Start loading the new radar */
        aweather_gui_gl_redraw(self->gui);
 
        /* Start loading the new radar */

-       cache_file(base, path, AWEATHER_AUTOMATIC, cached_cb, self);
+       cache_file(base, path, AWEATHER_UPDATE, cached_cb, self);

        g_free(path);
 }
 
        g_free(path);
 }
 

diff --git a/src/plugin-ridge.c b/src/plugin-ridge.c
index 90ad4d1bf9898d2b50c50080686505a8b2f5fa4c..388ee7405c73ba6d32b27267611d9858a249fe63 100644 (file)
--- a/src/plugin-ridge.c
+++ b/src/plugin-ridge.c
@@ -174,7 +174,7 @@ static void on_site_changed(AWeatherView *view, gchar *site, AWeatherRidge *self
                cached_t *udata = g_malloc(sizeof(cached_t));
                udata->self  = self;
                udata->layer = &layers[i];
                cached_t *udata = g_malloc(sizeof(cached_t));
                udata->self  = self;
                udata->layer = &layers[i];

-               cache_file(base, path, AWEATHER_NEVER, cached_cb, udata);
+               cache_file(base, path, AWEATHER_ONCE, cached_cb, udata);

                g_free(path);
        }
 }
                g_free(path);
        }
 }