Update for GisData -> GisHttp

This is currently only single threaded, the fetch function should be run
in a separate thread.

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 42fc9ec59baf5f4ec4168e3bb89e4dea06e2a8f8..2e05fc46f048dc31639089edf3f9cf1f44eb88be 100644 (file)
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -341,7 +341,7 @@ static void update_times(AWeatherGui *self, GisViewer *viewer, char *site)
        if (gis_viewer_get_offline(self->viewer)) {
                GList *times = NULL;
                gchar *path = g_build_filename(g_get_user_cache_dir(),
-                               "libgis", "nexrd2", "raw", site, NULL);
+                               "libgis", "nexrad", "level2", site, NULL);
                GDir *dir = g_dir_open(path, 0, NULL);
                if (dir) {
                        const gchar *name;
@@ -353,9 +353,13 @@ static void update_times(AWeatherGui *self, GisViewer *viewer, char *site)
                g_free(path);
                update_times_gtk(self, times);
        } else {
-               gchar *path = g_strdup_printf("nexrd2/raw/%s/dir.list", site);
-               char *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
-               cache_file(base, path, GIS_REFRESH, NULL, update_times_online_cb, self);
+               GisHttp *http = gis_http_new("/nexrad/level2/");
+               gchar *base  = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
+               gchar *local = g_strdup_printf("%s/dir.list", site);
+               gchar *uri   = g_strconcat(base, "/", local, NULL);
+               gchar *path  = gis_http_fetch(http, uri, local, GIS_REFRESH, NULL, NULL);
+               update_times_online_cb(path, TRUE, self);
+               gis_http_free(http);
                /* update_times_gtk from update_times_online_cb */
        }
 }

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 4efa6cb57a126a408ed0102d078cb67283340286..9cd4a605f07a7073732248ea79499f3ba92e9197 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -390,7 +390,6 @@ static void _cache_done_cb(char *path, gboolean updated, gpointer _self)
                g_free(message);
        }
        g_child_watch_add(pid, _decompressed_cb, udata);
-       self->soup = NULL;
 }
 
 static void _set_radar(GisPluginRadar *self, const char *site, const char *time)
@@ -399,9 +398,6 @@ static void _set_radar(GisPluginRadar *self, const char *site, const char *time)
                return;
        g_debug("GisPluginRadar: set_radar - %s - %s", site, time);
 
-       // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
-       char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time);
-
        /* Set up progress bar */
        GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
        if (child) gtk_widget_destroy(child);
@@ -423,18 +419,17 @@ static void _set_radar(GisPluginRadar *self, const char *site, const char *time)
        gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
 
        /* Start loading the new radar */
-       if (self->soup) {
-               soup_session_abort(self->soup);
-               self->soup = NULL;
+       soup_session_abort(self->http->soup);
+       /* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
+       gchar *base  = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
+       gchar *local = g_strdup_printf("%s/%s_%s", site, site, time);
+       gchar *uri   = g_strconcat(base, "/", local, NULL);
+       GisCacheType mode = gis_viewer_get_offline(self->viewer) ? GIS_LOCAL : GIS_UPDATE;
+       gchar *path  = gis_http_fetch(self->http, uri, local, mode, _cache_chunk_cb, self);
+       if (path) {
+               _cache_done_cb(path, TRUE, self);
+               g_free(path);
        }
-       gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
-       if (gis_viewer_get_offline(self->viewer))
-               self->soup = cache_file(base, path, GIS_NEVER,
-                               NULL, _cache_done_cb, self);
-       else
-               self->soup = cache_file(base, path, GIS_UPDATE,
-                               _cache_chunk_cb, _cache_done_cb, self);
-       g_free(path);
 }
 
 
@@ -682,10 +677,7 @@ static void gis_plugin_radar_init(GisPluginRadar *self)
 {
        g_debug("GisPluginRadar: class_init");
        /* Set defaults */
-       self->soup          = NULL;
-       self->cur_triangles = NULL;
-       self->cur_num_triangles = 0;
-
+       self->http = gis_http_new("/nexrad/level2/");
        self->config_body = gtk_alignment_new(0, 0, 1, 1);
        gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
        gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
@@ -703,6 +695,7 @@ static void gis_plugin_radar_finalize(GObject *gobject)
        g_debug("GisPluginRadar: finalize");
        GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
        /* Free data */
+       gis_http_free(self->http);
        G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
 
 }

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index ad8826bc0edd0b50fe73fb71dcd475acf1e501d0..9541a9277fd927936755f24a8f17be38d68915e4 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -19,7 +19,6 @@
 #define __RADAR_H__
 
 #include <glib-object.h>
-#include <libsoup/soup.h>
 #include <rsl.h>
 
 #include <gis.h>
@@ -49,10 +48,10 @@ struct _GisPluginRadar {
        /* instance members */
        GisViewer   *viewer;
        GisPrefs    *prefs;
+       GisHttp     *http;
        GtkWidget   *config_body;
        GtkWidget   *progress_bar;
        GtkWidget   *progress_label;
-       SoupSession *soup;
        guint        time_changed_id;
        guint        location_changed_id;