rygel r50 - in trunk: . src
- From: zeeshanak svn gnome org
- To: svn-commits-list gnome org
- Subject: rygel r50 - in trunk: . src
- Date: Tue, 28 Oct 2008 20:59:09 +0000 (UTC)
Author: zeeshanak
Date: Tue Oct 28 20:59:08 2008
New Revision: 50
URL: http://svn.gnome.org/viewvc/rygel?rev=50&view=rev
Log:
Re-write MediaTracker in Vala.
Doesn't really work. Thanks to dbus-glib bindings for Vala and tracker API.
Added:
trunk/src/gupnp-media-tracker.vala
Removed:
trunk/src/gupnp-media-tracker.c
trunk/src/gupnp-media-tracker.h
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/src/Makefile.am
trunk/src/gupnp-content-directory.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Oct 28 20:59:08 2008
@@ -39,6 +39,14 @@
true,
[AC_MSG_ERROR("Unable to find Vala bindings for gupnp-1.0")])
+AC_CHECK_FILE("${VAPIDIR}/gupnp-av-1.0.vapi",
+ true,
+ [AC_MSG_ERROR("Unable to find Vala bindings for gupnp-av-1.0")])
+
+AC_CHECK_FILE("${VAPIDIR}/dbus-glib-1.vapi",
+ true,
+ [AC_MSG_ERROR("Unable to find Vala bindings for dbus-glib-1")])
+
# glib-genmarshal
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Oct 28 20:59:08 2008
@@ -23,10 +23,11 @@
gupnp-media-receiver-registrar.c \
gupnp-media-receiver-registrar.vala \
gupnp-media-tracker.h \
- gupnp-media-tracker.c
+ gupnp-media-tracker.c \
+ gupnp-media-tracker.vala
gupnp-media-server.stamp: $(filter %.vala,$(gupnp_media_server_SOURCES))
- $(VALAC) -C --pkg gupnp-1.0 $^
+ $(VALAC) -C --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 $^
touch $@
gupnp_media_server_LDADD = $(LIBGUPNP_LIBS) \
Modified: trunk/src/gupnp-content-directory.c
==============================================================================
--- trunk/src/gupnp-content-directory.c (original)
+++ trunk/src/gupnp-content-directory.c Tue Oct 28 20:59:08 2008
@@ -214,7 +214,7 @@
goto OUT;
}
- if (update_id == GUPNP_INVALID_UPDATE_ID)
+ if (update_id == G_MAXUINT32)
update_id = content_dir->priv->system_update_id;
/* Set action return arguments */
Added: trunk/src/gupnp-media-tracker.vala
==============================================================================
--- (empty file)
+++ trunk/src/gupnp-media-tracker.vala Tue Oct 28 20:59:08 2008
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2008 Zeeshan Ali <zeenix gmail com>.
+ *
+ * Author: Zeeshan Ali <zeenix gmail com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ */
+
+using GLib;
+using GUPnP;
+using DBus;
+
+private class Tracker.Container {
+ public string id;
+ public string title;
+ public string tracker_category;
+
+ /* UPnP class of items under this container */
+ public string child_class;
+
+ public Container (string id,
+ string title,
+ string tracker_category,
+ string child_class) {
+ this.id = id;
+ this.title = title;
+ this.tracker_category = tracker_category;
+ this.child_class = child_class;
+ }
+}
+
+public class GUPnP.MediaTracker : GLib.Object {
+ /* class-wide constants */
+ public static const string tracker_service = "org.freedesktop.Tracker";
+ public static const string tracker_path = "/org/freedesktop/tracker";
+ public static const string tracker_iface = "org.freedesktop.Tracker";
+ public static const string files_iface = "org.freedesktop.Tracker.Files";
+ public static const string metadata_iface =
+ "org.freedesktop.Tracker.Metadata";
+
+ public static const int max_requested_count = 128;
+
+ public static const string image_class = "object.item.imageItem";
+ public static const string video_class = "object.item.videoItem";
+ public static const string music_class = "object.item.audioItem.musicTrack";
+
+ /* FIXME: Make this a static if you know how to initize it */
+ private List<Tracker.Container> containers;
+
+ private dynamic DBus.Object metadata;
+ private dynamic DBus.Object files;
+ private dynamic DBus.Object tracker;
+
+ private DIDLLiteWriter didl_writer;
+ private SearchCriteriaParser search_parser;
+
+ /* Properties */
+ public string root_id { get; construct; }
+ public GUPnP.Context context { get; construct; }
+
+ construct {
+ this.containers = new List<Tracker.Container> ();
+ this.containers.append
+ (new Tracker.Container ("16",
+ "All Images",
+ "Images",
+ MediaTracker.image_class));
+ this.containers.append
+ (new Tracker.Container ("14",
+ "All Music",
+ "Music",
+ MediaTracker.music_class));
+ this.containers.append
+ (new Tracker.Container ("15",
+ "All Videos",
+ "Videos",
+ MediaTracker.video_class));
+
+ this.didl_writer = new DIDLLiteWriter ();
+ this.search_parser = new SearchCriteriaParser ();
+
+ DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
+
+ this.metadata = connection.get_object (MediaTracker.tracker_service,
+ MediaTracker.tracker_path,
+ MediaTracker.metadata_iface);
+ this.files = connection.get_object (MediaTracker.tracker_service,
+ MediaTracker.tracker_path,
+ MediaTracker.files_iface);
+ this.tracker = connection.get_object (MediaTracker.tracker_service,
+ MediaTracker.tracker_path,
+ MediaTracker.tracker_iface);
+
+ weak string home_dir = Environment.get_home_dir ();
+
+ /* Host the home dir of the user */
+ this.context.host_path (home_dir, home_dir);
+ }
+
+ /* Pubic methods */
+ public MediaTracker (string root_id,
+ GUPnP.Context context) {
+ this.root_id = root_id;
+ this.context = context;
+ }
+
+ public string? browse (string container_id,
+ string filter,
+ int starting_index,
+ int requested_count,
+ string sort_criteria,
+ out uint number_returned,
+ out uint total_matches,
+ out uint update_id) {
+ string didl;
+
+ /* Start DIDL-Lite fragment */
+ this.didl_writer.start_didl_lite (null, null, true);
+
+ if (container_id == this.root_id) {
+ number_returned = this.add_root_container_children ();
+ total_matches = number_returned;
+ } else {
+ Tracker.Container container;
+
+ if (requested_count == 0)
+ requested_count = max_requested_count;
+
+ container = this.find_container_by_id (container_id);
+ if (container == null)
+ number_returned = 0;
+ else {
+ number_returned =
+ this.add_container_children_from_db (container,
+ starting_index,
+ requested_count,
+ out total_matches);
+ }
+ }
+
+ if (number_returned > 0) {
+ /* End DIDL-Lite fragment */
+ this.didl_writer.end_didl_lite ();
+
+ /* Retrieve generated string */
+ didl = this.didl_writer.get_string ();
+
+ update_id = uint32.MAX;
+ } else
+ didl = null;
+
+ /* Reset the parser state */
+ this.didl_writer.reset ();
+
+ return didl;
+ }
+
+ public string get_metadata (string object_id,
+ string filter,
+ string sort_criteria,
+ out uint update_id) {
+ string didl;
+ bool found;
+
+ /* Start DIDL-Lite fragment */
+ this.didl_writer.start_didl_lite (null, null, true);
+ found = false;
+ if (object_id == this.root_id) {
+ add_root_container ();
+
+ found = true;
+ } else {
+ Tracker.Container container;
+
+ /* First try containers */
+ container = find_container_by_id (object_id);
+
+ if (container != null) {
+ add_container_from_db (container, this.root_id);
+
+ found = true;
+ } else {
+ /* Now try items */
+ container = get_item_parent (object_id);
+
+ if (container != null)
+ found = add_item_from_db (container, object_id);
+ }
+ }
+
+ if (found) {
+ /* End DIDL-Lite fragment */
+ this.didl_writer.end_didl_lite ();
+
+ /* Retrieve generated string */
+ didl = this.didl_writer.get_string ();
+ } else
+ didl = null;
+
+ /* Reset the parser state */
+ this.didl_writer.reset ();
+
+ update_id = uint32.MAX;
+
+ return didl;
+ }
+
+ /* Private methods */
+ private uint add_root_container_children () {
+ foreach (Tracker.Container container in this.containers)
+ this.add_container_from_db (container, this.root_id);
+
+ return this.containers.length ();
+ }
+
+ private void add_container_from_db (Tracker.Container container,
+ string parent_id) {
+ uint child_count;
+
+ child_count = get_container_children_count (container);
+
+ this.add_container (container.id,
+ parent_id,
+ container.title,
+ child_count);
+ }
+
+ private void add_container (string id,
+ string parent_id,
+ string title,
+ uint child_count) {
+ this.didl_writer.start_container (id,
+ parent_id,
+ (int) child_count,
+ false,
+ false);
+
+ this.didl_writer.add_string ("class",
+ DIDLLiteWriter.NAMESPACE_UPNP,
+ null,
+ "object.container.storageFolder");
+
+ this.didl_writer.add_string ("title",
+ DIDLLiteWriter.NAMESPACE_DC,
+ null,
+ title);
+
+ /* End of Container */
+ this.didl_writer.end_container ();
+ }
+
+ private uint get_container_children_count (Tracker.Container container) {
+ /*string[][] array = null;
+ GLib.Error error;
+
+ if (!this.tracker.call ("GetStats",
+ out error,
+ Type.INVALID,
+ typeof (string[][]), out array,
+ Type.INVALID)) {
+ critical ("error getting file list: %s", error.message);
+
+ return 0;
+ }
+
+ uint count = 0;
+ for (uint i = 0; i < array.length; i++) {
+ string[] stats = array[i];
+
+ if (stats[0] == container.tracker_category)
+ count = stats[1].to_int ();
+ }
+
+ return count;*/
+ return 1;
+ }
+
+ private Tracker.Container? find_container_by_id (string container_id) {
+ Tracker.Container container;
+
+ container = null;
+
+ foreach (Tracker.Container tmp in this.containers)
+ if (container_id == tmp.id) {
+ container = tmp;
+
+ break;
+ }
+
+ return container;
+ }
+
+ private uint add_container_children_from_db
+ (Tracker.Container container,
+ uint offset,
+ uint max_count,
+ out uint child_count) {
+ string[] children;
+
+ children = this.get_container_children_from_db (container,
+ offset,
+ max_count,
+ out child_count);
+ if (children == null)
+ return 0;
+
+ /* Iterate through all items */
+ for (uint i = 0; i < children.length; i++)
+ this.add_item_from_db (container, children[i]);
+
+ return children.length;
+ }
+
+ private string[]? get_container_children_from_db
+ (Tracker.Container container,
+ uint offset,
+ uint max_count,
+ out uint child_count) {
+ string[] children = null;
+ GLib.Error error;
+
+ child_count = get_container_children_count (container);
+
+ if (!this.files.call ("GetByServiceType",
+ out error,
+ typeof (int), 0,
+ typeof (string), container.tracker_category,
+ typeof (int), offset,
+ typeof (int), max_count,
+ Type.INVALID,
+ typeof (string[]), out children,
+ Type.INVALID))
+ critical ("error getting file list: %s", error.message);
+
+ return children;
+ }
+
+ private bool add_item_from_db (Tracker.Container parent,
+ string path) {
+ string[] keys = new string[] {"File:Name",
+ "File:Mime",
+ null,
+ null};
+ if (parent.child_class == video_class) {
+ keys[2] = "Video:Width";
+ keys[3] = "Video:Height";
+ } else if (parent.child_class == image_class) {
+ keys[2] = "Image:Width";
+ keys[3] = "Image:Height";
+ }
+
+ string[] values = null;
+ GLib.Error error;
+
+ /* TODO: make this async */
+ if (!this.metadata.call ("Get ",
+ out error,
+ typeof (string), parent.tracker_category,
+ typeof (string), path,
+ typeof (string[]), keys,
+ Type.INVALID,
+ typeof (string[]), out values,
+ Type.INVALID)) {
+ critical ("failed to get metadata for %s: %s\n",
+ path,
+ error.message);
+
+ return false;
+ }
+
+ int width = -1;
+ int height = -1;
+
+ if (keys[2] != null && values[2] != null)
+ width = values[2].to_int ();
+
+ if (keys[3] != null && values[3] != null)
+ height = values[3].to_int ();
+
+ this.add_item (path,
+ parent.id,
+ values[1],
+ values[0],
+ parent.child_class,
+ width,
+ height,
+ path);
+
+ return true;
+ }
+
+ private void add_item (string id,
+ string parent_id,
+ string mime,
+ string title,
+ string upnp_class,
+ int width,
+ int height,
+ string path) {
+ this.didl_writer.start_item (id,
+ parent_id,
+ null,
+ false);
+
+ /* Add fields */
+ this.didl_writer.add_string ("title",
+ DIDLLiteWriter.NAMESPACE_DC,
+ null,
+ title);
+
+ this.didl_writer.add_string ("class",
+ DIDLLiteWriter.NAMESPACE_UPNP,
+ null,
+ upnp_class);
+
+ this.didl_writer.add_string ("album",
+ DIDLLiteWriter.NAMESPACE_UPNP,
+ null,
+ "Some album");
+
+ /* Add resource data */
+ DIDLLiteResource res;
+
+ /* URI */
+ string escaped_path = Uri.escape_string (path, "/", true);
+ string uri = "http://%s:%d%s".printf (context.host_ip,
+ context.port,
+ escaped_path);
+
+ res.reset ();
+
+ res.uri = uri;
+
+ /* Protocol info */
+ res.protocol = "http-get";
+ res.mime_type = mime;
+ res.dlna_profile = "MP3"; /* FIXME */
+
+ res.width = width;
+ res.height = height;
+
+ this.didl_writer.add_res (res);
+
+ /* End of item */
+ this.didl_writer.end_item ();
+ }
+
+ private void add_root_container () {
+ add_container (this.root_id,
+ "-1",
+ this.root_id,
+ this.containers.length ());
+ }
+
+ private Tracker.Container? get_item_parent (string uri) {
+ Tracker.Container container = null;
+ char *category = null;
+ GLib.Error error;
+
+ if (!this.files.call ("GetServiceType",
+ out error,
+ typeof (string), uri,
+ Type.INVALID,
+ typeof (string), out category,
+ Type.INVALID)) {
+ critical ("failed to find service type for %s: %s",
+ uri,
+ error.message);
+ } else {
+ foreach (Tracker.Container tmp in this.containers) {
+ if (tmp.tracker_category == category) {
+ container = tmp;
+
+ break;
+ }
+ }
+ }
+
+ return container;
+ }
+}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
