From 02a6ae364a856eca23ac4da0a8ed2b926ec12c4b Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Fri, 21 Apr 2017 15:55:46 +0900 Subject: [PATCH] Remove unused code Remove code related cloud storage Change-Id: I1ecc917bc597c9305311ef1cc7359372d03377e3 Signed-off-by: Minje Ahn --- include/media-svc-types.h | 1 - src/common/media-svc-media-folder.c | 5 +-- src/common/media-svc-storage.c | 2 +- src/common/media-svc-util.c | 53 ++++++++++------------ src/common/media-svc.c | 89 +++++++++---------------------------- 5 files changed, 48 insertions(+), 102 deletions(-) diff --git a/include/media-svc-types.h b/include/media-svc-types.h index 42df946..1970d16 100755 --- a/include/media-svc-types.h +++ b/include/media-svc-types.h @@ -35,7 +35,6 @@ typedef enum { MEDIA_SVC_STORAGE_INTERNAL = 0, /**< The device's internal storage */ MEDIA_SVC_STORAGE_EXTERNAL = 1, /**< The device's external storage like sd card*/ MEDIA_SVC_STORAGE_EXTERNAL_USB = 2, /**< The external USB storage (Since 2.4) */ - MEDIA_SVC_STORAGE_CLOUD = 100, /**< The Cloud storage (Since 2.4) */ MEDIA_SVC_STORAGE_MAX, /**< Invalid storage*/ } media_svc_storage_type_e; diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c index 4d4a06f..15d1528 100755 --- a/src/common/media-svc-media-folder.c +++ b/src/common/media-svc-media-folder.c @@ -64,8 +64,7 @@ static int __media_svc_is_root_path(const char *folder_path, bool *is_root, uid_ media_svc_debug("ROOT PATH [%s]", folder_path); *is_root = TRUE; - } else if ((STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && strcmp(folder_path, MEDIA_ROOT_PATH_CLOUD) == 0) || - (STRING_VALID(MEDIA_ROOT_PATH_DISC) && strcmp(folder_path, MEDIA_ROOT_PATH_DISC) == 0)) { + } else if (STRING_VALID(MEDIA_ROOT_PATH_DISC) && strcmp(folder_path, MEDIA_ROOT_PATH_DISC) == 0) { media_svc_debug("ROOT PATH [%s]", folder_path); *is_root = TRUE; } @@ -256,8 +255,6 @@ static int __media_svc_get_and_append_parent_folder(sqlite3 *handle, const char next_pos = strlen(internal_path); else if (STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && strncmp(path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0) next_pos = strlen(MEDIA_ROOT_PATH_SDCARD); - else if (STRING_VALID(MEDIA_ROOT_PATH_CLOUD) && (strncmp(path, MEDIA_ROOT_PATH_CLOUD, strlen(MEDIA_ROOT_PATH_CLOUD)) == 0)) - next_pos = strlen(MEDIA_ROOT_PATH_CLOUD); else if (STRING_VALID(MEDIA_ROOT_PATH_EXTERNAL) && strncmp(path, MEDIA_ROOT_PATH_EXTERNAL, strlen(MEDIA_ROOT_PATH_EXTERNAL)) == 0) next_pos = strlen(MEDIA_ROOT_PATH_EXTERNAL); else if (STRING_VALID(MEDIA_ROOT_PATH_DISC) && strncmp(path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0) diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c index f9965da..3b3fd19 100755 --- a/src/common/media-svc-storage.c +++ b/src/common/media-svc-storage.c @@ -208,7 +208,7 @@ int _media_svc_update_storage_validity(const char *storage_id, int validity, uid char *sql = NULL; if (storage_id == NULL) - sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_uuid != 'media' AND storage_type != %d;", MEDIA_SVC_DB_TABLE_STORAGE, validity, MEDIA_SVC_STORAGE_CLOUD); + sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_uuid != 'media';", MEDIA_SVC_DB_TABLE_STORAGE, validity); else sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, validity, storage_id); diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index 204f459..b2e6afb 100755 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -1178,17 +1178,14 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char ret = __media_svc_malloc_and_strncpy(&content_info->path, path); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - if (storage_type != MEDIA_SVC_STORAGE_CLOUD) { - struct stat st; - memset(&st, 0, sizeof(struct stat)); - if (stat(path, &st) == 0) { - content_info->modified_time = st.st_mtime; - content_info->timeline = content_info->modified_time; - content_info->size = st.st_size; - /* media_svc_debug("Modified time : [%d] Size : [%lld]", content_info->modified_time, content_info->size); */ - } else { - media_svc_stderror("stat failed"); - } + struct stat st; + memset(&st, 0, sizeof(struct stat)); + if (stat(path, &st) == 0) { + content_info->modified_time = st.st_mtime; + content_info->timeline = content_info->modified_time; + content_info->size = st.st_size; + } else { + media_svc_stderror("stat failed"); } _media_svc_set_default_value(content_info, refresh); @@ -1219,30 +1216,28 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char SAFE_FREE(file_name); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - if (storage_type != MEDIA_SVC_STORAGE_CLOUD) { - /* if the file is DRM file, drm_type value is DRM_TRUE(1). - if drm_contentinfo is not NULL, the file is OMA DRM.*/ - ret = __media_svc_get_mime_type(path, mime_type); - media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); + /* if the file is DRM file, drm_type value is DRM_TRUE(1). + if drm_contentinfo is not NULL, the file is OMA DRM.*/ + ret = __media_svc_get_mime_type(path, mime_type); + media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - media_svc_debug("mime [%s]", mime_type); - content_info->is_drm = drm_type; + media_svc_debug("mime [%s]", mime_type); + content_info->is_drm = drm_type; - ret = __media_svc_get_media_type(path, mime_type, media_type); - media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); + ret = __media_svc_get_media_type(path, mime_type, media_type); + media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - if ((*media_type < MEDIA_SVC_MEDIA_TYPE_IMAGE) || (*media_type > MEDIA_SVC_MEDIA_TYPE_OTHER)) { - media_svc_error("invalid media_type condition[%d]", *media_type); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } + if ((*media_type < MEDIA_SVC_MEDIA_TYPE_IMAGE) || (*media_type > MEDIA_SVC_MEDIA_TYPE_OTHER)) { + media_svc_error("invalid media_type condition[%d]", *media_type); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } - ret = __media_svc_malloc_and_strncpy(&content_info->mime_type, mime_type); - media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); + ret = __media_svc_malloc_and_strncpy(&content_info->mime_type, mime_type); + media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - media_svc_sec_debug("storage[%d], path[%s], media_type[%d]", storage_type, path, *media_type); + media_svc_sec_debug("storage[%d], path[%s], media_type[%d]", storage_type, path, *media_type); - content_info->media_type = *media_type; - } + content_info->media_type = *media_type; return MS_MEDIA_ERR_NONE; } diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 6bbc43e..c997f31 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -63,8 +63,7 @@ static bool __media_svc_check_storage(media_svc_storage_type_e storage_type, boo if (check_all == TRUE) { if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL) && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL) - && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB) - && (storage_type != MEDIA_SVC_STORAGE_CLOUD)) { + && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) { media_svc_error("storage type is incorrect[%d]", storage_type); return FALSE; } @@ -1474,29 +1473,6 @@ static int __media_svc_copy_para_to_content(media_svc_content_info_s *content_in media_svc_retvm_if(content_info == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); media_svc_retvm_if(new_content_info == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); - if (content_info->storage_type == MEDIA_SVC_STORAGE_CLOUD) { - new_content_info->size = content_info->size; - new_content_info->modified_time = content_info->modified_time; - new_content_info->is_drm = content_info->is_drm; - new_content_info->media_type = content_info->media_type; - - if (STRING_VALID(content_info->mime_type)) { - ret = __media_svc_malloc_and_strncpy(&new_content_info->mime_type, content_info->mime_type); - if (ret != MS_MEDIA_ERR_NONE) - media_svc_error("strcpy mime_type failed"); - } - - if (STRING_VALID(content_info->thumbnail_path)) { - ret = __media_svc_malloc_and_strncpy(&new_content_info->thumbnail_path, content_info->thumbnail_path); - if (ret != MS_MEDIA_ERR_NONE) - media_svc_error("strcpy thumbnail_path failed"); - } - - new_content_info->media_meta.duration = content_info->media_meta.duration; - new_content_info->media_meta.width = content_info->media_meta.width; - new_content_info->media_meta.height = content_info->media_meta.height; - } - if (content_info->added_time > 0) new_content_info->added_time = content_info->added_time; new_content_info->last_played_time = content_info->last_played_time; @@ -1661,25 +1637,6 @@ int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_sv media_svc_retvm_if(content_info == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "content_info is NULL"); media_svc_retvm_if(!STRING_VALID(content_info->path), MS_MEDIA_ERR_INVALID_PARAMETER, "file_path is NULL"); - if (content_info->storage_type == MEDIA_SVC_STORAGE_CLOUD) { - media_svc_retvm_if(!STRING_VALID(content_info->mime_type), MS_MEDIA_ERR_INVALID_PARAMETER, "mime_type is NULL"); - - if ((content_info->media_type < MEDIA_SVC_MEDIA_TYPE_IMAGE) || (content_info->media_type > MEDIA_SVC_MEDIA_TYPE_OTHER)) { - media_svc_error("invalid media_type condition[%d]", content_info->media_type); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } - - if (content_info->size <= 0) { - media_svc_error("invalid size condition[%d]", content_info->size); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } - - if (content_info->modified_time <= 0) { - media_svc_error("invalid modified_time condition[%d]", content_info->modified_time); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } - } - media_svc_debug("storage[%d], path[%s], media_type[%d]", content_info->storage_type, content_info->path, content_info->media_type); media_svc_content_info_s _new_content_info; @@ -1690,33 +1647,31 @@ int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_sv ret = _media_svc_set_media_info(&_new_content_info, content_info->storage_uuid, content_info->storage_type, content_info->path, &media_type, FALSE); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "fail _media_svc_set_media_info"); - if (content_info->storage_type != MEDIA_SVC_STORAGE_CLOUD) { - if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER) - media_svc_debug("Do nothing[%d]", media_type); - else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) - ret = _media_svc_extract_image_metadata(db_handle, &_new_content_info); - else - ret = _media_svc_extract_media_metadata(db_handle, &_new_content_info, uid); + if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER) + media_svc_debug("Do nothing[%d]", media_type); + else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) + ret = _media_svc_extract_image_metadata(db_handle, &_new_content_info); + else + ret = _media_svc_extract_media_metadata(db_handle, &_new_content_info, uid); - media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); + media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - /* Extracting thumbnail */ - if (_new_content_info.thumbnail_path == NULL) { - if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) { - char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, }; - int width = 0; - int height = 0; + /* Extracting thumbnail */ + if (_new_content_info.thumbnail_path == NULL) { + if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) { + char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, }; + int width = 0; + int height = 0; - ret = _media_svc_request_thumbnail_with_origin_size(_new_content_info.path, thumb_path, sizeof(thumb_path), &width, &height, uid); - if (ret == MS_MEDIA_ERR_NONE) - ret = __media_svc_malloc_and_strncpy(&(_new_content_info.thumbnail_path), thumb_path); + ret = _media_svc_request_thumbnail_with_origin_size(_new_content_info.path, thumb_path, sizeof(thumb_path), &width, &height, uid); + if (ret == MS_MEDIA_ERR_NONE) + ret = __media_svc_malloc_and_strncpy(&(_new_content_info.thumbnail_path), thumb_path); - if (_new_content_info.media_meta.width <= 0) - _new_content_info.media_meta.width = width; + if (_new_content_info.media_meta.width <= 0) + _new_content_info.media_meta.width = width; - if (_new_content_info.media_meta.height <= 0) - _new_content_info.media_meta.height = height; - } + if (_new_content_info.media_meta.height <= 0) + _new_content_info.media_meta.height = height; } } @@ -1876,7 +1831,7 @@ int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, con if (ret != MS_MEDIA_ERR_NONE) media_svc_error("fail to _media_svc_delete_folder_by_storage_id. error : [%d]", ret); - if ((storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB) || (storage_type == MEDIA_SVC_STORAGE_CLOUD)) { + if (storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB) { ret = _media_svc_drop_media_table(storage_id, uid); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "drop table failed : %d", ret); -- 2.7.4