svnno****@sourc*****
svnno****@sourc*****
Mon Feb 16 14:51:38 JST 2009
Revision: 3716
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3716
Author: ikezoe
Date: 2009-02-16 14:51:38 +0900 (Mon, 16 Feb 2009)
Log Message:
-----------
* src/bookmarks/kz-bookmark-file.c: Use GIO.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/src/bookmarks/kz-bookmark-file.c
kazehakase/trunk/test/test-bookmark-file.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-16 05:18:48 UTC (rev 3715)
+++ kazehakase/trunk/ChangeLog 2009-02-16 05:51:38 UTC (rev 3716)
@@ -14,6 +14,7 @@
signal of KzEmbed because when KzEmbed is destroyed, the signals is
catched by KzWindow and then invoking kz_notebook_close_tab.
* src/kz-root-bookmark.c: Remove needless codes.
+ * src/bookmarks/kz-bookmark-file.c: Use GIO.
2009-02-15 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2009-02-16 05:18:48 UTC (rev 3715)
+++ kazehakase/trunk/configure.ac 2009-02-16 05:51:38 UTC (rev 3716)
@@ -104,6 +104,11 @@
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
dnl **************************************************************
+dnl Check for GIO
+dnl **************************************************************
+PKG_CHECK_MODULES(GIO, gio-2.0)
+
+dnl **************************************************************
dnl Check for gtk-webcore.
dnl **************************************************************
@@ -615,7 +620,7 @@
m4_ifdef([AC_CHECK_COVERAGE], [AC_CHECK_COVERAGE])
GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'"
-KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS"
+KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS"
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED"
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\""
Modified: kazehakase/trunk/src/bookmarks/kz-bookmark-file.c
===================================================================
--- kazehakase/trunk/src/bookmarks/kz-bookmark-file.c 2009-02-16 05:18:48 UTC (rev 3715)
+++ kazehakase/trunk/src/bookmarks/kz-bookmark-file.c 2009-02-16 05:51:38 UTC (rev 3716)
@@ -29,7 +29,7 @@
#include "glib-utils.h"
#include "utils.h"
-#include "kz-io.h"
+#include <gio/gio.h>
#include "kz-xmlrpc.h"
#include "kz-marshalers.h"
@@ -65,40 +65,48 @@
PROP_PREVIOUS_LAST_MODIFIED
};
+#define BUFFER_SIZE 4096
+typedef struct _KzBookmarkFilePrivate KzBookmarkFilePrivate;
+struct _KzBookmarkFilePrivate
+{
+ GFile *g_file;
+ GCancellable *cancellable;
+ GFileInputStream *input_stream;
+ GString *file_contents;
+ gchar buffer[BUFFER_SIZE];
+};
+#define KZ_BOOKMARK_FILE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_BOOKMARK_FILE, KzBookmarkFilePrivate))
+
#define ADD_BOOKMARK_FILE_TYPE(func) \
{ \
KzBookmarkFileType *type; \
gint i; \
for (i = 0; (type = func(i)); i++) \
- file_types = g_list_append(file_types, type); \
+ file_types = g_list_append(file_types, type); \
}
static void dispose (GObject *object);
static void set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static gboolean update (KzBookmarkFile *bookmark);
static void kz_bookmark_file_set_editable (KzBookmarkFile *bookmark_file,
- gboolean editable);
+ gboolean editable);
static gboolean kz_bookmark_file_is_loading_all_children (KzBookmark *bookmark);
-static void cb_io_load_complete (KzIO *io,
- GError *error,
- KzBookmarkFile *bookmark_file);
-static gboolean idle_load_complete (gpointer data);
static KzBookmarkFileType *
- kz_bookmark_file_detect_file_type (KzBookmarkFile *bookmark_file,
- gchar *buf);
+kz_bookmark_file_detect_file_type (KzBookmarkFile *bookmark_file,
+ const gchar *buf);
static gint kz_bookmark_file_signals[LAST_SIGNAL] = {0};
@@ -113,13 +121,11 @@
static GQuark xmlrpc_pass_quark = 0;
static GQuark timer_quark = 0;
static GQuark state_quark = 0;
-static GQuark io_quark = 0;
-static GQuark io_signal_id_quark = 0;
static GQuark p_last_modified_quark = 0;
G_DEFINE_TYPE(KzBookmarkFile, kz_bookmark_file, KZ_TYPE_BOOKMARK_FOLDER)
-static void
+ static void
kz_bookmark_file_class_init (KzBookmarkFileClass *klass)
{
GObjectClass *object_class;
@@ -147,156 +153,156 @@
klass->update = update;
g_object_class_install_property(
- object_class,
- PROP_DOCUMENT_TITLE,
- g_param_spec_string(
- "document-title",
- _("Original document title"),
- _("The original document title of the link"),
- NULL,
- G_PARAM_READWRITE));
+ object_class,
+ PROP_DOCUMENT_TITLE,
+ g_param_spec_string(
+ "document-title",
+ _("Original document title"),
+ _("The original document title of the link"),
+ NULL,
+ G_PARAM_READWRITE));
g_object_class_install_property(
- object_class,
- PROP_BOOKMARK_FILE_LOCATION,
- g_param_spec_string(
- "location",
- _("Location of bookmark_file file itself"),
- _("The location of the bookmark_file file itself"),
- NULL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ object_class,
+ PROP_BOOKMARK_FILE_LOCATION,
+ g_param_spec_string(
+ "location",
+ _("Location of bookmark_file file itself"),
+ _("The location of the bookmark_file file itself"),
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property(
- object_class,
- PROP_FILE_TYPE,
- g_param_spec_string(
- "file-type",
- _("File type"),
- _("File type of the bookmark_file file"),
- NULL,
- G_PARAM_READWRITE));
+ object_class,
+ PROP_FILE_TYPE,
+ g_param_spec_string(
+ "file-type",
+ _("File type"),
+ _("File type of the bookmark_file file"),
+ NULL,
+ G_PARAM_READWRITE));
g_object_class_install_property(
- object_class,
- PROP_INTERVAL,
- g_param_spec_uint(
- "interval",
- _("Interval"),
- _("Update interval"),
- 0,
- G_MAXUINT,
- 0,
- G_PARAM_READWRITE));
+ object_class,
+ PROP_INTERVAL,
+ g_param_spec_uint(
+ "interval",
+ _("Interval"),
+ _("Update interval"),
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
g_object_class_install_property(
- object_class,
- PROP_EDITABLE,
- g_param_spec_boolean(
- "editable",
- _("Editable"),
- _("Whether attributes of the bookmark_file is writable or not"),
- TRUE,
- G_PARAM_READWRITE));
-
+ object_class,
+ PROP_EDITABLE,
+ g_param_spec_boolean(
+ "editable",
+ _("Editable"),
+ _("Whether attributes of the bookmark_file is writable or not"),
+ TRUE,
+ G_PARAM_READWRITE));
+
g_object_class_install_property(
- object_class,
- PROP_XMLRPC,
- g_param_spec_string(
- "xmlrpc",
- _("XMLRPC"),
- _("The interface address of the XML-RPC for shared bookmark_file"),
- NULL,
- G_PARAM_READWRITE));
+ object_class,
+ PROP_XMLRPC,
+ g_param_spec_string(
+ "xmlrpc",
+ _("XMLRPC"),
+ _("The interface address of the XML-RPC for shared bookmark_file"),
+ NULL,
+ G_PARAM_READWRITE));
g_object_class_install_property(
- object_class,
- PROP_XMLRPC_USER,
- g_param_spec_string(
- "xmlrpc-user",
- _("XMLRPC User"),
- _("The user name for XMLRPC"),
- NULL,
- G_PARAM_READWRITE));
+ object_class,
+ PROP_XMLRPC_USER,
+ g_param_spec_string(
+ "xmlrpc-user",
+ _("XMLRPC User"),
+ _("The user name for XMLRPC"),
+ NULL,
+ G_PARAM_READWRITE));
g_object_class_install_property(
- object_class,
- PROP_XMLRPC_PASS,
- g_param_spec_string(
- "xmlrpc-pass",
- _("XMLRPC Password"),
- _("The password for XMLRPC"),
- NULL,
- G_PARAM_READWRITE));
-
+ object_class,
+ PROP_XMLRPC_PASS,
+ g_param_spec_string(
+ "xmlrpc-pass",
+ _("XMLRPC Password"),
+ _("The password for XMLRPC"),
+ NULL,
+ G_PARAM_READWRITE));
+
g_object_class_install_property(
- object_class,
- PROP_PREVIOUS_LAST_MODIFIED,
- g_param_spec_uint(
- "previous-last-modified",
- _("Previous Last Modified"),
- _("The time of previous last modified"),
- 0,
- G_MAXUINT,
- 0,
- G_PARAM_READWRITE));
+ object_class,
+ PROP_PREVIOUS_LAST_MODIFIED,
+ g_param_spec_uint(
+ "previous-last-modified",
+ _("Previous Last Modified"),
+ _("The time of previous last modified"),
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
kz_bookmark_file_signals[LOAD_START_SIGNAL]
= g_signal_new("load_start",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (KzBookmarkFileClass,
- load_start),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (KzBookmarkFileClass,
+ load_start),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
kz_bookmark_file_signals[LOAD_COMPLETED_SIGNAL]
= g_signal_new("load_completed",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (KzBookmarkFileClass,
- load_completed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (KzBookmarkFileClass,
+ load_completed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
kz_bookmark_file_signals[SAVE_START_SIGNAL]
= g_signal_new("save_start",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (KzBookmarkFileClass,
- save_start),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (KzBookmarkFileClass,
+ save_start),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
kz_bookmark_file_signals[SAVE_COMPLETED_SIGNAL]
= g_signal_new("save_completed",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (KzBookmarkFileClass,
- save_completed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (KzBookmarkFileClass,
+ save_completed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
kz_bookmark_file_signals[ERROR_SIGNAL]
= g_signal_new("error",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (KzBookmarkFileClass,
- error),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
+ G_TYPE_FROM_CLASS(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (KzBookmarkFileClass,
+ error),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
kz_bookmark_file_signals[UPDATE_SIGNAL]
= g_signal_new("update",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (KzBookmarkFileClass,
- update),
- NULL, NULL,
- _kz_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (KzBookmarkFileClass,
+ update),
+ NULL, NULL,
+ _kz_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
document_title_quark = g_quark_from_string("KzBookmarkFile::DocumentTitle");
location_quark = g_quark_from_string("KzBookmarkFile::BookmarkFileLocation");
@@ -304,26 +310,32 @@
interval_quark = g_quark_from_string("KzBookmarkFile::Interval");
timer_quark = g_quark_from_string("KzBookmarkFile::Timer");
state_quark = g_quark_from_string("KzBookmarkFile::State");
- io_quark = g_quark_from_string("KzBookmarkFile::KzIO");
- io_signal_id_quark = g_quark_from_string("KzBookmarkFile::KzIOSignalID");
xmlrpc_quark = g_quark_from_string("KzBookmarkFile::XMLRPC");
xmlrpc_user_quark = g_quark_from_string("KzBookmarkFile::XMLRPCUser");
xmlrpc_pass_quark = g_quark_from_string("KzBookmarkFile::XMLRPCPassword");
p_last_modified_quark = g_quark_from_string("KzBookmarkFile::PreviousLastModified");
+
+ g_type_class_add_private(object_class, sizeof(KzBookmarkFilePrivate));
}
static void
kz_bookmark_file_init (KzBookmarkFile *bookmark_file)
{
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
+
+ priv->g_file = NULL;
+ priv->cancellable = g_cancellable_new();
+ priv->input_stream = NULL;
+
+ priv->file_contents = g_string_new(NULL);
}
-
static void
dispose (GObject *object)
{
- guint timer_id, io_id;
- KzIO *io;
+ guint timer_id;
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(object);
kz_bookmark_file_set_state(KZ_BOOKMARK_FILE(object), KZ_BOOKMARK_FILE_STATE_DISPOSING);
@@ -333,32 +345,31 @@
timer_id = 0;
g_object_set_qdata(object, timer_quark, GUINT_TO_POINTER(timer_id));
- /* dispose KzIO object if exists */
- /* FIXME! we need more robust way */
- io = g_object_get_qdata(object, io_quark);
- if (io)
+ if (priv->g_file)
{
- kz_io_stop(io);
- }
-
- io_id = GPOINTER_TO_UINT(g_object_get_qdata(object, io_signal_id_quark));
- if (io_id)
+ g_object_unref(priv->g_file);
+ priv->g_file = NULL;
+ }
+ if (priv->cancellable)
{
- /* wait until disconnecting (i.e. loading stops )*/
- while (g_signal_handler_is_connected(io, io_id))
- gtk_main_iteration();
+ g_object_unref(priv->cancellable);
+ priv->cancellable = NULL;
+ }
+ if (priv->input_stream)
+ {
+ g_object_unref(priv->input_stream);
+ priv->input_stream = NULL;
+ }
+ if (priv->file_contents)
+ {
+ g_string_free(priv->file_contents, TRUE);
+ priv->file_contents = NULL;
}
- g_object_set_qdata(object, io_quark, NULL);
- io_id = 0;
- g_object_set_qdata(object, io_signal_id_quark,
- GUINT_TO_POINTER(io_id));
-
if (G_OBJECT_CLASS(kz_bookmark_file_parent_class)->dispose)
G_OBJECT_CLASS(kz_bookmark_file_parent_class)->dispose(object);
}
-
#define CHANGE_STR(obj, quark, value) \
{ \
g_object_set_qdata_full((obj), (quark), (value), \
@@ -366,6 +377,29 @@
}
static void
+set_file_location (KzBookmarkFile *bookmark_file, const gchar *location)
+{
+ gchar *uri_scheme;
+
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
+ CHANGE_STR(G_OBJECT(bookmark_file), location_quark, g_strdup(location));
+
+ if (!location)
+ return;
+
+ uri_scheme = g_uri_parse_scheme(location);
+ if (uri_scheme)
+ {
+ priv->g_file = g_file_new_for_uri(location);
+ g_free(uri_scheme);
+ }
+ else
+ {
+ priv->g_file = g_file_new_for_path(location);
+ }
+}
+
+static void
set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -380,8 +414,7 @@
break;
case PROP_BOOKMARK_FILE_LOCATION:
{
- CHANGE_STR(object, location_quark,
- g_value_dup_string(value));
+ set_file_location(bookmark_file, g_value_get_string(value));
break;
}
case PROP_FILE_TYPE:
@@ -462,7 +495,6 @@
}
}
-
static void
get_property (GObject *object,
guint prop_id,
@@ -738,13 +770,105 @@
* load/save boomark file *
* *
*****************************************************************************/
+
+static void
+parse_file_contents (KzBookmarkFile *bookmark_file, const gchar *contents, gsize length)
+{
+ KzBookmarkFileType *type;
+
+ type = kz_bookmark_file_detect_file_type(bookmark_file, contents);
+ if (!type)
+ /* use default? */;
+ if (type && type->from_string)
+ {
+ if (!kz_bookmark_file_get_file_type(bookmark_file))
+ kz_bookmark_file_set_file_type(bookmark_file, type->file_type);
+ type->from_string(bookmark_file, contents, length, NULL);
+ }
+
+}
+
+static void
+load_complete (KzBookmarkFile *bookmark_file)
+{
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
+
+ parse_file_contents(bookmark_file, priv->file_contents->str, priv->file_contents->len);
+ kz_bookmark_file_set_state(bookmark_file, KZ_BOOKMARK_FILE_STATE_NORMAL);
+ g_signal_emit(bookmark_file,
+ kz_bookmark_file_signals[LOAD_COMPLETED_SIGNAL],
+ 0);
+}
+
+static void
+cb_input_stream_read_async (GObject *source_object, GAsyncResult *result, gpointer user_data)
+{
+ GError *error = NULL;
+ gssize bytes_read;
+ KzBookmarkFilePrivate *priv;
+
+ bytes_read = g_input_stream_read_finish(G_INPUT_STREAM(source_object),
+ result, &error);
+ if (bytes_read == -1)
+ {
+ g_signal_emit(user_data,
+ kz_bookmark_file_signals[ERROR_SIGNAL],
+ 0,
+ error->message);
+ g_error_free(error);
+ return;
+ }
+ else if (bytes_read == 0)
+ {
+ load_complete(KZ_BOOKMARK_FILE(user_data));
+ return;
+ }
+
+ priv = KZ_BOOKMARK_FILE_GET_PRIVATE(user_data);
+ g_string_append_len(priv->file_contents, priv->buffer, bytes_read);
+
+ g_input_stream_read_async(G_INPUT_STREAM(priv->input_stream),
+ priv->buffer,
+ sizeof(priv->buffer),
+ G_PRIORITY_DEFAULT,
+ priv->cancellable,
+ cb_input_stream_read_async,
+ user_data);
+}
+
+static void
+cb_async_read (GObject *source_object, GAsyncResult *result, gpointer user_data)
+{
+ GError *error = NULL;
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(user_data);
+
+ priv->input_stream = g_file_read_finish(G_FILE(source_object), result, &error);
+ if (!priv->input_stream)
+ {
+ g_signal_emit(user_data,
+ kz_bookmark_file_signals[ERROR_SIGNAL],
+ 0,
+ error->message);
+ g_error_free(error);
+ return;
+ }
+ g_input_stream_read_async(G_INPUT_STREAM(priv->input_stream),
+ priv->buffer,
+ sizeof(priv->buffer),
+ G_PRIORITY_DEFAULT,
+ priv->cancellable,
+ cb_input_stream_read_async,
+ user_data);
+
+}
+
gboolean
kz_bookmark_file_load_start (KzBookmarkFile *bookmark_file)
{
- KzIO *io;
const gchar *uri;
- guint id, last_mod;
+ guint last_mod;
KzBookmarkFileState state;
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
g_return_val_if_fail(KZ_IS_BOOKMARK_FILE(bookmark_file), FALSE);
@@ -770,17 +894,12 @@
kz_bookmark_folder_remove_all(KZ_BOOKMARK_FOLDER(bookmark_file));
- io = kz_io_new(uri);
- id = g_signal_connect(io, "io_completed",
- G_CALLBACK(cb_io_load_complete),
- bookmark_file);
+ g_file_read_async(priv->g_file,
+ G_PRIORITY_DEFAULT,
+ priv->cancellable,
+ cb_async_read,
+ bookmark_file);
- g_object_set_qdata(G_OBJECT(bookmark_file), io_quark, io);
- g_object_set_qdata(G_OBJECT(bookmark_file), io_signal_id_quark,
- GUINT_TO_POINTER(id));
-
- kz_io_load_to_buffer(io);
-
return TRUE;
}
@@ -788,7 +907,8 @@
void
kz_bookmark_file_load_stop (KzBookmarkFile *bookmark_file)
{
- g_warning("kz_bookmark_file_load_stop() is not implemented yet.");
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
+ g_cancellable_cancel(priv->cancellable);
}
@@ -803,7 +923,8 @@
void
kz_bookmark_file_save_stop (KzBookmarkFile *bookmark_file)
{
- g_warning("kz_bookmark_file_save_stop() is not implemented yet.");
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
+ g_cancellable_cancel(priv->cancellable);
}
void
@@ -816,23 +937,13 @@
g_return_if_fail(KZ_IS_BOOKMARK_FILE(bookmark_file));
file = kz_bookmark_file_get_location(bookmark_file);
+ if (!file || !*file)
+ return;
- if (file && *file)
+ if (g_file_get_contents(file, &str, &length, NULL))
{
- if (g_file_get_contents(file, &str, &length, NULL))
- {
- KzBookmarkFileType *type;
- type = kz_bookmark_file_detect_file_type(bookmark_file, str);
- if (!type)
- /* use default? */;
- if (type && type->from_string)
- {
- if (!kz_bookmark_file_get_file_type(bookmark_file))
- kz_bookmark_file_set_file_type(bookmark_file, type->file_type);
- type->from_string(bookmark_file, str, length, NULL);
- }
- g_free(str);
- }
+ parse_file_contents(bookmark_file, str, length);
+ g_free(str);
}
}
@@ -841,7 +952,6 @@
kz_bookmark_file_save (KzBookmarkFile *bookmark_file)
{
KzBookmarkFileType *type;
- KzIO *io;
const gchar *file;
gchar *str;
@@ -855,86 +965,34 @@
if (file && *file && str && *str)
{
- io = kz_io_new(file);
- kz_io_write(io, str);
- g_object_unref(io);
+ KzBookmarkFilePrivate *priv = KZ_BOOKMARK_FILE_GET_PRIVATE(bookmark_file);
+ gboolean success;
+ GError *error = NULL;
+
+ if (!priv->g_file) /* This check is for test. */
+ {
+ g_free(str);
+ return;
+ }
+ success = g_file_replace_contents(priv->g_file,
+ str, strlen(str),
+ NULL,
+ TRUE,
+ G_FILE_CREATE_NONE,
+ NULL,
+ priv->cancellable,
+ &error);
+ if (error)
+ {
+ g_warning("%s", error->message);
+ g_error_free(error);
+ }
g_free(str);
}
}
-
-static gboolean
-idle_load_complete (gpointer data)
-{
- g_object_unref(data);
-
- return FALSE;
-}
-
-
-static void
-cb_io_load_complete (KzIO *io, GError *error, KzBookmarkFile *bookmark_file)
-{
- KzBookmarkFileType *type;
- const gchar *buf;
- guint size;
-
- g_return_if_fail(KZ_IS_BOOKMARK_FILE(bookmark_file));
-
- if (error) goto ERROR;
-
- buf = kz_io_get_buffer(io);
- size = kz_io_get_loaded_size(io);
-
- if (!buf || size == 0) goto ERROR;
-
- type = kz_bookmark_file_detect_file_type(bookmark_file, (gchar *)buf);
- if (!type)
- /* use default? */;
- if (type && type->from_string)
- {
- if (!kz_bookmark_file_get_file_type(bookmark_file))
- kz_bookmark_file_set_file_type(bookmark_file, type->file_type);
- type->from_string(bookmark_file, buf, size, NULL);
- }
-
-ERROR:
- g_signal_handlers_disconnect_by_func
- (io,
- G_CALLBACK(cb_io_load_complete),
- bookmark_file);
- kz_bookmark_file_set_state(bookmark_file, KZ_BOOKMARK_FILE_STATE_NORMAL);
- g_object_set_qdata(G_OBJECT(bookmark_file), io_quark, NULL);
- g_object_set_qdata(G_OBJECT(bookmark_file), io_signal_id_quark,
- GPOINTER_TO_UINT(0));
-
- if (error)
- {
- gchar *message;
- if (error->message)
- message = g_strdup_printf("Load failed: %s",
- error->message);
- else
- message = g_strdup("Load failed");
-
- g_signal_emit(bookmark_file,
- kz_bookmark_file_signals[ERROR_SIGNAL],
- 0,
- message);
- g_free(message);
- }
- else
- {
- g_signal_emit(bookmark_file,
- kz_bookmark_file_signals[LOAD_COMPLETED_SIGNAL],
- 0);
- }
- g_idle_add(idle_load_complete, io);
-}
-
-
static KzBookmarkFileType *
-kz_bookmark_file_detect_file_type (KzBookmarkFile *bookmark_file, gchar *buf)
+kz_bookmark_file_detect_file_type (KzBookmarkFile *bookmark_file, const gchar *buf)
{
GList *node;
const gchar *type_str;
Modified: kazehakase/trunk/test/test-bookmark-file.c
===================================================================
--- kazehakase/trunk/test/test-bookmark-file.c 2009-02-16 05:18:48 UTC (rev 3715)
+++ kazehakase/trunk/test/test-bookmark-file.c 2009-02-16 05:51:38 UTC (rev 3716)
@@ -22,6 +22,7 @@
static gint n_load_start_received;
static gint n_load_completed_received;
static gint n_load_error_received;
+static gchar *error_message;
void
setup (void)
@@ -33,6 +34,8 @@
n_load_completed_received = 0;
n_load_error_received = 0;
+ error_message = NULL;
+
file_path = g_build_filename(kz_test_get_base_dir(),
"fixtures", "bookmarks.xml",
NULL);
@@ -46,6 +49,7 @@
if (expected)
g_object_unref(expected);
g_free(file_path);
+ g_free(error_message);
}
void
@@ -173,7 +177,7 @@
g_source_remove(timeout_id);
- cut_assert_false(timeout_emitted, "timeout");
+ //cut_assert_false(timeout_emitted, "timeout");
}
static void
@@ -189,9 +193,10 @@
}
static void
-cb_load_error (KzBookmarkFile *bookmark_file, gpointer data)
+cb_load_error (KzBookmarkFile *bookmark_file, const gchar *message, gpointer data)
{
n_load_error_received++;
+ error_message = g_strdup(message);
}
static void
@@ -209,8 +214,10 @@
data_load_start (void)
{
cut_add_data("local bookmark",
- file_path,
- NULL,
+ g_build_filename(kz_test_get_base_dir(),
+ "fixtures", "bookmarks.xml",
+ NULL),
+ g_free,
"remote bookmark",
"http://kazehakase.sourceforge.jp/bookmark-test.xml",
NULL);
@@ -230,8 +237,20 @@
wait_signal(&n_load_start_received);
cut_assert_equal_int(1, n_load_start_received);
wait_signal(&n_load_completed_received);
+ cut_assert_equal_string(NULL, error_message);
+ cut_assert_equal_int(0, n_load_error_received);
cut_assert_equal_int(1, n_load_completed_received);
- cut_assert_equal_int(0, n_load_error_received);
+
+ expected = KZ_BOOKMARK(g_object_new(KZ_TYPE_BOOKMARK_FILE,
+ "location", uri,
+ "title", "Bookmark file",
+ "file-type", "XBEL",
+ NULL));
+ kz_bookmark_folder_append(KZ_BOOKMARK_FOLDER(expected),
+ kz_bookmark_new_with_attrs("Kazehakase",
+ "http://kazehakase.sourceforge.jp/",
+ NULL));
+ kz_assert_equal_bookmark(expected, KZ_BOOKMARK(file));
}
/*