[grilo-plugins/0.1.x] bookmarks: Save data in proper place



commit 53ca72b8f00812b540a8bbb129377c6f5e28e975
Author: AntÃa Puentes <apuentes igalia com>
Date:   Tue Apr 24 11:38:11 2012 +0200

    bookmarks: Save data in proper place
    
    Save the data files in the directory specified by the XDG
    Base Directory Specification. If previous data files exist
    in $HOME, move them to the new place.
    
    Partially fixes https://bugzilla.gnome.org/show_bug.cgi?id=641115

 src/media/bookmarks/grl-bookmarks.c |   41 +++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 9 deletions(-)
---
diff --git a/src/media/bookmarks/grl-bookmarks.c b/src/media/bookmarks/grl-bookmarks.c
index 482559c..e55e332 100644
--- a/src/media/bookmarks/grl-bookmarks.c
+++ b/src/media/bookmarks/grl-bookmarks.c
@@ -24,6 +24,8 @@
 #include "config.h"
 #endif
 
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <grilo.h>
 #include <sqlite3.h>
 #include <string.h>
@@ -45,7 +47,8 @@ GRL_LOG_DOMAIN_STATIC(bookmarks_log_domain);
 
 /* --- Database --- */
 
-#define GRL_SQL_DB        ".grl-bookmarks"
+#define GRL_SQL_OLD_DB   ".grl-bookmarks"
+#define GRL_SQL_DB       "grl-bookmarks.db"
 
 #define GRL_SQL_CREATE_TABLE_BOOKMARKS			 \
   "CREATE TABLE IF NOT EXISTS bookmarks ("		 \
@@ -242,21 +245,43 @@ static void
 grl_bookmarks_source_init (GrlBookmarksSource *source)
 {
   gint r;
-  const gchar *home;
+  gchar *path;
   gchar *db_path;
+  const gchar *home;
+  gchar *old_db_path;
   gchar *sql_error = NULL;
 
   source->priv = GRL_BOOKMARKS_GET_PRIVATE (source);
 
-  home = g_getenv ("HOME");
-  if (!home) {
-    GRL_WARNING ("$HOME not set, cannot open database");
-    return;
+  path = g_strconcat (g_get_user_data_dir (),
+                      G_DIR_SEPARATOR_S, "grilo-plugins",
+                      NULL);
+
+  if (!g_file_test (path, G_FILE_TEST_IS_DIR)) {
+    g_mkdir_with_parents (path, 0775);
+  }
+
+  db_path = g_strconcat (path, G_DIR_SEPARATOR_S, GRL_SQL_DB, NULL);
+  if (!g_file_test (db_path, G_FILE_TEST_EXISTS)) {
+    home = g_get_home_dir ();
+    if (home) {
+      old_db_path = g_strconcat (home, G_DIR_SEPARATOR_S, GRL_SQL_OLD_DB, NULL);
+      if (g_file_test (old_db_path, G_FILE_TEST_IS_REGULAR)) {
+        if (g_rename (old_db_path, db_path) == 0) {
+          GRL_DEBUG ("Database moved to the new location");
+        } else {
+          GRL_WARNING ("Failed to move the database to the new location");
+        }
+      }
+      g_free (old_db_path);
+    }
   }
 
   GRL_DEBUG ("Opening database connection...");
-  db_path = g_strconcat (home, G_DIR_SEPARATOR_S, GRL_SQL_DB, NULL);
   r = sqlite3_open (db_path, &source->priv->db);
+  g_free (path);
+  g_free (db_path);
+
   if (r) {
     g_critical ("Failed to open database '%s': %s",
 		db_path, sqlite3_errmsg (source->priv->db));
@@ -281,8 +306,6 @@ grl_bookmarks_source_init (GrlBookmarksSource *source)
     return;
   }
   GRL_DEBUG ("  OK");
-
-  g_free (db_path);
 }
 
 G_DEFINE_TYPE (GrlBookmarksSource, grl_bookmarks_source, GRL_TYPE_MEDIA_SOURCE);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]