From: Jens Georg <mail@jensge.org>
Date: Fri, 26 Jun 2009 22:13:29 +0000 (+0200)
Subject: core,media-export: MediaDB name is just a name
X-Git-Tag: RYGEL_0_4~130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2735a39824429287dd6813cd82ef9de1d767481e;p=profile%2Fivi%2Frygel.git

core,media-export: MediaDB name is just a name

MediaDB will decide about the file name itself, normally

user_cache_dir/prgname/name.db
---

diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala
index d3d404a..51e8c5c 100644
--- a/src/plugins/media-export/rygel-media-export-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-root-container.vala
@@ -61,12 +61,7 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer {
      * Create a new root container.
      */
     public MediaExportRootContainer () {
-        var media_db_path = Path.build_filename (
-                                            Environment.get_user_cache_dir (),
-                                            Environment.get_prgname (),
-                                            "media-export.db");
-        debug("Using media database %s", media_db_path);
-        var db = new MediaDB(media_db_path);
+        var db = new MediaDB("media-export");
         base (db, "0", "MediaExportRoot");
 
         this.extractor = new MetadataExtractor ();
diff --git a/src/rygel/rygel-media-db.vala b/src/rygel/rygel-media-db.vala
index b154d35..6f589ba 100644
--- a/src/rygel/rygel-media-db.vala
+++ b/src/rygel/rygel-media-db.vala
@@ -124,9 +124,12 @@ public class Rygel.MediaDB : Object {
     "SELECT COUNT(upnp_id) FROM Object WHERE Object.upnp_id = ?";
 
     private void open_db (string name) {
-        var dirname = Path.get_dirname (name);
+        var dirname = Path.build_filename (Environment.get_user_cache_dir (),
+                                           Environment.get_prgname ());
         DirUtils.create_with_parents (dirname, 0750);
-        var rc = Database.open (name, out this.db);
+        var db_file = Path.build_filename (dirname, "%s.db".printf (name));
+        debug ("Using database file %s", db_file);
+        var rc = Database.open (db_file, out this.db);
         if (rc != Sqlite.OK) {
             warning ("Failed to open database: %d, %s",
                      rc,