From da8202522770e08199557ad4dd87be75462b9863 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 17 Jan 2019 16:24:43 +0900 Subject: [PATCH] Move check_item_exist plugin to media-common library Change-Id: I095aa6d5cb3aa6a65ca4c2ee4ae8aeda9622a842 Signed-off-by: Minje Ahn --- include/media-svc.h | 1 - plugin/media-content-plugin.c | 26 -------------------------- src/common/media-svc-media.c | 28 ---------------------------- src/common/media-svc.c | 5 ----- src/include/common/media-svc-media.h | 1 - 5 files changed, 61 deletions(-) diff --git a/include/media-svc.h b/include/media-svc.h index 6d3d065..fa578fe 100755 --- a/include/media-svc.h +++ b/include/media-svc.h @@ -52,7 +52,6 @@ int media_svc_delete_invalid_items_in_storage(sqlite3 *handle, const char *stora int media_svc_set_all_storage_items_validity(const char *storage_id, ms_user_storage_type_e storage_type, int validity, uid_t uid); int media_svc_set_folder_items_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid); int media_svc_refresh_item(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, uid_t uid); -int media_svc_get_file_info(sqlite3 *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size); int media_svc_send_dir_update_noti(sqlite3 *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid); int media_svc_check_db_upgrade(sqlite3 *handle, int user_version, uid_t uid); int media_svc_publish_noti(media_item_type_e update_item, media_item_update_type_e update_type, const char *path, media_type_e media_type, const char *uuid, const char *mime_type); diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c index 22a768e..f64203b 100755 --- a/plugin/media-content-plugin.c +++ b/plugin/media-content-plugin.c @@ -20,7 +20,6 @@ */ #include -#include #include #include #include "media-svc.h" @@ -32,31 +31,6 @@ int cleanup_db(sqlite3 *handle, uid_t uid) return MS_MEDIA_ERR_NONE; } -int check_item_exist(sqlite3 *handle, const char *storage_id, const char *file_path, bool *modified) -{ - int ret = MS_MEDIA_ERR_NONE; - *modified = TRUE; - - time_t modified_time = 0; - unsigned long long file_size = 0; - struct stat st; - - ret = media_svc_get_file_info(handle, storage_id, file_path, &modified_time, &file_size); - if (ret == MS_MEDIA_ERR_NONE) { - memset(&st, 0, sizeof(struct stat)); - if (stat(file_path, &st) == 0) { - if ((st.st_mtime != modified_time) || (st.st_size != file_size)) - *modified = TRUE; - else - *modified = FALSE; - } - - return ret; - } - - return ret; -} - int insert_item_begin(int item_cnt, int with_noti, int from_pid) { return media_svc_insert_item_begin(item_cnt, with_noti, from_pid); diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c index 5af6f9d..07c1b54 100755 --- a/src/common/media-svc-media.c +++ b/src/common/media-svc-media.c @@ -733,31 +733,3 @@ int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char return MS_MEDIA_ERR_NONE; } - -int _media_svc_get_fileinfo_by_path(sqlite3 *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size) -{ - int ret = MS_MEDIA_ERR_NONE; - sqlite3_stmt *sql_stmt = NULL; - char *sql = NULL; - - media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL"); - media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL"); - media_svc_retvm_if(modified_time == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "modified_time is NULL"); - media_svc_retvm_if(size == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "size is NULL"); - - sql = sqlite3_mprintf("SELECT modified_time, size FROM '%q' WHERE path='%q'", storage_id, path); - - ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); - - if (ret != MS_MEDIA_ERR_NONE) { - media_svc_error("error when _media_svc_get_fileinfo_by_path. err = [%d]", ret); - return ret; - } - - *modified_time = (int)sqlite3_column_int(sql_stmt, 0); - *size = (unsigned long long)sqlite3_column_int64(sql_stmt, 1); - - SQLITE3_FINALIZE(sql_stmt); - - return MS_MEDIA_ERR_NONE; -} diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 6bf0a89..277ecb0 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -163,11 +163,6 @@ ERROR: return ret; } -int media_svc_get_file_info(sqlite3 *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size) -{ - return _media_svc_get_fileinfo_by_path(handle, storage_id, path, modified_time, size); -} - int media_svc_check_item_exist_by_path(sqlite3 *handle, const char *storage_id, const char *path) { int ret = MS_MEDIA_ERR_NONE; diff --git a/src/include/common/media-svc-media.h b/src/include/common/media-svc-media.h index 023b117..dffcf03 100755 --- a/src/include/common/media-svc-media.h +++ b/src/include/common/media-svc-media.h @@ -43,7 +43,6 @@ int _media_svc_update_item_by_path(const char *org_storage_id, const char *src_p int _media_svc_list_query_do(media_svc_query_type_e query_type, uid_t uid); int _media_svc_update_thumbnail_path(const char *storage_id, const char *path, const char *thumb_path, uid_t uid); int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char *path, int update_item, media_svc_noti_item **item); -int _media_svc_get_fileinfo_by_path(sqlite3 *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size); int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info); int _media_svc_append_query_list(const char *query, uid_t uid); -- 2.7.4