From: Minje Ahn Date: Wed, 16 Jan 2019 08:39:17 +0000 (+0900) Subject: Add end flag for scanner-v2 X-Git-Tag: accepted/tizen/unified/20190116.160724^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad809cac245835af1e7acc61402e056c693d7588;p=platform%2Fcore%2Fmultimedia%2Fmedia-server.git Add end flag for scanner-v2 Change-Id: I1d900ce0e91d43d0d065f4ca475f8edcf1988a2c Signed-off-by: Minje Ahn --- diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h index d0015f2..9998c6d 100755 --- a/src/common/include/media-common-db-svc.h +++ b/src/common/include/media-common-db-svc.h @@ -98,7 +98,7 @@ typedef int (*UPDATE_ITEM_END)(uid_t); typedef int (*DELETE_INVALID_FOLDER_BY_PATH)(sqlite3 *, const char *, const char *, uid_t); typedef int (*CHECK_FOLDER_EXIST)(sqlite3*, const char*, const char*); typedef int (*GET_FOLDER_ID)(sqlite3 *, const char *, const char *, char *); -typedef int (*GET_EXTRACT_LIST)(sqlite3*, const char*, int, int, const char*, uid_t, void*); +typedef int (*GET_EXTRACT_LIST)(sqlite3*, const char*, int, int, const char*, int, uid_t, void*); typedef int (*UPDATE_ONE_EXTRACT_ITEM)(sqlite3*, const char*, int, void *); typedef int (*QUERY_DO_UPDATE_LIST)(sqlite3*); typedef int (*GET_MEDIA_TYPE)(const char *, int *); @@ -154,7 +154,7 @@ void ms_insert_folder_end(uid_t uid); void ms_update_start(); void ms_update_end(uid_t uid); -int ms_get_extract_list(sqlite3 *handle, const char* storage_id, int storage_type, int scan_type, const char* path, uid_t uid, void* array); +int ms_get_extract_list(sqlite3 *handle, const char* storage_id, int storage_type, int scan_type, const char* path, int is_end, uid_t uid, void* array); int ms_update_one_extract_item(sqlite3 *handle, const char* storage_id, int storage_type, void* data); int ms_query_do_update_list(sqlite3 *handle); diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c index e507c89..c7d4314 100755 --- a/src/common/media-common-db-svc.c +++ b/src/common/media-common-db-svc.c @@ -451,13 +451,13 @@ int ms_scan_item_batch(sqlite3 *handle, const char* storage_id, const char *path return ret; } -int ms_get_extract_list(sqlite3 *handle, const char* storage_id, int storage_type, int scan_type, const char* path, uid_t uid, void* array) +int ms_get_extract_list(sqlite3 *handle, const char* storage_id, int storage_type, int scan_type, const char* path, int is_end, uid_t uid, void* array) { int lib_index; int ret = MS_MEDIA_ERR_NONE; for (lib_index = 0; lib_index < lib_num; lib_index++) { - ret = ((GET_EXTRACT_LIST)func_array[lib_index][eGET_EXTRACT_LIST])(handle, storage_id, storage_type, scan_type, path, uid, array); /*dlopen*/ + ret = ((GET_EXTRACT_LIST)func_array[lib_index][eGET_EXTRACT_LIST])(handle, storage_id, storage_type, scan_type, path, is_end, uid, array); /*dlopen*/ MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Error : %s", g_array_index(so_array, char*, lib_index)); } diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c index 5f8bfdc..a39fbee 100755 --- a/src/scanner-v2/media-scanner-extract-v2.c +++ b/src/scanner-v2/media-scanner-extract-v2.c @@ -121,7 +121,7 @@ int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int stora int extract_count = 0; int sleep_count = 0; - ret = ms_get_extract_list(handle, storage_id, storage_type, scan_type, path, uid, (void*)&data_array); + ret = ms_get_extract_list(handle, storage_id, storage_type, scan_type, path, is_end, uid, (void*)&data_array); if (ret != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("ms_get_extract_list failed!!!"); return MS_MEDIA_ERR_NONE;