X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata.c;h=7a881bd718d4c2cc99cb5881674a6a1d3538e669;hb=40b17f742041c317915326c6f5ea6d92397c7363;hp=06c9fbb177e8b11ae0279707dc1417d8e32de10b;hpb=1b59efefbf33818f44ffdc870ff9fdb8207e1ad1;p=grits

diff --git a/src/data.c b/src/data.c
index 06c9fbb..7a881bd 100644
--- a/src/data.c
+++ b/src/data.c
@@ -23,76 +23,102 @@
 
 typedef struct {
 	AWeatherCacheDoneCallback callback;
-	gchar *src;
-	gchar *dst;
+	GFile *src;
+	GFile *dst;
 	gchar *user_data;
 } cache_file_end_t;
 
+static goffset g_file_get_size(GFile *file)
+{
+	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;
+}
+
 static void cache_file_cb(GObject *source_object, GAsyncResult *res, gpointer _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_message("error copying file ([%s]->[%s]): %s",
-			info->src, info->dst, error->message);
+		g_warning("error copying file ([%s]->[%s]): %s",
+			url, local, error->message);
+		g_error_free(error);
 	} else {
-		info->callback(info->dst, info->user_data);
+		info->callback(local, TRUE, info->user_data);
 	}
-	g_free(info->src);
-	g_free(info->dst);
+	g_object_unref(info->src);
+	g_object_unref(info->dst);
 	g_free(info);
+	g_free(url);
+	g_free(local);
 }
 
-static goffset g_file_get_size(GFile *file)
+static void do_cache(GFile *src, GFile *dst, char *reason,
+		AWeatherCacheDoneCallback callback, gpointer user_data)
 {
-	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);
-	return g_file_info_get_size(info);
+	char *name = g_file_get_basename(dst);
+	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))
+		g_file_make_directory_with_parents(parent, NULL, NULL);
+	g_object_unref(parent);
+
+	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;
+	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;
 }
 
-/**
+/*
  * Cache a image from Ridge to the local disk
  * \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, AWeatherCacheDoneCallback callback, gpointer user_data)
+void cache_file(char *base, char *path, AWeatherPolicyType update,
+		AWeatherCacheDoneCallback callback, gpointer user_data)
 {
 	gchar *url   = g_strconcat(base, 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);
+	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 (!g_file_test(local, G_FILE_TEST_EXISTS))
-		g_message("Caching file: local does not exist - %s", local);
-	else if (g_file_get_size(src) != g_file_get_size(dst))
-		g_message("Caching file: sizes mismatch - %lld != %lld",
-				g_file_get_size(src), g_file_get_size(dst));
-	else {
-		callback(local, user_data);
-		g_free(local);
-		g_free(url);
-		return;
-	}
+		return do_cache(src, dst, "local does not exist", callback, user_data);
 
-	char *dir = g_path_get_dirname(local);
-	if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
-		g_mkdir_with_parents(dir, 0755);
-	g_free(dir);
-	cache_file_end_t *info = g_malloc0(sizeof(cache_file_end_t));
-	info->callback  = callback;
-	info->src       = url;
-	info->dst       = local;
-	info->user_data = user_data;
-	g_file_copy_async(src, dst,
-		G_FILE_COPY_OVERWRITE, // GFileCopyFlags flags,
-		0,                     // int io_priority,
-		NULL,                  // GCancellable *cancellable,
-		NULL,                  // GFileProgressCallback progress_callback,
-		NULL,                  // gpointer progress_callback_data,
-		cache_file_cb,         // GAsyncReadyCallback callback,
-		info);                 // gpointer 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);
+
+	/* 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(url);
+	return;
 }