[libgdata] Bug 578367 – Add support for YouTube-specific query parameters
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Subject: [libgdata] Bug 578367 – Add support for YouTube-specific query parameters
- Date: Fri, 15 May 2009 02:28:24 -0400 (EDT)
commit 480d4ea370cb80930ea6e75fce976643b570ac30
Author: Philip Withnall <philip tecnocode co uk>
Date: Fri May 15 07:26:20 2009 +0100
Bug 578367 â?? Add support for YouTube-specific query parameters
Adds a GDataYouTubeQuery class, implementing the custom query parameters
supported by YouTube. A test case is included. Closes: bgo#578367
---
docs/reference/gdata-docs.xml | 1 +
docs/reference/gdata-sections.txt | 51 ++
gdata/gdata.h | 1 +
gdata/gdata.symbols | 25 +
gdata/services/youtube/Makefile.am | 9 +-
gdata/services/youtube/gdata-youtube-query.c | 862 ++++++++++++++++++++++++++
gdata/services/youtube/gdata-youtube-query.h | 175 ++++++
gdata/tests/youtube.c | 80 +++
8 files changed, 1201 insertions(+), 3 deletions(-)
diff --git a/docs/reference/gdata-docs.xml b/docs/reference/gdata-docs.xml
index e024e69..4bb621e 100644
--- a/docs/reference/gdata-docs.xml
+++ b/docs/reference/gdata-docs.xml
@@ -36,6 +36,7 @@
<chapter>
<title>YouTube Service API</title>
<xi:include href="xml/gdata-youtube-service.xml"/>
+ <xi:include href="xml/gdata-youtube-query.xml"/>
<xi:include href="xml/gdata-youtube-video.xml"/>
</chapter>
diff --git a/docs/reference/gdata-sections.txt b/docs/reference/gdata-sections.txt
index 6288fd4..79a1915 100644
--- a/docs/reference/gdata-sections.txt
+++ b/docs/reference/gdata-sections.txt
@@ -577,3 +577,54 @@ GDATA_TYPE_G_TIME_VAL
gdata_color_get_type
gdata_g_time_val_get_type
</SECTION>
+
+<SECTION>
+<FILE>gdata-youtube-query</FILE>
+<TITLE>GDataYouTubeQuery</TITLE>
+GDataYouTubeQuery
+GDataYouTubeQueryClass
+GDataYouTubeAge
+GDataYouTubeFormat
+GDataYouTubeSafeSearch
+GDataYouTubeSortOrder
+GDataYouTubeUploader
+gdata_youtube_query_new
+gdata_youtube_query_get_age
+gdata_youtube_query_set_age
+gdata_youtube_query_get_format
+gdata_youtube_query_set_format
+gdata_youtube_query_get_language
+gdata_youtube_query_set_language
+gdata_youtube_query_get_location
+gdata_youtube_query_set_location
+gdata_youtube_query_get_order_by
+gdata_youtube_query_set_order_by
+gdata_youtube_query_get_restriction
+gdata_youtube_query_set_restriction
+gdata_youtube_query_get_safe_search
+gdata_youtube_query_set_safe_search
+gdata_youtube_query_get_sort_order
+gdata_youtube_query_set_sort_order
+gdata_youtube_query_get_uploader
+gdata_youtube_query_set_uploader
+<SUBSECTION Standard>
+GDATA_IS_YOUTUBE_QUERY
+GDATA_IS_YOUTUBE_QUERY_CLASS
+GDATA_TYPE_YOUTUBE_AGE
+GDATA_TYPE_YOUTUBE_FORMAT
+GDATA_TYPE_YOUTUBE_QUERY
+GDATA_TYPE_YOUTUBE_SAFE_SEARCH
+GDATA_TYPE_YOUTUBE_SORT_ORDER
+GDATA_TYPE_YOUTUBE_UPLOADER
+GDATA_YOUTUBE_QUERY
+GDATA_YOUTUBE_QUERY_CLASS
+GDATA_YOUTUBE_QUERY_GET_CLASS
+gdata_youtube_query_get_type
+gdata_youtube_age_get_type
+gdata_youtube_format_get_type
+gdata_youtube_safe_search_get_type
+gdata_youtube_sort_order_get_type
+gdata_youtube_uploader_get_type
+<SUBSECTION Private>
+GDataYouTubeQueryPrivate
+</SECTION>
diff --git a/gdata/gdata.h b/gdata/gdata.h
index 8a93d45..20fde3c 100644
--- a/gdata/gdata.h
+++ b/gdata/gdata.h
@@ -38,6 +38,7 @@
/* YouTube */
#include <gdata/services/youtube/gdata-youtube-service.h>
+#include <gdata/services/youtube/gdata-youtube-query.h>
#include <gdata/services/youtube/gdata-youtube-video.h>
#include <gdata/services/youtube/gdata-youtube.h>
#include <gdata/services/youtube/gdata-youtube-enums.h>
diff --git a/gdata/gdata.symbols b/gdata/gdata.symbols
index 1844930..d5353f4 100644
--- a/gdata/gdata.symbols
+++ b/gdata/gdata.symbols
@@ -165,6 +165,31 @@ gdata_youtube_video_get_recorded
gdata_youtube_video_set_recorded
gdata_youtube_state_new
gdata_youtube_state_free
+gdata_youtube_format_get_type
+gdata_youtube_safe_search_get_type
+gdata_youtube_sort_order_get_type
+gdata_youtube_age_get_type
+gdata_youtube_uploader_get_type
+gdata_youtube_query_get_type
+gdata_youtube_query_new
+gdata_youtube_query_get_format
+gdata_youtube_query_set_format
+gdata_youtube_query_get_location
+gdata_youtube_query_set_location
+gdata_youtube_query_get_language
+gdata_youtube_query_set_language
+gdata_youtube_query_get_order_by
+gdata_youtube_query_set_order_by
+gdata_youtube_query_get_restriction
+gdata_youtube_query_set_restriction
+gdata_youtube_query_get_safe_search
+gdata_youtube_query_set_safe_search
+gdata_youtube_query_get_sort_order
+gdata_youtube_query_set_sort_order
+gdata_youtube_query_get_age
+gdata_youtube_query_set_age
+gdata_youtube_query_get_uploader
+gdata_youtube_query_set_uploader
gdata_calendar_calendar_get_type
gdata_calendar_calendar_new
gdata_calendar_calendar_new_from_xml
diff --git a/gdata/services/youtube/Makefile.am b/gdata/services/youtube/Makefile.am
index b933df7..c208345 100644
--- a/gdata/services/youtube/Makefile.am
+++ b/gdata/services/youtube/Makefile.am
@@ -16,7 +16,7 @@ gdata-youtube-enums.h: $(gdatayoutubeinclude_HEADERS) Makefile
gdata-youtube-enums.c: $(gdatayoutubeinclude_HEADERS) Makefile gdata-youtube-enums.h
(cd $(srcdir) && $(GLIB_MKENUMS) \
- --fhead "#include \"gdata-youtube-service.h\"\n#include \"gdata-youtube-enums.h\"" \
+ --fhead "#include \"gdata-youtube-service.h\"\n#include \"gdata-youtube-query.h\"\n#include \"gdata-youtube-enums.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
@@ -31,7 +31,8 @@ gdatayoutubeinclude_HEADERS = \
gdata-youtube-service.h \
gdata-youtube-video.h \
gdata-youtube.h \
- gdata-youtube-enums.h
+ gdata-youtube-enums.h \
+ gdata-youtube-query.h
noinst_LTLIBRARIES = libgdatayoutube.la
@@ -44,7 +45,9 @@ libgdatayoutube_la_SOURCES = \
gdata-youtube-video.c \
gdata-youtube-video.h \
gdata-youtube.c \
- gdata-youtube.h
+ gdata-youtube.h \
+ gdata-youtube-query.c \
+ gdata-youtube-query.h
libgdatayoutube_la_CPPFLAGS = \
-I$(top_srcdir) \
diff --git a/gdata/services/youtube/gdata-youtube-query.c b/gdata/services/youtube/gdata-youtube-query.c
new file mode 100644
index 0000000..a19064e
--- /dev/null
+++ b/gdata/services/youtube/gdata-youtube-query.c
@@ -0,0 +1,862 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * GData Client
+ * Copyright (C) Philip Withnall 2009 <philip tecnocode co uk>
+ *
+ * GData Client is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * GData Client is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GData Client. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * SECTION:gdata-youtube-query
+ * @short_description: GData YouTube query object
+ * @stability: Unstable
+ * @include: gdata/services/youtube/gdata-youtube-query.h
+ *
+ * #GDataYouTubeQuery represents a collection of query parameters specific to the YouTube service, which go above and beyond
+ * those catered for by #GDataQuery.
+ *
+ * For more information on the custom GData query parameters supported by #GDataYouTubeQuery, see the <ulink type="http"
+ * url="http://code.google.com/apis/youtube/2.0/reference.html#Custom_parameters";>online documentation</ulink>.
+ **/
+
+#include <config.h>
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <string.h>
+
+#include "gdata-youtube-query.h"
+#include "gdata-query.h"
+
+static void gdata_youtube_query_finalize (GObject *object);
+static void gdata_youtube_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
+static void gdata_youtube_query_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
+static void get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboolean *params_started);
+
+struct _GDataYouTubeQueryPrivate {
+ GDataYouTubeFormat format;
+ gdouble latitude;
+ gdouble longitude;
+ gdouble location_radius;
+ gboolean has_location;
+ gchar *language;
+ gchar *order_by;
+ gchar *restriction;
+ GDataYouTubeSafeSearch safe_search;
+ GDataYouTubeSortOrder sort_order;
+ GDataYouTubeAge age;
+ GDataYouTubeUploader uploader;
+};
+
+enum {
+ PROP_FORMAT = 1,
+ PROP_LATITUDE,
+ PROP_LONGITUDE,
+ PROP_LOCATION_RADIUS,
+ PROP_HAS_LOCATION,
+ PROP_LANGUAGE,
+ PROP_ORDER_BY,
+ PROP_RESTRICTION,
+ PROP_SAFE_SEARCH,
+ PROP_SORT_ORDER,
+ PROP_AGE,
+ PROP_UPLOADER
+};
+
+G_DEFINE_TYPE (GDataYouTubeQuery, gdata_youtube_query, GDATA_TYPE_QUERY)
+#define GDATA_YOUTUBE_QUERY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_YOUTUBE_QUERY, GDataYouTubeQueryPrivate))
+
+static void
+gdata_youtube_query_class_init (GDataYouTubeQueryClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GDataQueryClass *query_class = GDATA_QUERY_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (GDataYouTubeQueryPrivate));
+
+ gobject_class->set_property = gdata_youtube_query_set_property;
+ gobject_class->get_property = gdata_youtube_query_get_property;
+ gobject_class->finalize = gdata_youtube_query_finalize;
+
+ query_class->get_query_uri = get_query_uri;
+
+ /**
+ * GDataYouTubeQuery:format:
+ *
+ * Specifies that videos must be available in a particular video format. Use %GDATA_YOUTUBE_FORMAT_ALL to
+ * retrieve videos irrespective of their format availability.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_FORMAT,
+ g_param_spec_enum ("format",
+ "Format", "Specifies that videos must be available in a particular video format.",
+ GDATA_TYPE_YOUTUBE_FORMAT, GDATA_YOUTUBE_FORMAT_ALL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:latitude:
+ *
+ * The latitude of a particular location of which videos should be found. This should be used in conjunction with
+ * #GDataYouTubeQuery:longitude; if either property is outside the valid range, neither will be used. Valid latitudes
+ * are between %-90 and %90 degrees; any values of this property outside that range will unset the property in the
+ * query URI.
+ *
+ * If #GDataYouTubeQuery:location-radius is a non-%0 value, this will define a circle from which videos should be found.
+ *
+ * If #GDataYouTubeQuery:has-location is %TRUE, only videos which are associated with specific coordinates in the search
+ * circle will be returned. Otherwise, videos which have a relevant descriptive address (but no specific coordinates) will
+ * also be returned.
+ *
+ * For more information, see the <ulink type="http"
+ * url="http://code.google.com/apis/youtube/2.0/reference.html#locationsp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_LATITUDE,
+ g_param_spec_double ("latitude",
+ "Latitude", "The latitude of a particular location of which videos should be found.",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:longitude:
+ *
+ * The longitude of a particular location of which videos should be found. This should be used in conjunction with
+ * #GDataYouTubeQuery:latitude; if either property is outside the valid range, neither will be used. Valid longitudes
+ * are between %-180 and %180 degrees; any values of this property outside that range will unset the property in the
+ * query URI.
+ *
+ * For more information, see the documentation for #GDataYouTubeQuery:latitude.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_LONGITUDE,
+ g_param_spec_double ("longitude",
+ "Longitude", "The longitude of a particular location of which videos should be found.",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:location-radius:
+ *
+ * The radius, in metres, of a circle from within which videos should be returned. The circle is centred on the latitude and
+ * longitude given in #GDataYouTubeQuery:latitude and #GDataYouTubeQuery:longitude.
+ *
+ * Set this property to %0 to search for specific coordinates, rather than within a given radius.
+ *
+ * For more information, see the documentation for #GDataYouTubeQuery:latitude.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_LOCATION_RADIUS,
+ g_param_spec_double ("location-radius",
+ "Location radius", "The radius, in metres, of a circle from within which videos should be returned.",
+ 0.0, G_MAXDOUBLE, 0.0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:has-location:
+ *
+ * Whether to restrict search results to videos with specific coordinates associated with them. If used with a given
+ * #GDataYouTubeQuery:latitude and #GDataYouTubeQuery:longitude, only videos with specific coordinates (not those with merely
+ * a descriptive address) will be returned. If used without a latitude and longitude set, only videos with specific coordinates
+ * (regardless of those coordinates) will be returned.
+ *
+ * For more information, see the documentation for #GDataYouTubeQuery:latitude.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_HAS_LOCATION,
+ g_param_spec_boolean ("has-location",
+ "Has location?", "Whether to restrict search results to videos with specific coordinates associated with them.",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:language:
+ *
+ * Restricts the search to videos that have a title, description or keywords in a specified language. The language code should
+ * be a two-letter ISO 639-1 code; or you can use <literal>zh-Hans</literal> for simplified Chinese and <literal>zh-Hant</literal>
+ * for traditional Chinese.
+ *
+ * For more information, see the <ulink type="http"
+ * url="http://code.google.com/apis/youtube/2.0/reference.html#lrsp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_LANGUAGE,
+ g_param_spec_string ("language",
+ "Language", "Restricts the search to videos that have a title, description or keywords in a specified language.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:order-by:
+ *
+ * Specifies the order of entries in a feed. Supported values are <literal>relevance</literal>,
+ * <literal>published</literal>, <literal>viewCount</literal> and <literal>rating</literal>.
+ *
+ * Additionally, results most relevant to a specific language can be returned by setting the property
+ * to <literal>relevance_lang_<replaceable>languageCode</replaceable></literal>, where
+ * <replaceable>languageCode</replaceable> is an ISO 639-1 language code, as used in #GDataYouTubeQuery:language.
+ *
+ * For more information, see the <ulink type="http"
+ * url="http://code.google.com/apis/youtube/2.0/reference.html#orderbysp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_ORDER_BY,
+ g_param_spec_string ("order-by",
+ "Order by", "Specifies the order of entries in a feed.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:restriction:
+ *
+ * The IP address that should be used to filter videos playable only in specific countries. This should be the
+ * IP address of the client, if different to the IP address in use by the library. Alternatively, it can be an ISO 3166
+ * two-letter country code.
+ *
+ * For more information, see the <ulink type="http"
+ * url="http://code.google.com/apis/youtube/2.0/reference.html#restrictionsp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_RESTRICTION,
+ g_param_spec_string ("restriction",
+ "Restriction", "The IP address that should be used to filter videos playable only in specific countries.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:safe-search:
+ *
+ * Whether the search results should include restricted content as well as standard content.
+ *
+ * For more information, see the <ulink type="http"
+ * url="http://code.google.com/apis/youtube/2.0/reference.html#safeSearchsp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_SAFE_SEARCH,
+ g_param_spec_enum ("safe-search",
+ "Safe search", "Whether the search results should include restricted content as well as standard content.",
+ GDATA_TYPE_YOUTUBE_SAFE_SEARCH, GDATA_YOUTUBE_SAFE_SEARCH_MODERATE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:sort-order:
+ *
+ * Specifies the direction of sorting. To use the default sort order, set the property to %GDATA_YOUTUBE_SORT_NONE.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_SORT_ORDER,
+ g_param_spec_enum ("sort-order",
+ "Sort order", "Specifies the direction of sorting.",
+ GDATA_TYPE_YOUTUBE_SORT_ORDER, GDATA_YOUTUBE_SORT_NONE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:age:
+ *
+ * Restricts the search to videos uploaded within the specified time period. To retrieve videos irrespective of their
+ * age, set the property to %GDATA_YOUTUBE_AGE_ALL_TIME.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_AGE,
+ g_param_spec_enum ("age",
+ "Age", "Restricts the search to videos uploaded within the specified time period.",
+ GDATA_TYPE_YOUTUBE_AGE, GDATA_YOUTUBE_AGE_ALL_TIME,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ /**
+ * GDataYouTubeQuery:uploader:
+ *
+ * Restricts the search to videos from the specified type of uploader. Currently, this can only be used to restrict
+ * searches to videos from YouTube partners.
+ *
+ * Since: 0.3.0
+ **/
+ g_object_class_install_property (gobject_class, PROP_UPLOADER,
+ g_param_spec_enum ("uploader",
+ "Uploader", "Restricts the search to videos from the specified type of uploader.",
+ GDATA_TYPE_YOUTUBE_UPLOADER, GDATA_YOUTUBE_UPLOADER_ALL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+gdata_youtube_query_init (GDataYouTubeQuery *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GDATA_TYPE_YOUTUBE_QUERY, GDataYouTubeQueryPrivate);
+}
+
+static void
+gdata_youtube_query_finalize (GObject *object)
+{
+ GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY_GET_PRIVATE (object);
+
+ g_free (priv->language);
+ g_free (priv->order_by);
+ g_free (priv->restriction);
+
+ /* Chain up to the parent class */
+ G_OBJECT_CLASS (gdata_youtube_query_parent_class)->finalize (object);
+}
+
+static void
+gdata_youtube_query_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+{
+ GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY_GET_PRIVATE (object);
+
+ switch (property_id) {
+ case PROP_FORMAT:
+ g_value_set_enum (value, priv->format);
+ break;
+ case PROP_LATITUDE:
+ g_value_set_double (value, priv->latitude);
+ break;
+ case PROP_LONGITUDE:
+ g_value_set_double (value, priv->longitude);
+ break;
+ case PROP_LOCATION_RADIUS:
+ g_value_set_double (value, priv->location_radius);
+ break;
+ case PROP_HAS_LOCATION:
+ g_value_set_boolean (value, priv->has_location);
+ break;
+ case PROP_LANGUAGE:
+ g_value_set_string (value, priv->language);
+ break;
+ case PROP_ORDER_BY:
+ g_value_set_string (value, priv->order_by);
+ break;
+ case PROP_RESTRICTION:
+ g_value_set_string (value, priv->restriction);
+ break;
+ case PROP_SAFE_SEARCH:
+ g_value_set_enum (value, priv->safe_search);
+ break;
+ case PROP_SORT_ORDER:
+ g_value_set_enum (value, priv->sort_order);
+ break;
+ case PROP_AGE:
+ g_value_set_enum (value, priv->age);
+ break;
+ case PROP_UPLOADER:
+ g_value_set_enum (value, priv->uploader);
+ break;
+ default:
+ /* We don't have any other property... */
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gdata_youtube_query_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+{
+ GDataYouTubeQuery *self = GDATA_YOUTUBE_QUERY (object);
+
+ switch (property_id) {
+ case PROP_FORMAT:
+ gdata_youtube_query_set_format (self, g_value_get_enum (value));
+ break;
+ case PROP_LATITUDE:
+ self->priv->latitude = g_value_get_double (value);
+ g_object_notify (object, "latitude");
+ break;
+ case PROP_LONGITUDE:
+ self->priv->longitude = g_value_get_double (value);
+ g_object_notify (object, "longitude");
+ break;
+ case PROP_LOCATION_RADIUS:
+ self->priv->location_radius = g_value_get_double (value);
+ g_object_notify (object, "location-radius");
+ break;
+ case PROP_HAS_LOCATION:
+ self->priv->has_location = g_value_get_boolean (value);
+ g_object_notify (object, "has-location");
+ break;
+ case PROP_LANGUAGE:
+ gdata_youtube_query_set_language (self, g_value_get_string (value));
+ break;
+ case PROP_ORDER_BY:
+ gdata_youtube_query_set_order_by (self, g_value_get_string (value));
+ break;
+ case PROP_RESTRICTION:
+ gdata_youtube_query_set_restriction (self, g_value_get_string (value));
+ break;
+ case PROP_SAFE_SEARCH:
+ gdata_youtube_query_set_safe_search (self, g_value_get_enum (value));
+ break;
+ case PROP_SORT_ORDER:
+ gdata_youtube_query_set_sort_order (self, g_value_get_enum (value));
+ break;
+ case PROP_AGE:
+ gdata_youtube_query_set_age (self, g_value_get_enum (value));
+ break;
+ case PROP_UPLOADER:
+ gdata_youtube_query_set_uploader (self, g_value_get_enum (value));
+ break;
+ default:
+ /* We don't have any other property... */
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+get_query_uri (GDataQuery *self, const gchar *feed_uri, GString *query_uri, gboolean *params_started)
+{
+ GDataYouTubeQueryPrivate *priv = GDATA_YOUTUBE_QUERY (self)->priv;
+
+ #define APPEND_SEP g_string_append_c (query_uri, (*params_started == FALSE) ? '?' : '&'); *params_started = TRUE;
+
+ /* Chain up to the parent class */
+ GDATA_QUERY_CLASS (gdata_youtube_query_parent_class)->get_query_uri (self, feed_uri, query_uri, params_started);
+
+ APPEND_SEP
+ switch (priv->age) {
+ case GDATA_YOUTUBE_AGE_TODAY:
+ g_string_append (query_uri, "time=today");
+ break;
+ case GDATA_YOUTUBE_AGE_THIS_WEEK:
+ g_string_append (query_uri, "time=this_week");
+ break;
+ case GDATA_YOUTUBE_AGE_THIS_MONTH:
+ g_string_append (query_uri, "time=this_month");
+ break;
+ case GDATA_YOUTUBE_AGE_ALL_TIME:
+ g_string_append (query_uri, "time=all_time");
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ /* We don't need to use APPEND_SEP below here, as the "age" parameter is always included */
+ switch (priv->safe_search) {
+ case GDATA_YOUTUBE_SAFE_SEARCH_NONE:
+ g_string_append (query_uri, "&safeSearch=none");
+ break;
+ case GDATA_YOUTUBE_SAFE_SEARCH_MODERATE:
+ g_string_append (query_uri, "&safeSearch=moderate");
+ break;
+ case GDATA_YOUTUBE_SAFE_SEARCH_STRICT:
+ g_string_append (query_uri, "&safeSearch=strict");
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ if (priv->format != GDATA_YOUTUBE_FORMAT_ALL)
+ g_string_append_printf (query_uri, "&format=%u", priv->format);
+
+ if (priv->latitude >= -90.0 && priv->latitude <= 90.0 &&
+ priv->longitude >= -180.0 && priv->longitude <= 180.0) {
+ g_string_append_printf (query_uri, (priv->has_location == TRUE) ? "&location=%f,%f!" : "&location=%f,%f",
+ priv->latitude, priv->longitude);
+
+ if (priv->location_radius >= 0.0)
+ g_string_append_printf (query_uri, "&location-radius=%fm", priv->location_radius);
+ } else if (priv->has_location == TRUE) {
+ g_string_append (query_uri, "&location=!");
+ }
+
+ if (priv->language != NULL) {
+ g_string_append (query_uri, "&lr=");
+ g_string_append_uri_escaped (query_uri, priv->language, NULL, TRUE);
+ }
+
+ if (priv->order_by != NULL) {
+ g_string_append (query_uri, "&orderby=");
+ g_string_append_uri_escaped (query_uri, priv->order_by, NULL, TRUE);
+ }
+
+ if (priv->restriction != NULL) {
+ g_string_append (query_uri, "&restriction=");
+ g_string_append_uri_escaped (query_uri, priv->restriction, NULL, TRUE);
+ }
+
+ if (priv->sort_order != GDATA_YOUTUBE_SORT_NONE) {
+ if (priv->sort_order == GDATA_YOUTUBE_SORT_ASCENDING)
+ g_string_append (query_uri, "&sortorder=ascending");
+ else if (priv->sort_order == GDATA_YOUTUBE_SORT_DESCENDING)
+ g_string_append (query_uri, "&sortorder=descending");
+ else
+ g_assert_not_reached ();
+ }
+
+ if (priv->uploader != GDATA_YOUTUBE_UPLOADER_ALL)
+ g_string_append (query_uri, "&uploader=partner");
+}
+
+/**
+ * gdata_youtube_query_new:
+ * @q: a query string
+ *
+ * Creates a new #GDataYouTubeQuery with its #GDataQuery:q property set to @q.
+ *
+ * Return value: a new #GDataYouTubeQuery
+ *
+ * Since: 0.3.0
+ **/
+GDataYouTubeQuery *
+gdata_youtube_query_new (const gchar *q)
+{
+ return g_object_new (GDATA_TYPE_YOUTUBE_QUERY, "q", q, NULL);
+}
+
+/**
+ * gdata_youtube_query_get_format:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:format property.
+ *
+ * Return value: the format property
+ *
+ * Since: 0.3.0
+ **/
+GDataYouTubeFormat
+gdata_youtube_query_get_format (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), GDATA_YOUTUBE_FORMAT_ALL);
+ return self->priv->format;
+}
+
+/**
+ * gdata_youtube_query_set_format:
+ * @self: a #GDataYouTubeQuery
+ * @format: the requested video format
+ *
+ * Sets the #GDataYouTubeQuery:format property of the #GDataYouTubeQuery to @format.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_format (GDataYouTubeQuery *self, GDataYouTubeFormat format)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ self->priv->format = format;
+ g_object_notify (G_OBJECT (self), "format");
+}
+
+/**
+ * gdata_youtube_query_get_location:
+ * @self: a #GDataYouTubeQuery
+ * @latitude: a location in which to return the latitude, or %NULL
+ * @longitude: a location in which to return the longitude, or %NULL
+ * @radius: a location in which to return the location radius, or %NULL
+ * @has_location: a location in which to return %TRUE if the query is searching for videos with a specific location, %FALSE otherwise, or %NULL
+ *
+ * Gets the location-based properties of the #GDataYouTubeQuery<!-- -->: #GDataYouTubeQuery:latitude, #GDataYouTubeQuery:longitude,
+ * #GDataYouTubeQuery:location-radius and #GDataYouTubeQuery:has-location.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_get_location (GDataYouTubeQuery *self, gdouble *latitude, gdouble *longitude, gdouble *radius, gboolean *has_location)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+
+ if (latitude != NULL)
+ *latitude = self->priv->latitude;
+ if (longitude != NULL)
+ *longitude = self->priv->longitude;
+ if (radius != NULL)
+ *radius = self->priv->location_radius;
+ if (has_location != NULL)
+ *has_location = self->priv->has_location;
+}
+
+/**
+ * gdata_youtube_query_set_location:
+ * @self: a #GDataYouTubeQuery
+ * @latitude: the new latitude, or %G_MAXDOUBLE
+ * @longitude: the new longitude, or %G_MAXDOUBLE
+ * @radius: the new location radius, or %0
+ * @has_location: %TRUE if the query is for videos with a specific location, %FALSE otherwise
+ *
+ * Sets the location-based properties of the #GDataYouTubeQuery<!-- -->: #GDataYouTubeQuery:latitude, #GDataYouTubeQuery:longitude,
+ * #GDataYouTubeQuery:location-radius and #GDataYouTubeQuery:has-location.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_location (GDataYouTubeQuery *self, gdouble latitude, gdouble longitude, gdouble radius, gboolean has_location)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+
+ self->priv->latitude = latitude;
+ self->priv->longitude = longitude;
+ self->priv->location_radius = radius;
+ self->priv->has_location = has_location;
+
+ g_object_notify (G_OBJECT (self), "latitude");
+ g_object_notify (G_OBJECT (self), "longitude");
+ g_object_notify (G_OBJECT (self), "location-radius");
+ g_object_notify (G_OBJECT (self), "has-location");
+}
+
+/**
+ * gdata_youtube_query_get_language:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:language property.
+ *
+ * Return value: the language property, or %NULL if it is unset
+ *
+ * Since: 0.3.0
+ **/
+const gchar *
+gdata_youtube_query_get_language (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), NULL);
+ return self->priv->language;
+}
+
+/**
+ * gdata_youtube_query_set_language:
+ * @self: a #GDataYouTubeQuery
+ * @language: a new language name, or %NULL
+ *
+ * Sets the #GDataYouTubeQuery:language property of the #GDataYouTubeQuery to the new language, @language.
+ *
+ * Set @language to %NULL to unset the property in the query URI.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_language (GDataYouTubeQuery *self, const gchar *language)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ g_free (self->priv->language);
+ self->priv->language = g_strdup (language);
+ g_object_notify (G_OBJECT (self), "language");
+}
+
+/**
+ * gdata_youtube_query_get_order_by:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:order-by property.
+ *
+ * Return value: the order by property, or %NULL if it is unset
+ *
+ * Since: 0.3.0
+ **/
+const gchar *
+gdata_youtube_query_get_order_by (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), NULL);
+ return self->priv->order_by;
+}
+
+/**
+ * gdata_youtube_query_set_order_by:
+ * @self: a #GDataYouTubeQuery
+ * @order_by: a new order by string, or %NULL
+ *
+ * Sets the #GDataYouTubeQuery:order-by property of the #GDataYouTubeQuery to the new order by string, @order_by.
+ *
+ * Set @order_by to %NULL to unset the property in the query URI.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_order_by (GDataYouTubeQuery *self, const gchar *order_by)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+
+ g_free (self->priv->order_by);
+ self->priv->order_by = g_strdup (order_by);
+ g_object_notify (G_OBJECT (self), "order-by");
+}
+
+/**
+ * gdata_youtube_query_get_restriction:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:restriction property.
+ *
+ * Return value: the restriction property, or %NULL if it is unset
+ *
+ * Since: 0.3.0
+ **/
+const gchar *
+gdata_youtube_query_get_restriction (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), NULL);
+ return self->priv->restriction;
+}
+
+/**
+ * gdata_youtube_query_set_restriction:
+ * @self: a #GDataYouTubeQuery
+ * @restriction: a new restriction string, or %NULL
+ *
+ * Sets the #GDataYouTubeQuery:restriction property of the #GDataYouTubeQuery to the new restriction string, @restriction.
+ *
+ * Set @restriction to %NULL to unset the property in the query URI.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_restriction (GDataYouTubeQuery *self, const gchar *restriction)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ g_free (self->priv->restriction);
+ self->priv->restriction = g_strdup (restriction);
+ g_object_notify (G_OBJECT (self), "restriction");
+}
+
+/**
+ * gdata_youtube_query_get_safe_search:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:safe-search property.
+ *
+ * Return value: the safe search property
+ *
+ * Since: 0.3.0
+ **/
+GDataYouTubeSafeSearch
+gdata_youtube_query_get_safe_search (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), GDATA_YOUTUBE_SAFE_SEARCH_MODERATE);
+ return self->priv->safe_search;
+}
+
+/**
+ * gdata_youtube_query_set_safe_search:
+ * @self: a #GDataYouTubeQuery
+ * @safe_search: a new safe search level
+ *
+ * Sets the #GDataYouTubeQuery:safe-search property of the #GDataYouTubeQuery to @safe_search.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_safe_search (GDataYouTubeQuery *self, GDataYouTubeSafeSearch safe_search)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ self->priv->safe_search = safe_search;
+ g_object_notify (G_OBJECT (self), "safe-search");
+}
+
+/**
+ * gdata_youtube_query_get_sort_order:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:sort-order property.
+ *
+ * Return value: the sort order property
+ *
+ * Since: 0.3.0
+ **/
+GDataYouTubeSortOrder
+gdata_youtube_query_get_sort_order (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), GDATA_YOUTUBE_SORT_NONE);
+ return self->priv->sort_order;
+}
+
+/**
+ * gdata_youtube_query_set_sort_order:
+ * @self: a #GDataYouTubeQuery
+ * @sort_order: the new sort order
+ *
+ * Sets the #GDataYouTubeQuery:sort-order property of the #GDataYouTubeQuery to @sort_order.
+ *
+ * Set @sort_order to %GDATA_YOUTUBE_SORT_NONE to unset the property in the query URI.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_sort_order (GDataYouTubeQuery *self, GDataYouTubeSortOrder sort_order)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ self->priv->sort_order = sort_order;
+ g_object_notify (G_OBJECT (self), "sort-order");
+}
+
+/**
+ * gdata_youtube_query_get_age:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:age property.
+ *
+ * Return value: the age property
+ *
+ * Since: 0.3.0
+ **/
+GDataYouTubeAge
+gdata_youtube_query_get_age (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), GDATA_YOUTUBE_AGE_ALL_TIME);
+ return self->priv->age;
+}
+
+/**
+ * gdata_youtube_query_set_age:
+ * @self: a #GDataYouTubeQuery
+ * @age: the new age
+ *
+ * Sets the #GDataYouTubeQuery:age property of the #GDataYouTubeQuery to @age.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_age (GDataYouTubeQuery *self, GDataYouTubeAge age)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ self->priv->age = age;
+ g_object_notify (G_OBJECT (self), "age");
+}
+
+/**
+ * gdata_youtube_query_get_uploader:
+ * @self: a #GDataYouTubeQuery
+ *
+ * Gets the #GDataYouTubeQuery:uploader property.
+ *
+ * Return value: the uploader property
+ *
+ * Since: 0.3.0
+ **/
+GDataYouTubeUploader
+gdata_youtube_query_get_uploader (GDataYouTubeQuery *self)
+{
+ g_return_val_if_fail (GDATA_IS_YOUTUBE_QUERY (self), GDATA_YOUTUBE_UPLOADER_ALL);
+ return self->priv->uploader;
+}
+
+/**
+ * gdata_youtube_query_set_uploader:
+ * @self: a #GDataYouTubeQuery
+ * @uploader: the new uploader
+ *
+ * Sets the #GDataYouTubeQuery:uploader property of the #GDataYouTubeQuery to @uploader.
+ *
+ * Since: 0.3.0
+ **/
+void
+gdata_youtube_query_set_uploader (GDataYouTubeQuery *self, GDataYouTubeUploader uploader)
+{
+ g_return_if_fail (GDATA_IS_YOUTUBE_QUERY (self));
+ self->priv->uploader = uploader;
+ g_object_notify (G_OBJECT (self), "uploader");
+}
diff --git a/gdata/services/youtube/gdata-youtube-query.h b/gdata/services/youtube/gdata-youtube-query.h
new file mode 100644
index 0000000..4977f3f
--- /dev/null
+++ b/gdata/services/youtube/gdata-youtube-query.h
@@ -0,0 +1,175 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * GData Client
+ * Copyright (C) Philip Withnall 2009 <philip tecnocode co uk>
+ *
+ * GData Client is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * GData Client is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GData Client. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GDATA_YOUTUBE_QUERY_H
+#define GDATA_YOUTUBE_QUERY_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <gdata/gdata-query.h>
+#include <gdata/gdata-types.h>
+#include <gdata/services/youtube/gdata-youtube-enums.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GDataYouTubeFormat:
+ * @GDATA_YOUTUBE_FORMAT_ALL: retrieve videos in all formats when querying the service
+ * @GDATA_YOUTUBE_FORMAT_RTSP_H263_AMR: RTSP streaming URL for mobile video playback; H.263 video (up to 176Ã?144) and AMR audio
+ * @GDATA_YOUTUBE_FORMAT_HTTP_SWF: HTTP URL to the embeddable player (SWF) for this video
+ * @GDATA_YOUTUBE_FORMAT_RTSP_MPEG4_AAC: RTSP streaming URL for mobile video playback; MPEG-4 SP video (up to 176Ã?144) and AAC audio
+ *
+ * Video formats available on YouTube. For more information, see the
+ * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#formatsp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+typedef enum {
+ GDATA_YOUTUBE_FORMAT_ALL = 0,
+ GDATA_YOUTUBE_FORMAT_RTSP_H263_AMR = 1,
+ GDATA_YOUTUBE_FORMAT_HTTP_SWF = 5,
+ GDATA_YOUTUBE_FORMAT_RTSP_MPEG4_AAC = 6
+} GDataYouTubeFormat;
+
+/**
+ * GDataYouTubeSafeSearch:
+ * @GDATA_YOUTUBE_SAFE_SEARCH_NONE: YouTube will not perform any filtering on the search result set
+ * @GDATA_YOUTUBE_SAFE_SEARCH_MODERATE: YouTube will filter some content from search results and, at the least,
+ * will filter content that is restricted in your locale
+ * @GDATA_YOUTUBE_SAFE_SEARCH_STRICT: YouTube will try to exclude all restricted content from the search result set
+ *
+ * Safe search levels for removing restricted entries from query results. For more information, see the
+ * <ulink type="http" url="http://code.google.com/apis/youtube/2.0/reference.html#safeSearchsp";>online documentation</ulink>.
+ *
+ * Since: 0.3.0
+ **/
+typedef enum {
+ GDATA_YOUTUBE_SAFE_SEARCH_NONE = 0,
+ GDATA_YOUTUBE_SAFE_SEARCH_MODERATE,
+ GDATA_YOUTUBE_SAFE_SEARCH_STRICT
+} GDataYouTubeSafeSearch;
+
+/**
+ * GDataYouTubeSortOrder:
+ * @GDATA_YOUTUBE_SORT_NONE: do not explicitly sort in any sense
+ * @GDATA_YOUTUBE_SORT_ASCENDING: sort results in ascending order of the order field
+ * @GDATA_YOUTUBE_SORT_DESCENDING: sort results in descending order of the order field
+ *
+ * Sort orders for the search results from queries. They specify the order of the designated order field.
+ *
+ * Since: 0.3.0
+ **/
+typedef enum {
+ GDATA_YOUTUBE_SORT_NONE = 0,
+ GDATA_YOUTUBE_SORT_ASCENDING,
+ GDATA_YOUTUBE_SORT_DESCENDING
+} GDataYouTubeSortOrder;
+
+/**
+ * GDataYouTubeAge:
+ * @GDATA_YOUTUBE_AGE_ALL_TIME: retrieve all videos, regardless of the date they were uploaded
+ * @GDATA_YOUTUBE_AGE_TODAY: retrieve only videos uploaded in the past day
+ * @GDATA_YOUTUBE_AGE_THIS_WEEK: retrieve only videos uploaded in the past week
+ * @GDATA_YOUTUBE_AGE_THIS_MONTH: retrieve only videos uploaded in the past month
+ *
+ * Video ages, allowing queries to be limited to videos uploaded in a recent time period.
+ *
+ * Since: 0.3.0
+ **/
+typedef enum {
+ GDATA_YOUTUBE_AGE_ALL_TIME = 0,
+ GDATA_YOUTUBE_AGE_TODAY,
+ GDATA_YOUTUBE_AGE_THIS_WEEK,
+ GDATA_YOUTUBE_AGE_THIS_MONTH
+} GDataYouTubeAge;
+
+/**
+ * GDataYouTubeUploader:
+ * @GDATA_YOUTUBE_UPLOADER_ALL: retrieve all videos, regardless of who uploaded them
+ * @GDATA_YOUTUBE_UPLOADER_PARTNER: retrieve only videos uploaded by YouTube partners
+ *
+ * Video uploaders, allowing queries to be limited to returning videos uploaded by YouTube partners.
+ *
+ * Since: 0.3.0
+ **/
+typedef enum {
+ GDATA_YOUTUBE_UPLOADER_ALL = 0,
+ GDATA_YOUTUBE_UPLOADER_PARTNER
+} GDataYouTubeUploader;
+
+#define GDATA_TYPE_YOUTUBE_QUERY (gdata_youtube_query_get_type ())
+#define GDATA_YOUTUBE_QUERY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_YOUTUBE_QUERY, GDataYouTubeQuery))
+#define GDATA_YOUTUBE_QUERY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_YOUTUBE_QUERY, GDataYouTubeQueryClass))
+#define GDATA_IS_YOUTUBE_QUERY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_YOUTUBE_QUERY))
+#define GDATA_IS_YOUTUBE_QUERY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_YOUTUBE_QUERY))
+#define GDATA_YOUTUBE_QUERY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_YOUTUBE_QUERY, GDataYouTubeQueryClass))
+
+typedef struct _GDataYouTubeQueryPrivate GDataYouTubeQueryPrivate;
+
+/**
+ * GDataYouTubeQuery:
+ *
+ * All the fields in the #GDataYouTubeQuery structure are private and should never be accessed directly.
+ *
+ * Since: 0.3.0
+ **/
+typedef struct {
+ GDataQuery parent;
+ GDataYouTubeQueryPrivate *priv;
+} GDataYouTubeQuery;
+
+/**
+ * GDataYouTubeQueryClass:
+ *
+ * All the fields in the #GDataYouTubeQueryClass structure are private and should never be accessed directly.
+ *
+ * Since: 0.3.0
+ **/
+typedef struct {
+ /*< private >*/
+ GDataQueryClass parent;
+} GDataYouTubeQueryClass;
+
+GType gdata_youtube_query_get_type (void) G_GNUC_CONST;
+
+GDataYouTubeQuery *gdata_youtube_query_new (const gchar *q) G_GNUC_WARN_UNUSED_RESULT;
+
+GDataYouTubeFormat gdata_youtube_query_get_format (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_format (GDataYouTubeQuery *self, GDataYouTubeFormat format);
+void gdata_youtube_query_get_location (GDataYouTubeQuery *self, gdouble *latitude, gdouble *longitude, gdouble *radius, gboolean *has_location);
+void gdata_youtube_query_set_location (GDataYouTubeQuery *self, gdouble latitude, gdouble longitude, gdouble radius, gboolean has_location);
+const gchar *gdata_youtube_query_get_language (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_language (GDataYouTubeQuery *self, const gchar *language);
+const gchar *gdata_youtube_query_get_order_by (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_order_by (GDataYouTubeQuery *self, const gchar *order_by);
+const gchar *gdata_youtube_query_get_restriction (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_restriction (GDataYouTubeQuery *self, const gchar *restriction);
+GDataYouTubeSafeSearch gdata_youtube_query_get_safe_search (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_safe_search (GDataYouTubeQuery *self, GDataYouTubeSafeSearch safe_search);
+GDataYouTubeSortOrder gdata_youtube_query_get_sort_order (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_sort_order (GDataYouTubeQuery *self, GDataYouTubeSortOrder sort_order);
+GDataYouTubeAge gdata_youtube_query_get_age (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_age (GDataYouTubeQuery *self, GDataYouTubeAge age);
+GDataYouTubeUploader gdata_youtube_query_get_uploader (GDataYouTubeQuery *self);
+void gdata_youtube_query_set_uploader (GDataYouTubeQuery *self, GDataYouTubeUploader uploader);
+
+G_END_DECLS
+
+#endif /* !GDATA_YOUTUBE_QUERY_H */
diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c
index ddd648e..f41fa20 100644
--- a/gdata/tests/youtube.c
+++ b/gdata/tests/youtube.c
@@ -498,6 +498,85 @@ test_parsing_comments_feed_link (void)
g_object_unref (video);
}
+static void
+test_query_uri (void)
+{
+ gdouble latitude, longitude, radius;
+ gboolean has_location;
+ gchar *query_uri;
+ GDataYouTubeQuery *query = gdata_youtube_query_new ("q");
+
+ gdata_youtube_query_set_format (query, GDATA_YOUTUBE_FORMAT_RTSP_H263_AMR);
+ g_assert_cmpuint (gdata_youtube_query_get_format (query), ==, 1);
+
+ /* Location */
+ gdata_youtube_query_set_location (query, 45.01364, -97.12356, 112.5, TRUE);
+ gdata_youtube_query_get_location (query, &latitude, &longitude, &radius, &has_location);
+
+ g_assert_cmpfloat (latitude, ==, 45.01364);
+ g_assert_cmpfloat (longitude, ==, -97.12356);
+ g_assert_cmpfloat (radius, ==, 112.5);
+ g_assert (has_location == TRUE);
+
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&time=all_time&safeSearch=none&format=1&location=45.013640,-97.123560!&location-radius=112.500000m";);
+ g_free (query_uri);
+
+ gdata_youtube_query_set_location (query, G_MAXDOUBLE, 0.6672, 52.8, TRUE);
+
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&time=all_time&safeSearch=none&format=1&location=!";);
+ g_free (query_uri);
+
+ gdata_youtube_query_set_location (query, G_MAXDOUBLE, G_MAXDOUBLE, 0.0, FALSE);
+
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&time=all_time&safeSearch=none&format=1";);
+ g_free (query_uri);
+
+ /* Language */
+ gdata_youtube_query_set_language (query, "fr");
+ g_assert_cmpstr (gdata_youtube_query_get_language (query), ==, "fr");
+
+ gdata_youtube_query_set_order_by (query, "relevance_lang_fr");
+ g_assert_cmpstr (gdata_youtube_query_get_order_by (query), ==, "relevance_lang_fr");
+
+ gdata_youtube_query_set_restriction (query, "192.168.0.1");
+ g_assert_cmpstr (gdata_youtube_query_get_restriction (query), ==, "192.168.0.1");
+
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&time=all_time&safeSearch=none&format=1&lr=fr&orderby=relevance_lang_fr&restriction=192.168.0.1";);
+ g_free (query_uri);
+
+ gdata_youtube_query_set_safe_search (query, GDATA_YOUTUBE_SAFE_SEARCH_STRICT);
+ g_assert_cmpuint (gdata_youtube_query_get_safe_search (query), ==, GDATA_YOUTUBE_SAFE_SEARCH_STRICT);
+
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&time=all_time&safeSearch=strict&format=1&lr=fr&orderby=relevance_lang_fr&restriction=192.168.0.1";);
+ g_free (query_uri);
+
+ gdata_youtube_query_set_sort_order (query, GDATA_YOUTUBE_SORT_ASCENDING);
+ g_assert_cmpuint (gdata_youtube_query_get_sort_order (query), ==, GDATA_YOUTUBE_SORT_ASCENDING);
+
+ gdata_youtube_query_set_age (query, GDATA_YOUTUBE_AGE_THIS_WEEK);
+ g_assert_cmpuint (gdata_youtube_query_get_age (query), ==, GDATA_YOUTUBE_AGE_THIS_WEEK);
+
+ gdata_youtube_query_set_uploader (query, GDATA_YOUTUBE_UPLOADER_PARTNER);
+ g_assert_cmpuint (gdata_youtube_query_get_uploader (query), ==, GDATA_YOUTUBE_UPLOADER_PARTNER);
+
+ /* Check the built URI with a normal feed URI */
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&time=this_week&safeSearch=strict&format=1&lr=fr&orderby=relevance_lang_fr&restriction=192.168.0.1&sortorder=ascending&uploader=partner";);
+ g_free (query_uri);
+
+ /* â?¦and with a feed URI with pre-existing arguments */
+ query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com?foobar=shizzle";);
+ g_assert_cmpstr (query_uri, ==, "http://example.com?foobar=shizzle&q=q&time=this_week&safeSearch=strict&format=1&lr=fr&orderby=relevance_lang_fr&restriction=192.168.0.1&sortorder=ascending&uploader=partner";);
+ g_free (query_uri);
+
+ g_object_unref (query);
+}
+
int
main (int argc, char *argv[])
{
@@ -522,6 +601,7 @@ main (int argc, char *argv[])
g_test_add_func ("/youtube/parsing/app:control", test_parsing_app_control);
g_test_add_func ("/youtube/parsing/comments/feedLink", test_parsing_comments_feed_link);
g_test_add_func ("/youtube/parsing/yt:recorded", test_parsing_yt_recorded);
+ g_test_add_func ("/youtube/query/uri", test_query_uri);
retval = g_test_run ();
if (service != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
