Add uid parameter for ms_update_one_extract_item()

Change-Id: I728286e1375eded690fb6703f3f16778f8506ca1

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 9d68074..0ea7b84 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.5.5
+Version:    0.5.6
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 84758f5..0f603b7 100644 (file)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -69,7 +69,7 @@ int ms_set_storage_scan_status(sqlite3 *handle, const char *storage_id, media_sc
 int ms_genarate_uuid(char **uuid);
 int ms_scan_item_batch(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_get_extract_list(sqlite3 *handle, const char *storage_id, int scan_type, const char* path, int is_end, void *array);
-int ms_update_one_extract_item(sqlite3 *handle, const char *storage_id, void *data);
+int ms_update_one_extract_item(sqlite3 *handle, const char *storage_id, void *data, uid_t uid);
 int ms_delete_invalid_items_in_folder(sqlite3 *handle, const char *storage_id, const char *path, bool is_recursive, uid_t uid);
 int ms_delete_invalid_folder_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path, uid_t uid);
 int ms_get_folder_scan_status(sqlite3 *handle, const char *storage_id, const char *path, int *scan_status);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index dfee86d..d9470c2 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -60,7 +60,7 @@ typedef int (*GET_UUID)(char **);
 typedef int (*SET_STORAGE_SCAN_STATUS)(sqlite3 *, const char *, int, uid_t);
 typedef int (*INSERT_ITEM_SCAN)(sqlite3 *, const char *, const char *, uid_t);
 typedef int (*GET_EXTRACT_LIST)(sqlite3 *, const char*, int, const char *, int, void*);
-typedef int (*UPDATE_ONE_EXTRACT_ITEM)(sqlite3 *, const char *, void *);
+typedef int (*UPDATE_ONE_EXTRACT_ITEM)(sqlite3 *, const char *, void *, uid_t);
 typedef int (*DELETE_ALL_INVALID_ITEMS_IN_FOLDER)(sqlite3 *, const char *, const char *, bool, uid_t);
 typedef int (*DELETE_INVALID_FOLDER_BY_PATH)(sqlite3 *, const char *, const char *, uid_t);
 typedef int (*GET_FOLDER_SCAN_STATUS)(sqlite3 *, const char *, const char *, int *);
@@ -712,11 +712,11 @@ int ms_get_extract_list(sqlite3 *handle, const char* storage_id, int scan_type,
        return ret;
 }
 
-int ms_update_one_extract_item(sqlite3 *handle, const char* storage_id, void *data)
+int ms_update_one_extract_item(sqlite3 *handle, const char* storage_id, void *data, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       ret = ((UPDATE_ONE_EXTRACT_ITEM)func_array[eUPDATE_ONE_EXTRACT_ITEM])(handle, storage_id, data);
+       ret = ((UPDATE_ONE_EXTRACT_ITEM)func_array[eUPDATE_ONE_EXTRACT_ITEM])(handle, storage_id, data, uid);
        MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "UPDATE_ONE_EXTRACT_ITEM failed [%d]", ret);
 
        return ret;

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 6828825..8768cda 100644 (file)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -95,7 +95,7 @@ void msc_deinit_extract_thread(void)
        g_cond_clear(&extract_data_cond);
 }
 
-static int __msc_folder_bulk_extract(sqlite3 *handle, const char *storage_id, const char *path, int scan_type, int pid, bool is_end)
+static int __msc_folder_bulk_extract(sqlite3 *handle, const char *storage_id, const char *path, int scan_type, int pid, bool is_end, uid_t uid)
 {
        MS_DBG_WARN("begin of __msc_folder_bulk_extract");
        int ret = MS_MEDIA_ERR_NONE;
@@ -120,7 +120,7 @@ static int __msc_folder_bulk_extract(sqlite3 *handle, const char *storage_id, co
                g_array_remove_index(data_array, 0);
 
                g_mutex_lock(&decode_mutex);
-               ms_update_one_extract_item(handle, storage_id, db_data);
+               ms_update_one_extract_item(handle, storage_id, db_data, uid);
                g_mutex_unlock(&decode_mutex);
 
                if (db_data) {
@@ -216,7 +216,7 @@ gpointer msc_folder_extract_thread(gpointer data)
                        goto NEXT;
                }
 
-               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, extract_data->msg, extract_data->msg_type, extract_data->pid, end_flag);
+               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, extract_data->msg, extract_data->msg_type, extract_data->pid, end_flag, extract_data->uid);
 
 NEXT:
                g_directory_extract_processing = false;
@@ -347,7 +347,7 @@ gpointer msc_storage_extract_thread(gpointer data)
                }
 
                /*extract meta*/
-               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, extract_data->msg, extract_data->msg_type, extract_data->pid, end_flag);
+               ret = __msc_folder_bulk_extract(handle, extract_data->storage_id, extract_data->msg, extract_data->msg_type, extract_data->pid, end_flag, extract_data->uid);
                MS_DBG_WARN("extract PAUSE");
                __msc_pause_extract();
                MS_DBG_WARN("extract RESUME");