rygel r568 - trunk/src/plugins/tracker

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sat Feb 14 15:23:16 2009
New Revision: 568
URL: http://svn.gnome.org/viewvc/rygel?rev=568&view=rev

Log:
Refactor: put initialization from metadata into a separate func.

Modified:
   trunk/src/plugins/tracker/rygel-tracker-image-item.vala
   trunk/src/plugins/tracker/rygel-tracker-item.vala
   trunk/src/plugins/tracker/rygel-tracker-music-item.vala
   trunk/src/plugins/tracker/rygel-tracker-video-item.vala

Modified: trunk/src/plugins/tracker/rygel-tracker-image-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-image-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-image-item.vala	Sat Feb 14 15:23:16 2009
@@ -49,7 +49,7 @@
         base (id, path, parent);
     }
 
-    public override void fetch_metadata () throws GLib.Error {
+    public override string[] fetch_metadata () throws GLib.Error {
         string[] keys = new string[Metadata.LAST_KEY];
         keys[Metadata.FILE_NAME] = "File:Name";
         keys[Metadata.MIME] = "File:Mime";
@@ -61,11 +61,12 @@
         keys[Metadata.ALBUM] = "Image:Album";
         keys[Metadata.IMAGE_DATE] = "Image:Date";
         keys[Metadata.DATE] = "DC:Date";
-        string[] values = null;
 
         /* TODO: make this async */
-        values = this.parent.metadata.Get (parent.category, path, keys);
+        return this.parent.metadata.Get (parent.category, path, keys);
+    }
 
+    protected override void init_from_metadata (string[] values) {
         if (values[Metadata.TITLE] != "")
             this.title = values[Metadata.TITLE];
         else

Modified: trunk/src/plugins/tracker/rygel-tracker-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-item.vala	Sat Feb 14 15:23:16 2009
@@ -40,7 +40,8 @@
         this.path = path;
         this.parent = parent;
 
-        this.fetch_metadata ();
+        var values = this.fetch_metadata ();
+        this.init_from_metadata (values);
     }
 
     protected string seconds_to_iso8601 (string seconds) {
@@ -60,6 +61,7 @@
         return date;
     }
 
-    protected abstract void fetch_metadata () throws GLib.Error;
+    protected abstract string[] fetch_metadata () throws GLib.Error;
+    protected abstract void init_from_metadata (string[] values);
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-music-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-music-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-music-item.vala	Sat Feb 14 15:23:16 2009
@@ -49,7 +49,7 @@
         base (id, path, parent);
     }
 
-    public override void fetch_metadata () throws GLib.Error {
+    public override string[] fetch_metadata () throws GLib.Error {
         string[] keys = new string[Metadata.LAST_KEY];
         keys[Metadata.FILE_NAME] = "File:Name";
         keys[Metadata.MIME] = "File:Mime";
@@ -61,11 +61,12 @@
         keys[Metadata.RELEASE] = "Audio:ReleaseDate";
         keys[Metadata.DATE_ADDED] = "Audio:DateAdded";
         keys[Metadata.DATE] = "DC:Date";
-        string[] values = null;
 
         /* TODO: make this async */
-        values = this.parent.metadata.Get (parent.category, path, keys);
+        return this.parent.metadata.Get (parent.category, path, keys);
+    }
 
+    protected override void init_from_metadata (string[] values) {
         if (values[Metadata.TITLE] != "")
             this.title = values[Metadata.TITLE];
         else

Modified: trunk/src/plugins/tracker/rygel-tracker-video-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-video-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-video-item.vala	Sat Feb 14 15:23:16 2009
@@ -47,7 +47,7 @@
         base (id, path, parent);
     }
 
-    public override void fetch_metadata () throws GLib.Error {
+    public override string[] fetch_metadata () throws GLib.Error {
         string[] keys = new string[Metadata.LAST_KEY];
         keys[Metadata.FILE_NAME] = "File:Name";
         keys[Metadata.MIME] = "File:Mime";
@@ -57,11 +57,13 @@
         keys[Metadata.WIDTH] = "Video:Width";
         keys[Metadata.HEIGHT] = "Video:Height";
         keys[Metadata.DATE] = "DC:Date";
-        string[] values = null;
 
         /* TODO: make this async */
-        values = this.parent.metadata.Get (parent.category, path, keys);
+        return this.parent.metadata.Get (parent.category, path, keys);
 
+    }
+
+    protected override void init_from_metadata (string[] values) {
         if (values[Metadata.TITLE] != "")
             this.title = values[Metadata.TITLE];
         else