Add media db open options

Change-Id: Ifc7b831873683d8c5bae2faecb2d52e7a53322ef
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/capi-media-controller.manifest b/capi-media-controller.manifest
index c00c25b815125046729bb1c45b1fe0dd17429162..b1ebd131cd335cf52111386e319d13ca9b766218 100755 (executable)
--- a/capi-media-controller.manifest
+++ b/capi-media-controller.manifest
@@ -2,4 +2,7 @@
         <request>
                 <domain name="_" />
         </request>
+        <assign>
+                <filesystem path="/usr/bin/media-controller_create_db.sh" exec_label="System" />
+        </assign>
 </manifest>

diff --git a/include/media_controller_db.h b/include/media_controller_db.h
index 1bdb9560a82240097f0978790bca9903b8378bb6..67d3be5cbc432c399d2c249b1fd7165505beee5b 100755 (executable)
--- a/include/media_controller_db.h
+++ b/include/media_controller_db.h
@@ -59,7 +59,7 @@
 #define SQLITE3_SAFE_FREE(sql_string)  {if(sql_string) { sqlite3_free(sql_string); sql_string = NULL;}}
 #define SQLITE3_FINALIZE(x)    {if(x != NULL) {sqlite3_finalize(x);}}
 
-int mc_db_connect(void **db_handle);
+int mc_db_connect(void **db_handle, bool needWrite);
 int mc_db_disconnect(void *db_handle);
 int mc_db_create_tables(void *handle);
 int mc_db_create_server_table(void *handle, const char *server_name);

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index a263c1c45a5c8c30331e3792f3bcfcfe7fb2621a..b875441774cd65396f4a00d2492ca8d8304178f7 100755 (executable)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -174,7 +174,7 @@ static int __mc_client_create(media_controller_client_s **mc_client)
                goto Error;
        }
 
-       ret = mc_db_connect(&_client->db_handle);
+       ret = mc_db_connect(&_client->db_handle, false);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                mc_error("error in connecting to DB %d", ret);
                goto Error;

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index 09b8d976e75f85a7b991d40ae1fc3d91c783278c..b71923a5ac4671cc124184bd6c0ff378020a35e0 100755 (executable)
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -177,7 +177,7 @@ static int __mc_db_get_ulong_value_of_key(void *handle, const char *server_name,
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
-int mc_db_connect(void **handle)
+int mc_db_connect(void **handle, bool needWrite)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        sqlite3 *db_handle = NULL;
@@ -187,7 +187,11 @@ int mc_db_connect(void **handle)
        mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
        /*Connect DB*/
-       ret = db_util_open(tzplatform_mkpath(TZ_USER_DB, MC_DB_NAME), &db_handle, DB_UTIL_REGISTER_HOOK_METHOD);
+       if(needWrite) {
+               ret = db_util_open_with_options(tzplatform_mkpath(TZ_USER_DB, MC_DB_NAME), &db_handle, SQLITE_OPEN_READWRITE, NULL);
+       } else {
+               ret = db_util_open_with_options(tzplatform_mkpath(TZ_USER_DB, MC_DB_NAME), &db_handle, SQLITE_OPEN_READONLY, NULL);
+       }
        if (SQLITE_OK != ret) {
                mc_error("error when db open");
                *handle = NULL;

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index bb1346aff031df78703a452a25d5e72636fbf04a..baefc59d13a6921a9bee5b3e9a915153f750a14e 100755 (executable)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -46,7 +46,7 @@ static int __mc_server_create(media_controller_server_s **mc_server)
                goto ERROR;
        }
 
-       ret = mc_db_connect(&(_server->db_handle));
+       ret = mc_db_connect(&(_server->db_handle), false);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
                mc_error("fail mc_db_connect [%d]", ret);
                goto ERROR;

diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 2e1eb7f657c88195e4f2d0f583a76e804dcf3102..4da7dd33c27569e1cb38fe67534467b4e094abf7 100755 (executable)
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -93,7 +93,7 @@ static char* __mc_get_db_name(uid_t uid)
        return result_psswd_rtn;
 }
 
-int mc_db_util_connect(void **handle, uid_t uid)
+int mc_db_util_connect(void **handle, uid_t uid, bool needWrite)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        sqlite3 *db_handle = NULL;
@@ -101,7 +101,11 @@ int mc_db_util_connect(void **handle, uid_t uid)
        mc_retvm_if(handle == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
 
        /*Connect DB*/
-       ret = db_util_open(__mc_get_db_name(uid), &db_handle, DB_UTIL_REGISTER_HOOK_METHOD);
+       if(needWrite) {
+               ret = db_util_open_with_options(__mc_get_db_name(uid), &db_handle, SQLITE_OPEN_READWRITE, NULL);
+       } else {
+               ret = db_util_open_with_options(__mc_get_db_name(uid), &db_handle, SQLITE_OPEN_READONLY, NULL);
+       }
        if (SQLITE_OK != ret) {
                mc_error("error when db open");
                *handle = NULL;

diff --git a/svc/media_controller_db_util.h b/svc/media_controller_db_util.h
index 4f602fb1d6860875e1491885b9d41debe6f7be32..6a7e4216b33aabf06d52d055178c570f7e239417 100755 (executable)
--- a/svc/media_controller_db_util.h
+++ b/svc/media_controller_db_util.h
@@ -26,7 +26,7 @@
 #define SQLITE3_SAFE_FREE(sql_string)  {if(sql_string) { sqlite3_free(sql_string); sql_string = NULL;}}
 #define SQLITE3_FINALIZE(x)    {if(x != NULL) {sqlite3_finalize(x);}}
 
-int mc_db_util_connect(void **handle, uid_t uid);
+int mc_db_util_connect(void **handle, uid_t uid, bool needWrite);
 int mc_db_util_update_db(void *handle, const char *sql_str);
 int mc_db_util_disconnect(void *handle);
 

diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index 79bbee873e7905b7e144a3da7d2faaaff70a708d..4b999cb79681ac95c1b982db28a302f2d6d00aac 100755 (executable)
--- a/svc/media_controller_svc.c
+++ b/svc/media_controller_svc.c
@@ -93,7 +93,7 @@ gboolean _mc_read_service_request_tcp_socket(GIOChannel *src, GIOCondition condi
 
        if (recv_msg.msg_type == MC_MSG_DB_UPDATE) {
                /* Connect media controller DB*/
-               if(mc_db_util_connect(&(mc_svc_data->db_handle), recv_msg.uid) != MEDIA_CONTROLLER_ERROR_NONE) {
+               if(mc_db_util_connect(&(mc_svc_data->db_handle), recv_msg.uid, true) != MEDIA_CONTROLLER_ERROR_NONE) {
                        mc_error("Failed to connect DB");
                        goto ERROR;
                }