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;
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 */
}
}
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)
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);
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);
}
{
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"));
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);
}