rygel r578 - trunk/src/plugins/tracker

[zeeshanak svn gnome org]

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

Log:
Refactor fetch_item* implementations.

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

Modified: trunk/src/plugins/tracker/rygel-tracker-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-container.vala	Sat Feb 14 15:26:05 2009
@@ -225,7 +225,10 @@
             return null;
         }
 
-        return this.fetch_item_by_path (path, null);
+        string[] keys = this.get_metadata_keys ();
+        string[] metadata = this.metadata.Get (this.category, path, keys);
+
+        return this.fetch_item_by_path (path, metadata);
     }
 
     /**
@@ -263,8 +266,8 @@
     }
 
     protected abstract string[] get_metadata_keys ();
-    protected abstract MediaItem? fetch_item_by_path (string    path,
-                                                      string[]? metadata)
+    protected abstract MediaItem? fetch_item_by_path (string   path,
+                                                      string[] metadata)
                                                       throws GLib.Error;
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-image-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-image-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-image-container.vala	Sat Feb 14 15:26:05 2009
@@ -37,24 +37,13 @@
         return TrackerImageItem.get_metadata_keys ();
     }
 
-    protected override MediaItem? fetch_item_by_path (string    path,
-                                                      string[]? metadata)
+    protected override MediaItem? fetch_item_by_path (string   path,
+                                                      string[] metadata)
                                                       throws GLib.Error {
-        string[] keys = this.get_metadata_keys ();
-        string[] item_metadata;
-
-        /* TODO: make this async */
-        if (metadata == null) {
-                // No metadata provided, we need to fetch it ourselves
-                item_metadata = this.metadata.Get (this.category, path, keys);
-        } else {
-                item_metadata = metadata;
-        }
-
         return new TrackerImageItem (this.id + ":" + path,
                                      path,
                                      this,
-                                     item_metadata);
+                                     metadata);
     }
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-music-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-music-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-music-container.vala	Sat Feb 14 15:26:05 2009
@@ -37,24 +37,13 @@
         return TrackerMusicItem.get_metadata_keys ();
     }
 
-    protected override MediaItem? fetch_item_by_path (string    path,
-                                                      string[]? metadata)
+    protected override MediaItem? fetch_item_by_path (string   path,
+                                                      string[] metadata)
                                                       throws GLib.Error {
-        string[] keys = this.get_metadata_keys ();
-        string[] item_metadata;
-
-        /* TODO: make this async */
-        if (metadata == null) {
-                // No metadata provided, we need to fetch it ourselves
-                item_metadata = this.metadata.Get (this.category, path, keys);
-        } else {
-                item_metadata = metadata;
-        }
-
         return new TrackerMusicItem (this.id + ":" + path,
                                      path,
                                      this,
-                                     item_metadata);
+                                     metadata);
     }
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-video-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-video-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-video-container.vala	Sat Feb 14 15:26:05 2009
@@ -37,24 +37,13 @@
         return TrackerVideoItem.get_metadata_keys ();
     }
 
-    protected override MediaItem? fetch_item_by_path (string    path,
-                                                      string[]? metadata)
+    protected override MediaItem? fetch_item_by_path (string   path,
+                                                      string[] metadata)
                                                       throws GLib.Error {
-        string[] keys = this.get_metadata_keys ();
-        string[] item_metadata;
-
-        /* TODO: make this async */
-        if (metadata == null) {
-                // No metadata provided, we need to fetch it ourselves
-                item_metadata = this.metadata.Get (this.category, path, keys);
-        } else {
-                item_metadata = metadata;
-        }
-
         return new TrackerVideoItem (this.id + ":" + path,
                                      path,
                                      this,
-                                     item_metadata);
+                                     metadata);
     }
 }