Add uid value when USB scanning

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

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 81c9f3b..f187874 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    File manager service server.
-Version:    0.2.62
+Version:    0.2.63
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/include/media-server-socket.h b/src/server/include/media-server-socket.h
index 0c04c9d..69af500 100755 (executable)
--- a/src/server/include/media-server-socket.h
+++ b/src/server/include/media-server-socket.h
@@ -33,6 +33,6 @@ int ms_send_scan_request(ms_comm_msg_s *send_msg, int client_sock);
 int ms_send_storage_scan_request(const char *root_path, const char *storage_id, ms_dir_scan_type_t scan_type, uid_t uid);
 gboolean ms_receive_message_from_scanner(GIOChannel *src, GIOCondition condition, gpointer data);
 int ms_remove_request_owner(int pid, const char *req_path);
-int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid, ms_dir_scan_type_t scan_type);
+int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid, ms_dir_scan_type_t scan_type, uid_t uid);
 
 #endif /*_MEDIA_SERVER_SOCKET_H_*/

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index 472676c..daae85f 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -108,7 +108,7 @@ int ms_usb_insert_handler(const char *mount_path)
                }
 
                /* request to update media db */
-               ms_send_storage_otg_scan_request(mount_path, storage_id, scan_type);
+               ms_send_storage_otg_scan_request(mount_path, storage_id, scan_type, uid);
        }
 
 ERROR:
@@ -148,7 +148,7 @@ int ms_usb_remove_handler(const char *mount_path)
 
                        if (strlen(device_id) == (MS_UUID_SIZE-1)) {
                                ms_set_storage_validity(handle, device_id, 0, uid);
-                               ms_send_storage_otg_scan_request(mount_path, device_id, MS_SCAN_INVALID);
+                               ms_send_storage_otg_scan_request(mount_path, device_id, MS_SCAN_INVALID, uid);
                        } else {
                                MS_DBG_ERR("Device ID is INVALID");
                                break;

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 0dc6e04..3c7e3e1 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -157,7 +157,9 @@ void _ms_change_lang_vconf_cb(keynode_t *key, void* data)
        }
 
        if (need_update == TRUE) {
-               ms_send_storage_scan_request(NULL, INTERNAL_STORAGE_ID, MS_SCAN_META, 0);       /*FIX ME*/
+               uid_t uid  = 0;
+               ms_sys_get_uid(&uid);
+               ms_send_storage_scan_request(NULL, INTERNAL_STORAGE_ID, MS_SCAN_META, uid);
        } else {
                MS_DBG_WARN("language is changed but do not update meta data");
        }
@@ -354,7 +356,10 @@ static void __ms_add_signal_handler(void)
 
 static void __ms_check_mediadb(void)
 {
-       ms_send_storage_scan_request(MEDIA_ROOT_PATH_INTERNAL, INTERNAL_STORAGE_ID, MS_SCAN_PART, 0);
+       uid_t uid = 0;
+
+       ms_sys_get_uid(&uid);
+       ms_send_storage_scan_request(MEDIA_ROOT_PATH_INTERNAL, INTERNAL_STORAGE_ID, MS_SCAN_PART, uid);
 
        /* update external storage */
        __ms_check_mmc_status();

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 92909da..903254c 100755 (executable)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -355,6 +355,12 @@ int ms_send_scan_request(ms_comm_msg_s *send_msg, int client_sock)
 int ms_send_storage_scan_request(const char *root_path, const char *storage_id, ms_dir_scan_type_t scan_type, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
+
+       if (uid == 0) {
+               MS_DBG_ERR("Invalid UID");
+               return MS_MEDIA_ERR_INVALID_PARAMETER;
+       }
+
        ms_comm_msg_s scan_msg = {
                .msg_type = MS_MSG_STORAGE_INVALID,
                .pid = 0, /* pid 0 means media-server */
@@ -395,10 +401,6 @@ int ms_send_storage_scan_request(const char *root_path, const char *storage_id,
                strncpy(scan_msg.storage_id, storage_id, MS_UUID_SIZE-1);
        }
 
-       if (uid == 0) {
-               ms_sys_get_uid(&uid);
-       }
-
        scan_msg.uid = uid;
 
        ret = ms_send_scan_request(&scan_msg, -1);
@@ -739,7 +741,7 @@ int ms_remove_request_owner(int pid, const char *req_path)
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid, ms_dir_scan_type_t scan_type)
+int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid, ms_dir_scan_type_t scan_type, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
@@ -753,9 +755,15 @@ int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid,
                return MS_MEDIA_ERR_INVALID_PARAMETER;
        }
 
+       if (uid == 0) {
+               MS_DBG_ERR("Invalid UID");
+               return MS_MEDIA_ERR_INVALID_PARAMETER;
+       }
+
        ms_comm_msg_s scan_msg = {
                .msg_type = MS_MSG_STORAGE_INVALID,
                .pid = 0, /* pid 0 means media-server */
+               .uid = 0,
                .result = -1,
                .msg_size = 0,
                .storage_id = {0},
@@ -785,6 +793,8 @@ int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid,
        strncpy(scan_msg.msg, path, scan_msg.msg_size);
        strncpy(scan_msg.storage_id, device_uuid, MS_UUID_SIZE-1);
 
+       scan_msg.uid = uid;
+
        ret = ms_send_scan_request(&scan_msg, -1);
 
 ERROR: