From: Andrea Zagli Date: Wed, 26 Dec 2012 19:30:12 +0000 (+0100) Subject: Getting service file. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=d1c1845d3346c9017d3cff02d267eb92d4aa8d6d;p=libgapp Getting service file. --- diff --git a/.gitignore b/.gitignore index e4b3d41..8bc81a7 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ Rules-quot *.csv COPYING config.h.in +tests/service diff --git a/configure.ac b/configure.ac index d8ea377..07fc875 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,15 @@ PKG_CHECK_MODULES(GAPP, [libgfeed >= 0.2.0]) AC_SUBST(GAPP_CFLAGS) AC_SUBST(GAPP_LIBS) +PKG_CHECK_MODULES(LIBSOUP_GNOME, + [libsoup-gnome-2.4 >= 2.26], + [LIBSOUP_CFLAGS="$LIBSOUP_GNOME_CFLAGS" + LIBSOUP_LIBS="$LIBSOUP_GNOME_LIBS" + AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Have libsoup-gnome])], + [PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26])]) +AC_SUBST(LIBSOUP_CFLAGS) +AC_SUBST(LIBSOUP_LIBS) + # Checks for header files. AC_HEADER_STDC diff --git a/src/Makefile.am b/src/Makefile.am index 74742bd..e5979e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,9 +5,11 @@ WIN32_LIBS= endif LIBS = $(GAPP_LIBS) \ + $(LIBSOUP_LIBS) \ $(WIN32_LIBS) AM_CPPFLAGS = $(GAPP_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ -DG_LOG_DOMAIN=\"GApp\" lib_LTLIBRARIES = libgapp.la diff --git a/src/gapp.h b/src/gapp.h index 6400319..7de2939 100644 --- a/src/gapp.h +++ b/src/gapp.h @@ -1,6 +1,6 @@ -/* libgfeed +/* libgapp * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,23 +19,9 @@ * Andrea Zagli */ -#ifndef __GFEED_H__ -#define __GFEED_H__ +#ifndef __GAPP_H__ +#define __GAPP_H__ -#include -#include -#include -#include -#include -#include -#include +#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* __GFEED_H__ */ +#endif /* __GAPP_H__ */ diff --git a/src/service.c b/src/service.c index 104df92..8a0187a 100644 --- a/src/service.c +++ b/src/service.c @@ -25,6 +25,12 @@ #include +#ifdef HAVE_LIBSOUP_GNOME + #include +#else + #include +#endif + #include "gapp.h" #include "service.h" @@ -34,81 +40,128 @@ enum PROP_URL }; -static void service_class_init (ServiceClass *klass); -static void service_init (Service *service); +static void gapp_service_class_init (GappServiceClass *klass); +static void gapp_service_init (GappService *service); -static void service_set_property (GObject *object, +static void gapp_service_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void service_get_property (GObject *object, +static void gapp_service_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -static Service *parse_xml (xmlDoc *xdoc); +static GappService *parse_xml (xmlDoc *xdoc); -#define SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_SERVICE, ServicePrivate)) +#define GAPP_SERVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GAPP_SERVICE, GappServicePrivate)) -typedef struct _ServicePrivate ServicePrivate; -struct _ServicePrivate +typedef struct _GappServicePrivate GappServicePrivate; +struct _GappServicePrivate { + SoupSession *session; + gchar *url; + + xmlDoc *xdoc; + xmlNode *xroot; }; -G_DEFINE_TYPE (Service, service, G_TYPE_OBJECT) +G_DEFINE_TYPE (GappService, gapp_service, G_TYPE_OBJECT) static void -service_class_init (ServiceClass *klass) +gapp_service_class_init (GappServiceClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (object_class, sizeof (ServicePrivate)); + g_type_class_add_private (object_class, sizeof (GappServicePrivate)); - object_class->set_property = service_set_property; - object_class->get_property = service_get_property; + object_class->set_property = gapp_service_set_property; + object_class->get_property = gapp_service_get_property; g_object_class_install_property (object_class, PROP_URL, g_param_spec_string ("url", "Url", "Url of the service xml file.", NULL, - G_PARAM_CONSTRUCT | G_PARAM_READABLE)); + G_PARAM_READABLE)); } static void -service_init (Service *service) +gapp_service_init (GappService *service) { + GappServicePrivate *priv = GAPP_SERVICE_GET_PRIVATE (service); + + priv->url = NULL; } /** - * service_new: + * gapp_service_new: * @url: * - * Returns: the newly created #Service object. + * Returns: the newly created #GappService object. */ -Service -*service_new (const gchar *url) +GappService +*gapp_service_new (const gchar *url) { - Service *service = SERVICE (g_object_new (service_get_type (), NULL)); + GappService *service; + GappServicePrivate *priv; + + SoupURI *parsed; + SoupMessage *msg; + + g_return_val_if_fail (url != NULL, NULL); + + parsed = soup_uri_new (url); + if (!parsed) + { + g_printerr ("Could not parse '%s' as a URL.\n", url); + return NULL; + } + soup_uri_free (parsed); + + service = GAPP_SERVICE (g_object_new (gapp_service_get_type (), NULL)); + priv = GAPP_SERVICE_GET_PRIVATE (service); + + priv->url = g_strdup (url); + + priv->session = soup_session_async_new_with_options ( +#ifdef HAVE_LIBSOUP_GNOME + SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, +#endif + NULL); + + msg = soup_message_new (SOUP_METHOD_GET, priv->url); + soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT); + + soup_session_send_message (priv->session, msg); + + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) + { + g_message ("Message GET: success (%d).", msg->status_code); + } + else + { + g_message ("Message GET: error (%d).", msg->status_code); + } return service; } /** - * service_get_xml_doc: - * @service: an #Service object. + * gapp_service_get_xml_doc: + * @service: an #GappService object. * - * Returns: the #xmlDoc correspondent to the entire #Service object. + * Returns: the #xmlDoc correspondent to the entire #GappService object. */ xmlDoc -*service_get_xml_doc (Service *service) +*gapp_service_get_xml_doc (GappService *service) { xmlNode *xnode; GList *lst; - ServicePrivate *priv = SERVICE_GET_PRIVATE (service); + GappServicePrivate *priv = GAPP_SERVICE_GET_PRIVATE (service); xmlDoc *xdoc = xmlNewDoc ((const xmlChar *)"1.0"); xmlNode *xroot = xmlNewNode (NULL, (const xmlChar *)"feed"); @@ -123,24 +176,24 @@ xmlDoc } /** - * service_save_file: - * @service: an #Service object. + * gapp_service_save_file: + * @service: an #GappService object. * @filename: * */ gboolean -service_save_file (Service *service, const gchar *filename) +gapp_service_save_file (GappService *service, const gchar *filename) { - return (xmlSaveFileEnc (filename, service_get_xml_doc (service), "utf-8") > -1); + return (xmlSaveFileEnc (filename, gapp_service_get_xml_doc (service), "utf-8") > -1); } static void -service_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +gapp_service_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { GObject *obj; - Service *service = SERVICE (object); - ServicePrivate *priv = SERVICE_GET_PRIVATE (service); + GappService *service = GAPP_SERVICE (object); + GappServicePrivate *priv = GAPP_SERVICE_GET_PRIVATE (service); switch (property_id) { @@ -155,10 +208,10 @@ service_set_property (GObject *object, guint property_id, const GValue *value, G } static void -service_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +gapp_service_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - Service *service = SERVICE (object); - ServicePrivate *priv = SERVICE_GET_PRIVATE (service); + GappService *service = GAPP_SERVICE (object); + GappServicePrivate *priv = GAPP_SERVICE_GET_PRIVATE (service); switch (property_id) { @@ -168,10 +221,10 @@ service_get_property (GObject *object, guint property_id, GValue *value, GParamS } } -static Service +static GappService *parse_xml (xmlDoc *xdoc) { - Service *service; + GappService *service; return service; } diff --git a/src/service.h b/src/service.h index b5214a4..a246627 100644 --- a/src/service.h +++ b/src/service.h @@ -19,8 +19,8 @@ * Andrea Zagli */ -#ifndef __SERVICE_H__ -#define __SERVICE_H__ +#ifndef __GAPP_SERVICE_H__ +#define __GAPP_SERVICE_H__ #include #include @@ -29,35 +29,35 @@ G_BEGIN_DECLS -#define TYPE_SERVICE (service_get_type ()) -#define SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SERVICE, Service)) -#define SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SERVICE, ServiceClass)) -#define IS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SERVICE)) -#define IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SERVICE)) -#define SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SERVICE, ServiceClass)) +#define TYPE_GAPP_SERVICE (gapp_service_get_type ()) +#define GAPP_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GAPP_SERVICE, GappService)) +#define GAPP_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GAPP_SERVICE, GappServiceClass)) +#define IS_GAPP_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GAPP_SERVICE)) +#define IS_GAPP_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GAPP_SERVICE)) +#define GAPP_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GAPP_SERVICE, GappServiceClass)) -typedef struct _Service Service; -typedef struct _ServiceClass ServiceClass; +typedef struct _GappService GappService; +typedef struct _GappServiceClass GappServiceClass; -struct _Service +struct _GappService { GObject parent; }; -struct _ServiceClass +struct _GappServiceClass { GObjectClass parent_class; }; -GType service_get_type (void) G_GNUC_CONST; +GType gapp_service_get_type (void) G_GNUC_CONST; -Service *service_new (const gchar *url); +GappService *gapp_service_new (const gchar *url); -xmlDoc *service_get_xml_doc (Service *service); -gboolean service_save_file (Service *service, const gchar *filename); +xmlDoc *gapp_service_get_xml_doc (GappService *service); +gboolean gapp_service_save_file (GappService *service, const gchar *filename); G_END_DECLS -#endif /* __SERVICE_H__ */ +#endif /* __GAPP_SERVICE_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 20d4aed..ab0f945 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,14 @@ AM_CPPFLAGS = $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ - $(GAPP_CFLAGS) + $(GAPP_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ -I$(top_srcdir)/src \ -DGUIDIR="\"@abs_builddir@\"" LIBS = $(GAPP_LIBS) \ + $(LIBSOUP_LIBS) \ -export-dynamic LDADD = $(top_builddir)/src/libgapp.la -noinst_PROGRAMS = +noinst_PROGRAMS = service diff --git a/tests/service.c b/tests/service.c new file mode 100644 index 0000000..3b0899d --- /dev/null +++ b/tests/service.c @@ -0,0 +1,13 @@ +#include + +int +main (int argc, char *argv[]) +{ + g_type_init (); + + GappService *service; + + service = gapp_service_new (argv[1]); + + return 0; +}