[grilo-plugins] metadata-store: Save data in proper place
- From: SimÃn Pena <spenap src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] metadata-store: Save data in proper place
- Date: Thu, 23 Feb 2012 18:15:30 +0000 (UTC)
commit ac711fd20c6edbd9e9f143d255b1eed94b636f3a
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Wed Dec 14 10:46:36 2011 +0000
metadata-store: Save data in proper place
Do not save data files in $HOME, but in XDG proper place.
Partially fixes https://bugzilla.gnome.org/show_bug.cgi?id=641115
Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>
src/metadata/metadata-store/grl-metadata-store.c | 25 +++++++++++++--------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/src/metadata/metadata-store/grl-metadata-store.c b/src/metadata/metadata-store/grl-metadata-store.c
index cdee214..2b6b3bf 100644
--- a/src/metadata/metadata-store/grl-metadata-store.c
+++ b/src/metadata/metadata-store/grl-metadata-store.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>
@@ -44,7 +46,7 @@ GRL_LOG_DOMAIN_STATIC(metadata_store_log_domain);
#define SOURCE_NAME "Metadata Store"
#define SOURCE_DESC "A plugin for storing extra metadata information"
-#define GRL_SQL_DB ".grl-metadata-store"
+#define GRL_SQL_DB "grl-metadata-store.db"
#define GRL_SQL_CREATE_TABLE_STORE \
"CREATE TABLE IF NOT EXISTS store (" \
@@ -157,24 +159,29 @@ static void
grl_metadata_store_source_init (GrlMetadataStoreSource *source)
{
gint r;
- const gchar *home;
+ gchar *path;
gchar *db_path;
gchar *sql_error = NULL;
source->priv = GRL_METADATA_STORE_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);
}
GRL_DEBUG ("Opening database connection...");
- db_path = g_strconcat (home, G_DIR_SEPARATOR_S, GRL_SQL_DB, NULL);
+ db_path = g_strconcat (path, 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));
+ db_path, sqlite3_errmsg (source->priv->db));
sqlite3_close (source->priv->db);
return;
}
@@ -196,8 +203,6 @@ grl_metadata_store_source_init (GrlMetadataStoreSource *source)
return;
}
GRL_DEBUG (" OK");
-
- g_free (db_path);
}
G_DEFINE_TYPE (GrlMetadataStoreSource, grl_metadata_store_source,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]