From 06ef8012e3876af981081e7a24419e6c4c7b6c54 Mon Sep 17 00:00:00 2001 From: "Haejeong, Kim" Date: Mon, 5 Oct 2015 14:41:57 +0900 Subject: [PATCH] check condition just when sotrage type is cloud Change-Id: I06ef77655a4b93c82407b030e0ae4bbd4e1f0702 --- src/common/media-svc-util.c | 56 ++++++++++++++++++++++++--------------------- src/common/media-svc.c | 28 +++++++++++++---------- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c index 945c30b..649b580 100755 --- a/src/common/media-svc-util.c +++ b/src/common/media-svc-util.c @@ -1003,21 +1003,23 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char int ret = MS_MEDIA_ERR_NONE; char * media_uuid = NULL; char * file_name = NULL; - struct stat st; bool drm_type = false; - char mime_type[256] = {0}; + char mime_type[256] = {0, }; ret = __media_svc_malloc_and_strncpy(&content_info->path, path); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info); - 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"); + 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"); + } } _media_svc_set_default_value(content_info, refresh); @@ -1048,28 +1050,30 @@ 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 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(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); - 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 c8dc4e5..1b07de3 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -1634,22 +1634,26 @@ int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_sv media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL"); 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"); - 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->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->size <= 0) { - media_svc_error("invalid size condition[%d]", content_info->size); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } + 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->modified_time <= 0) { - media_svc_error("invalid modified_time condition[%d]", content_info->modified_time); - 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; -- 2.7.4