[ACR-1308] Remove deprecated APIs

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

diff --git a/lib/include/media-server-ipc.h b/lib/include/media-server-ipc.h
index cd52b79..d71f37f 100755 (executable)
--- a/lib/include/media-server-ipc.h
+++ b/lib/include/media-server-ipc.h
@@ -52,7 +52,6 @@ typedef enum {
        MS_MSG_DB_UPDATE_BATCH_END,             /**< End of media DB update batch */
        MS_MSG_DIRECTORY_SCANNING,                      /**< Non recursive Directory Scan and Media DB Update*/
        MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE,/**< Recursive Directory Scan and Media DB Update*/
-       MS_MSG_BURSTSHOT_INSERT,
        MS_MSG_BULK_INSERT,                                     /**< Request bulk insert */
        MS_MSG_STORAGE_ALL,
        MS_MSG_STORAGE_PARTIAL,

diff --git a/lib/include/media-util-register.h b/lib/include/media-util-register.h
index 448a214..8c63b18 100755 (executable)
--- a/lib/include/media-util-register.h
+++ b/lib/include/media-util-register.h
@@ -54,8 +54,6 @@ int media_directory_scanning_cancel(const char *directory_path, uid_t uid);
 
 int media_files_register(const char *list_path, insert_complete_cb user_callback, void *user_data, uid_t uid);
 
-int media_burstshot_register(const char *list_path, insert_complete_cb user_callback, void *user_data, uid_t uid);
-
 /**
 * @}
 */

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index b1db008..d2a5d97 100755 (executable)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -483,15 +483,3 @@ int media_files_register(const char *list_path, insert_complete_cb user_callback
 
        return ret;
 }
-
-int media_burstshot_register(const char *list_path, insert_complete_cb user_callback, void *user_data, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       ret = __media_db_request_update_async(MS_MSG_BURSTSHOT_INSERT, NULL, list_path, user_callback, user_data, uid);
-
-       MSAPI_DBG("client receive: %d", ret);
-
-       return ret;
-}
-

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 23615fd..6ca490b 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -63,7 +63,6 @@ typedef int (*SET_ITEM_VALIDITY_END)(void*, uid_t, char **);
 typedef int (*SEND_DIR_UPDATE_NOTI)(void *, const char *, const char *, const char *, int, int, char **);
 typedef int (*CHECK_ITEM_EXIST)(void*, const char *, const char *, bool *, char **);
 typedef int (*INSERT_ITEM)(void *, const char *, const char *, int, uid_t, char **);
-typedef int (*INSERT_BURST_ITEM)(void *, const char *, const char *, int, uid_t, char **);
 typedef int (*SET_ALL_STORAGE_ITEMS_VALIDITY)(void *, const char *, int, int, uid_t, char **);
 typedef int (*SET_FOLDER_ITEM_VALIDITY)(void *, const char *, const char *, int, int, uid_t, char**);
 typedef int (*SET_ITEM_VALIDITY)(void *, const char *, const char *, int, int, uid_t, char **);
@@ -101,8 +100,8 @@ typedef int (*UPDATE_ITEM_END)(void *, uid_t, char **);
 typedef int (*DELETE_INVALID_FOLDER_BY_PATH)(void *, const char *, const char *, uid_t, char **);
 typedef int (*CHECK_FOLDER_EXIST)(void*, const char*, const char*, char **);
 typedef int (*GET_FOLDER_ID)(void *, const char *, const char *, char *, char **);
-typedef int (*GET_EXTRACT_LIST)(void*, const char*, int, int, const char*, int, uid_t, void*, char**);
-typedef int (*UPDATE_ONE_EXTRACT_ITEM)(void*, const char*, int, void*, int, char**);
+typedef int (*GET_EXTRACT_LIST)(void*, const char*, int, int, const char*, uid_t, void*, char**);
+typedef int (*UPDATE_ONE_EXTRACT_ITEM)(void*, const char*, int, void*, char**);
 typedef int (*QUERY_DO_UPDATE_LIST)(void*, char**);
 typedef int (*GET_MEDIA_TYPE)(void *, const char *, int *, char **);
 
@@ -113,7 +112,6 @@ int ms_disconnect_db(void ***handle);
 int ms_cleanup_db(void **handle, uid_t uid);
 int ms_validate_item(void **handle, const char *storage_id, const char *path, uid_t uid);
 int ms_insert_item_batch(void **handle, const char *storage_id, const char *path, uid_t uid);
-int ms_insert_burst_item(void **handle, const char *storage_id, const char *path, uid_t uid);
 int ms_validaty_change_all_items(void **handle, const char *storage_id, ms_user_storage_type_e storage_type, bool validity, uid_t uid);
 bool ms_delete_invalid_items(void **handle, const char *storage_id, ms_user_storage_type_e storage_type, uid_t uid);
 int ms_set_folder_item_validity(void **handle, const char *storage_id, const char *path, int validity, int recursive, uid_t uid);
@@ -158,8 +156,8 @@ void ms_insert_folder_end(void **handle, uid_t uid);
 void ms_update_start(void **handle);
 void ms_update_end(void **handle, uid_t uid);
 
-int ms_get_extract_list(void** handle, const char* storage_id, int storage_type, int scan_type, const char* path, int burst, uid_t uid, void* array);
-int ms_update_one_extract_item(void** handle, const char* storage_id, int storage_type, void* data, int burst);
+int ms_get_extract_list(void** handle, const char* storage_id, int storage_type, int scan_type, const char* path, uid_t uid, void* array);
+int ms_update_one_extract_item(void** handle, const char* storage_id, int storage_type, void* data);
 int ms_query_do_update_list(void** handle);
 
 void ms_bacth_commit_enable(void* handle, bool ins_status, bool valid_status, bool noti_enable, int pid);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index d95b9f8..c837865 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -55,7 +55,6 @@ enum func_list {
        eSET_VALIDITY,
        eDELETE_INVALID_ITEMS,
        eSET_FOLDER_ITEM_VALIDITY,
-       eINSERT_BURST,
        eDELETE_FOLDER,
        eSEND_DIR_UPDATE_NOTI,
        eDELETE_ITEM,
@@ -163,7 +162,6 @@ int ms_load_functions(void)
                "set_item_validity",
                "delete_all_invalid_items_in_storage",
                "set_folder_item_validity",
-               "insert_burst_item",
                "delete_all_invalid_items_in_folder",
                "send_dir_update_noti",
                "delete_item",
@@ -545,7 +543,7 @@ int ms_scan_item_batch(void **handle, const char* storage_id, const char *path,
        return res;
 }
 
-int ms_get_extract_list(void** handle, const char* storage_id, int storage_type, int scan_type, const char* path, int burst, uid_t uid, void* array)
+int ms_get_extract_list(void** handle, const char* storage_id, int storage_type, int scan_type, const char* path, uid_t uid, void* array)
 {
        int lib_index;
        int res = MS_MEDIA_ERR_NONE;
@@ -553,7 +551,7 @@ int ms_get_extract_list(void** handle, const char* storage_id, int storage_type,
        char *err_msg = NULL;
 
        for (lib_index = 0; lib_index < lib_num; lib_index++) {
-               ret = ((GET_EXTRACT_LIST)func_array[lib_index][eGET_EXTRACT_LIST])(handle[lib_index], storage_id, storage_type, scan_type, path, burst, uid, array, &err_msg); /*dlopen*/
+               ret = ((GET_EXTRACT_LIST)func_array[lib_index][eGET_EXTRACT_LIST])(handle[lib_index], storage_id, storage_type, scan_type, path, uid, array, &err_msg); /*dlopen*/
                if (ret != 0) {
                        MS_DBG_ERR("error : %s [%s] %s", g_array_index(so_array, char*, lib_index), err_msg, path);
                        MS_SAFE_FREE(err_msg);
@@ -564,7 +562,7 @@ int ms_get_extract_list(void** handle, const char* storage_id, int storage_type,
        return res;
 }
 
-int ms_update_one_extract_item(void** handle, const char* storage_id, int storage_type, void* data, int burst)
+int ms_update_one_extract_item(void** handle, const char* storage_id, int storage_type, void* data)
 {
        int lib_index;
        int res = MS_MEDIA_ERR_NONE;
@@ -572,7 +570,7 @@ int ms_update_one_extract_item(void** handle, const char* storage_id, int storag
        char *err_msg = NULL;
 
        for (lib_index = 0; lib_index < lib_num; lib_index++) {
-               ret = ((UPDATE_ONE_EXTRACT_ITEM)func_array[lib_index][eUPDATE_ONE_EXTRACT_ITEM])(handle[lib_index], storage_id, storage_type, data, burst, &err_msg); /*dlopen*/
+               ret = ((UPDATE_ONE_EXTRACT_ITEM)func_array[lib_index][eUPDATE_ONE_EXTRACT_ITEM])(handle[lib_index], storage_id, storage_type, data, &err_msg); /*dlopen*/
                if (ret != 0) {
                        MS_DBG_ERR("error : %s [%s]", g_array_index(so_array, char*, lib_index), err_msg);
                        MS_SAFE_FREE(err_msg);
@@ -605,29 +603,6 @@ int ms_query_do_update_list(void** handle)
        return res;
 }
 
-int ms_insert_burst_item(void **handle, const char *storage_id, const char *path , uid_t uid)
-{
-       int lib_index;
-       int res = MS_MEDIA_ERR_NONE;
-       int ret = MS_MEDIA_ERR_NONE;
-       char *err_msg = NULL;
-       ms_user_storage_type_e storage_type;
-
-       ret = ms_user_get_storage_type(uid, path, &storage_type);
-       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get storage type");
-
-       for (lib_index = 0; lib_index < lib_num; lib_index++) {
-               ret = ((INSERT_BURST_ITEM)func_array[lib_index][eINSERT_BURST])(handle[lib_index], storage_id, path, storage_type, uid, &err_msg); /*dlopen*/
-               if (ret != 0) {
-                       MS_DBG_ERR("error : %s [%s] %s", g_array_index(so_array, char*, lib_index), err_msg, path);
-                       MS_SAFE_FREE(err_msg);
-                       res = MS_MEDIA_ERR_DB_INSERT_FAIL;
-               }
-       }
-
-       return res;
-}
-
 bool ms_delete_invalid_items(void **handle, const char *storage_id, ms_user_storage_type_e storage_type, uid_t uid)
 {
        int lib_index;

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 08521a8..cdb77ad 100755 (executable)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -73,7 +73,7 @@ typedef struct {
        char *path;
 } ms_item_info_s;
 
-static int __msc_folder_bulk_extract(void **handle, const char* storage_id, int storage_type, const char *path, int scan_type, int burst, int pid, uid_t uid, unsigned int *io_err_count, bool is_end);
+static int __msc_folder_bulk_extract(void **handle, const char* storage_id, int storage_type, const char *path, int scan_type, int pid, uid_t uid, unsigned int *io_err_count, bool is_end);
 
 int msc_init_extract_thread()
 {
@@ -107,7 +107,7 @@ int msc_deinit_extract_thread()
        return MS_MEDIA_ERR_NONE;
 }
 
-int __msc_folder_bulk_extract(void **handle, const char* storage_id, int storage_type, const char *path, int scan_type, int burst, int pid, uid_t uid, unsigned int *io_err_count, bool is_end)
+int __msc_folder_bulk_extract(void **handle, const char* storage_id, int storage_type, const char *path, int scan_type, int pid, uid_t uid, unsigned int *io_err_count, bool is_end)
 {
        MS_DBG_WARN("begin of __msc_folder_bulk_extract");
        int ret = MS_MEDIA_ERR_NONE;
@@ -117,7 +117,7 @@ int __msc_folder_bulk_extract(void **handle, const char* storage_id, int storage
        int extract_count = 0;
        int sleep_count = 0;
 
-       ret = ms_get_extract_list(handle, storage_id, storage_type, scan_type, path, burst, uid, (void*)&data_array);
+       ret = ms_get_extract_list(handle, storage_id, storage_type, scan_type, path, uid, (void*)&data_array);
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("ms_get_extract_list failed!!!");
                return MS_MEDIA_ERR_NONE;
@@ -141,7 +141,7 @@ int __msc_folder_bulk_extract(void **handle, const char* storage_id, int storage
                db_data = g_array_index(data_array, ms_item_info_s*, 0);
                g_array_remove_index(data_array, 0);
 
-               tmp_ret = ms_update_one_extract_item(handle, storage_id, storage_type, db_data, burst);
+               tmp_ret = ms_update_one_extract_item(handle, storage_id, storage_type, db_data);
                if (tmp_ret == MS_MEDIA_ERR_NONE)
                        extract_count++;
                else if (tmp_ret == MS_MEDIA_ERR_FILE_IO)
@@ -268,7 +268,7 @@ gboolean msc_folder_extract_thread(void *data)
                        goto NEXT;
                }
 
-               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, end_flag, extract_data->pid, uid, &io_err_count, end_flag);
+               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, extract_data->pid, uid, &io_err_count, end_flag);
 
 NEXT:
                g_directory_extract_processing = false;
@@ -420,7 +420,7 @@ gboolean msc_storage_extract_thread(void *data)
                }
 
                /*extract meta*/
-               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, end_flag, extract_data->pid, uid, &io_err_count, end_flag);
+               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, storage_type, update_path, scan_type, extract_data->pid, uid, &io_err_count, end_flag);
                MS_DBG_WARN("extract PAUSE");
                __msc_pause_extract();
                MS_DBG_WARN("extract RESUME");

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index ab50665..e07ddb9 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -92,7 +92,7 @@ struct linux_dirent {
 static int __msc_check_stop_status(int scan_type, const char *start_path, int pid);
 static int __msc_db_update(void **handle, const char *storage_id, const ms_comm_msg_s * scan_data);
 static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid);
-static int __msc_batch_insert(ms_msg_type_e current_msg, int pid, GArray *path_array, uid_t uid);
+static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid);
 static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **register_data);
 static int __msc_clear_file_list(GArray *path_array);
 static void __msc_insert_register_request(GArray *register_array, ms_comm_msg_s *insert_data);
@@ -1516,8 +1516,6 @@ static void __msc_insert_register_request(GArray *register_array, ms_comm_msg_s
 
        if (insert_data->pid == POWEROFF)
                g_array_prepend_val(register_array, insert_data);
-       else if (insert_data->msg_type == MS_MSG_BURSTSHOT_INSERT)
-               g_array_prepend_val(register_array, insert_data);
        else
                g_array_append_val(register_array, insert_data);
 
@@ -1600,18 +1598,15 @@ FREE_RESOURCE:
        return res;
 }
 
-static int __msc_batch_insert(ms_msg_type_e current_msg, int pid, GArray *path_array, uid_t uid)
+static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
 {
        int err;
        unsigned int i;
        void **handle = NULL;
        char *insert_path = NULL;
-       int (*insert_function)(void **, const char*, const char*, uid_t) = NULL;
        char storage_id[MS_UUID_SIZE] = {0,};
        bool power_off_status = FALSE;
 
-       insert_function = (current_msg == MS_MSG_BULK_INSERT) ? ms_insert_item_batch : ms_insert_burst_item;
-
        /* connect to media db, if conneting is failed, db updating is stopped */
        err = ms_connect_db(&handle, uid);
        if (err != MS_MEDIA_ERR_NONE)
@@ -1636,7 +1631,7 @@ static int __msc_batch_insert(ms_msg_type_e current_msg, int pid, GArray *path_a
                }
 
                /* insert to db */
-               err = insert_function(handle, storage_id, insert_path, uid);
+               err = ms_insert_item_batch(handle, storage_id, insert_path, uid);
 
                msc_get_power_status(&power_off_status);
                if (power_off_status) {
@@ -1700,7 +1695,6 @@ gboolean msc_register_thread(void *data)
        char *file_path = NULL;
        int ret;
        int pid = 0;
-       ms_msg_type_e current_msg = MS_MSG_MAX;
        uid_t uid = MEDIA_DEFAULT_UID;
        ms_comm_msg_s *msg_data = NULL;
 
@@ -1728,12 +1722,10 @@ gboolean msc_register_thread(void *data)
                }
 
                /* check current request */
-               current_msg = register_data->msg_type;
                pid = register_data->pid;
                uid = register_data->uid;
 
-               if ((current_msg != MS_MSG_BULK_INSERT) &&
-                       (current_msg != MS_MSG_BURSTSHOT_INSERT)) {
+               if (register_data->msg_type != MS_MSG_BULK_INSERT) {
                        MS_DBG_ERR("wrong message type");
                        goto FREE_RESOURCE;
                }
@@ -1750,7 +1742,7 @@ gboolean msc_register_thread(void *data)
                        goto FREE_RESOURCE;
                }
 
-               ret = __msc_batch_insert(current_msg, pid, path_array, uid);
+               ret = __msc_batch_insert(pid, path_array, uid);
 
 FREE_RESOURCE:
                /*Active flush */

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 6df8184..76b4d54 100755 (executable)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -180,7 +180,6 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
 
        switch (req_num) {
        case MS_MSG_BULK_INSERT:
-       case MS_MSG_BURSTSHOT_INSERT:
                {
                        MS_DBG_INFO("BULK INSERT");
                        /* request bulk insert*/

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 3d8838d..f23a3a8 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -481,8 +481,6 @@ static void __msc_insert_register_request(GArray *register_array, ms_comm_msg_s
 
        if (insert_data->pid == POWEROFF)
                g_array_prepend_val(register_array, insert_data);
-       else if (insert_data->msg_type == MS_MSG_BURSTSHOT_INSERT)
-               g_array_prepend_val(register_array, insert_data);
        else
                g_array_append_val(register_array, insert_data);
 }
@@ -563,17 +561,14 @@ FREE_RESOURCE:
        return ret;
 }
 
-static int __msc_batch_insert(ms_msg_type_e current_msg, int pid, GArray *path_array, uid_t uid)
+static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
 {
        int err;
        unsigned int i;
        void **handle = NULL;
        char *insert_path = NULL;
-       int (*insert_function)(void **, const char*, const char*, uid_t) = NULL;
        char storage_id[MS_UUID_SIZE] = {0,};
 
-       insert_function = (current_msg == MS_MSG_BULK_INSERT) ? ms_insert_item_batch : ms_insert_burst_item;
-
        /* connect to media db, if conneting is failed, db updating is stopped */
        err = ms_connect_db(&handle, uid);
        if (err != MS_MEDIA_ERR_NONE)
@@ -597,7 +592,7 @@ static int __msc_batch_insert(ms_msg_type_e current_msg, int pid, GArray *path_a
                }
 
                /* insert to db */
-               err = insert_function(handle, storage_id, insert_path, uid);
+               err = ms_insert_item_batch(handle, storage_id, insert_path, uid);
 
                if (power_off) {
                        MS_DBG_ERR("power off");
@@ -661,7 +656,6 @@ gboolean msc_register_thread(void *data)
        char *file_path = NULL;
        int ret = MS_MEDIA_ERR_NONE;
        int pid = 0;
-       ms_msg_type_e current_msg = MS_MSG_MAX;
        ms_comm_msg_s *msg_data = NULL;
 
        /*create array for processing overlay data*/
@@ -688,11 +682,9 @@ gboolean msc_register_thread(void *data)
                }
 
                /* check current request */
-               current_msg = register_data->msg_type;
                pid = register_data->pid;
 
-               if ((current_msg != MS_MSG_BULK_INSERT) &&
-                       (current_msg != MS_MSG_BURSTSHOT_INSERT)) {
+               if (register_data->msg_type != MS_MSG_BULK_INSERT) {
                        MS_DBG_ERR("wrong message type");
                        goto FREE_RESOURCE;
                }
@@ -709,7 +701,7 @@ gboolean msc_register_thread(void *data)
                        goto FREE_RESOURCE;
                }
 
-               ret = __msc_batch_insert(current_msg, pid, path_array, register_data->uid);
+               ret = __msc_batch_insert(pid, path_array, register_data->uid);
 
 FREE_RESOURCE:
                /*Active flush */

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index 3f77bb0..94ab035 100755 (executable)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -79,7 +79,6 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
 
        switch (req_num) {
        case MS_MSG_BULK_INSERT:
-       case MS_MSG_BURSTSHOT_INSERT:
                {
                        MS_DBG_INFO("BULK INSERT");
                        /* request bulk insert*/

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 345f430..75f6165 100755 (executable)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -339,7 +339,6 @@ gboolean ms_read_socket(gpointer user_data)
        if (req_num == MS_MSG_DIRECTORY_SCANNING
                || req_num == MS_MSG_BULK_INSERT
                || req_num == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE
-               || req_num == MS_MSG_BURSTSHOT_INSERT
                || req_num == MS_MSG_DIRECTORY_SCANNING_CANCEL) {
                if ((ret = ms_send_scan_request(&recv_msg, client_sock)) != MS_MEDIA_ERR_NONE) {
                        res = ret;
@@ -374,7 +373,6 @@ ERROR:
                        res_msg.msg_type = MS_MSG_SCANNER_RESULT;
                        break;
                case MS_MSG_BULK_INSERT:
-               case MS_MSG_BURSTSHOT_INSERT:
                        res_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT;
                        break;
                case MS_MSG_MEDIA_DB_MALFORMED: