/* Flag for items to be published by notification */
static __thread int g_insert_with_noti = FALSE;
-#define DEFAULT_MEDIA_SVC_STORAGE_ID "media"
-
+#define BATCH_REQUEST_MAX 300
typedef struct {
int media_type;
char *path;
} media_svc_item_info_s;
-static bool __media_svc_check_storage(media_svc_storage_type_e storage_type, bool check_all)
+static bool __media_svc_check_storage(media_svc_storage_type_e storage_type)
{
- 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)) {
- media_svc_error("storage type is incorrect[%d]", storage_type);
- return FALSE;
- }
- } else {
- if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL)
- && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL)
- && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) {
- media_svc_error("storage type is incorrect[%d]", storage_type);
- return FALSE;
- }
+ if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL)
+ && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL)
+ && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) {
+ media_svc_error("storage type is incorrect[%d]", storage_type);
+ return FALSE;
}
return TRUE;
return _media_svc_get_user_version(db_handle, user_version);
}
-int media_svc_create_table(MediaSvcHandle *handle, uid_t uid)
+int media_svc_create_table(uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 *db_handle = (sqlite3 *)handle;
char *sql = NULL;
media_svc_debug_fenter();
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
ret = _media_svc_init_table_query(MEDIA_SVC_DB_TABLE_MEDIA);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_init_table_query fail.");
}
/*create media table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_LIST_MEDIA, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_LIST_MEDIA, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/*create folder table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_FOLDER, MEDIA_SVC_DB_LIST_FOLDER, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_FOLDER, MEDIA_SVC_DB_LIST_FOLDER, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/*create playlist_map table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_PLAYLIST_MAP, MEDIA_SVC_DB_LIST_PLAYLIST_MAP, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_PLAYLIST_MAP, MEDIA_SVC_DB_LIST_PLAYLIST_MAP, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/*create playlist table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_PLAYLIST, MEDIA_SVC_DB_LIST_PLAYLIST, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_PLAYLIST, MEDIA_SVC_DB_LIST_PLAYLIST, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/* create album table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_ALBUM, MEDIA_SVC_DB_LIST_ALBUM, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_ALBUM, MEDIA_SVC_DB_LIST_ALBUM, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/*create tag_map table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_TAG_MAP, MEDIA_SVC_DB_LIST_TAG_MAP, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_TAG_MAP, MEDIA_SVC_DB_LIST_TAG_MAP, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/*create tag table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_TAG, MEDIA_SVC_DB_LIST_TAG, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_TAG, MEDIA_SVC_DB_LIST_TAG, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
/*create bookmark table*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_BOOKMARK, MEDIA_SVC_DB_LIST_BOOKMARK, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_BOOKMARK, MEDIA_SVC_DB_LIST_BOOKMARK, uid);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ media_svc_error("_media_svc_make_table_query fail.");
+ goto ERROR;
+ }
+
+ /*create storage table from tizen 2.4 */
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_LIST_STORAGE, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
- /*create storage table. from tizen 2.4*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_LIST_STORAGE, uid);
+ /*create uhd table from tizen 3.0 */
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_UHD, MEDIA_SVC_DB_LIST_UHD, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
+ /*create pvr table from tizen 3.0 */
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_PVR, MEDIA_SVC_DB_LIST_PVR, uid);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ media_svc_error("_media_svc_make_table_query fail.");
+ goto ERROR;
+ }
#if 0
/*init storage table*/
ret = _media_svc_init_storage(db_handle, uid);
#endif
/*create face table. from tizen 3.0*/
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, MEDIA_SVC_DB_LIST_FACE_SCAN_LIST, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, MEDIA_SVC_DB_LIST_FACE_SCAN_LIST, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
- ret = _media_svc_make_table_query(db_handle, MEDIA_SVC_DB_TABLE_FACE, MEDIA_SVC_DB_LIST_FACE, uid);
+ ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_FACE, MEDIA_SVC_DB_LIST_FACE, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_make_table_query fail.");
goto ERROR;
}
sql = sqlite3_mprintf("pragma user_version = %d;", LATEST_VERSION_NUMBER);
- ret = _media_svc_sql_query(db_handle, sql, uid);
+ ret = _media_svc_sql_query(sql, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("user_version update fail.");
goto ERROR;
media_svc_debug_fleave();
return MS_MEDIA_ERR_NONE;
-ERROR :
+ERROR:
_media_svc_destroy_table_query();
media_svc_debug_fleave();
int media_svc_get_storage_type(const char *path, media_svc_storage_type_e *storage_type, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- media_svc_storage_type_e type;
+ ms_user_storage_type_t type = -1;
- ret = _media_svc_get_storage_type_by_path(path, &type, uid);
- media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_storage_type_by_path failed : %d", ret);
+ ret = ms_user_get_storage_type(uid, path, &type);
+ media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "ms_user_get_storage_type failed : %d", ret);
*storage_type = type;
return MS_MEDIA_ERR_NONE;
}
-int media_svc_insert_item_begin(MediaSvcHandle *handle, int data_cnt, int with_noti, int from_pid)
+int media_svc_insert_item_begin(int data_cnt, int with_noti, int from_pid)
{
- sqlite3 *db_handle = (sqlite3 *)handle;
-
media_svc_debug("Transaction data count : [%d]", data_cnt);
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
g_media_svc_insert_item_data_cnt = data_cnt;
return MS_MEDIA_ERR_NONE;
}
-int media_svc_insert_item_end(MediaSvcHandle *handle, uid_t uid)
+int media_svc_insert_item_end(uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_debug_fenter();
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
if (g_media_svc_insert_item_cur_data_cnt > 0) {
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_INSERT_ITEM, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_ITEM, uid);
if (g_insert_with_noti) {
media_svc_debug("sending noti list");
_media_svc_publish_noti_list(g_media_svc_insert_item_cur_data_cnt);
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is 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(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
media_svc_content_info_s content_info;
memset(&content_info, 0, sizeof(media_svc_content_info_s));
if (ret != MS_MEDIA_ERR_NONE)
return ret;
- if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER) {
- /*Do nothing.*/
- } else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) {
+ if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA))
+ 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, &content_info);
- } else {
+ else
ret = _media_svc_extract_media_metadata(db_handle, &content_info, uid);
- }
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
/*Set or Get folder id*/
ret = _media_svc_get_and_append_folder_id_by_path(db_handle, storage_id, path, storage_type, folder_uuid, uid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
- ret = __media_svc_malloc_and_strncpy(&content_info.folder_uuid, folder_uuid);
- media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
+ content_info.folder_uuid = g_strdup(folder_uuid);
+ media_svc_retv_del_if(content_info.folder_uuid == NULL, MS_MEDIA_ERR_INTERNAL, &content_info);
if (g_media_svc_insert_item_data_cnt == 1) {
if (g_insert_with_noti)
_media_svc_insert_item_to_noti_list(&content_info, g_media_svc_insert_item_cur_data_cnt);
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_INSERT_ITEM, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_ITEM, uid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
if (g_insert_with_noti) {
sqlite3 *db_handle = (sqlite3 *)handle;
char folder_uuid[MEDIA_SVC_UUID_SIZE + 1] = {0, };
media_svc_media_type_e media_type;
- int ini_val = _media_svc_get_ini_value();
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is 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(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
media_svc_content_info_s content_info;
memset(&content_info, 0, sizeof(media_svc_content_info_s));
/*Set media info*/
ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, &media_type, FALSE);
- if (ret != MS_MEDIA_ERR_NONE) {
+ if (ret != MS_MEDIA_ERR_NONE)
return ret;
- }
- if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER) {
+ if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA)) {
/*Do nothing.*/
} else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) {
ret = _media_svc_extract_image_metadata(db_handle, &content_info);
ret = _media_svc_get_and_append_folder_id_by_path(db_handle, storage_id, path, storage_type, folder_uuid, uid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
- ret = __media_svc_malloc_and_strncpy(&content_info.folder_uuid, folder_uuid);
- media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-#if 1
+ content_info.folder_uuid = g_strdup(folder_uuid);
+ media_svc_retv_del_if(content_info.folder_uuid == NULL, MS_MEDIA_ERR_INTERNAL, &content_info);
+
/* Extracting thumbnail */
- if (ini_val == 1) {
- if (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(content_info.path, thumb_path, sizeof(thumb_path), &width, &height, uid);
- if (ret == MS_MEDIA_ERR_NONE)
- ret = __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path);
-
- if (content_info.media_meta.width <= 0)
- content_info.media_meta.width = width;
-
- if (content_info.media_meta.height <= 0)
- content_info.media_meta.height = height;
- }
+ if (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, };
+
+ ret = _media_svc_request_thumbnail(content_info.path, thumb_path, sizeof(thumb_path), uid);
+ if (ret == MS_MEDIA_ERR_NONE)
+ content_info.thumbnail_path = g_strdup(thumb_path);
}
}
-#endif
ret = _media_svc_insert_item_with_data(db_handle, storage_id, &content_info, FALSE, FALSE, uid);
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(!STRING_VALID(src_path), MS_MEDIA_ERR_INVALID_PARAMETER, "src_path is NULL");
media_svc_retvm_if(!STRING_VALID(dest_path), MS_MEDIA_ERR_INVALID_PARAMETER, "dest_path is NULL");
- media_svc_retvm_if(__media_svc_check_storage(src_storage, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid src_storage");
- media_svc_retvm_if(__media_svc_check_storage(dest_storage, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid dest_storage");
+ media_svc_retvm_if(__media_svc_check_storage(src_storage) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid src_storage");
+ media_svc_retvm_if(__media_svc_check_storage(dest_storage) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid dest_storage");
/*check and update folder*/
ret = _media_svc_get_and_append_folder_id_by_path(db_handle, storage_id, dest_path, dest_storage, folder_uuid, uid);
return ret;
}
- /* If old thumb path is default or not */
- char *default_thumbnail_path = _media_svc_get_thumb_default_path(uid);
- if (STRING_VALID(default_thumbnail_path) && (strncmp(old_thumb_path, default_thumbnail_path, strlen(default_thumbnail_path)) == 0))
- strncpy(new_thumb_path, default_thumbnail_path, sizeof(new_thumb_path));
- else
- _media_svc_get_thumbnail_path(dest_storage, new_thumb_path, dest_path, THUMB_EXT, uid);
-
- SAFE_FREE(default_thumbnail_path);
+ _media_svc_get_thumbnail_path(dest_storage, new_thumb_path, dest_path, THUMB_EXT, uid);
}
if (g_media_svc_move_item_data_cnt == 1) {
/*update item*/
- if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO)) {
- ret = _media_svc_update_item_by_path(db_handle, storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, new_thumb_path, FALSE, uid);
- } else {
- ret = _media_svc_update_item_by_path(db_handle, storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, NULL, FALSE, uid);
- }
+ if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO))
+ ret = _media_svc_update_item_by_path(storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, new_thumb_path, FALSE, uid);
+ else
+ ret = _media_svc_update_item_by_path(storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, NULL, FALSE, uid);
+
SAFE_FREE(file_name);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
/*update folder modified_time*/
folder_path = g_path_get_dirname(dest_path);
- ret = _media_svc_update_folder_modified_time_by_folder_uuid(db_handle, folder_uuid, folder_path, FALSE, uid);
+ ret = _media_svc_update_folder_modified_time_by_folder_uuid(folder_uuid, folder_path, FALSE, uid);
SAFE_FREE(folder_path);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
- ret = _media_svc_update_folder_table(db_handle, storage_id, uid);
+ ret = _media_svc_update_folder_table(storage_id, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
} else if (g_media_svc_move_item_cur_data_cnt < (g_media_svc_move_item_data_cnt - 1)) {
/*update item*/
- if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO)) {
- ret = _media_svc_update_item_by_path(db_handle, storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, new_thumb_path, TRUE, uid);
- } else {
- ret = _media_svc_update_item_by_path(db_handle, storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, NULL, TRUE, uid);
- }
+ if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO))
+ ret = _media_svc_update_item_by_path(storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, new_thumb_path, TRUE, uid);
+ else
+ ret = _media_svc_update_item_by_path(storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, NULL, TRUE, uid);
+
SAFE_FREE(file_name);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
/*update folder modified_time*/
folder_path = g_path_get_dirname(dest_path);
- ret = _media_svc_update_folder_modified_time_by_folder_uuid(db_handle, folder_uuid, folder_path, TRUE, uid);
+ ret = _media_svc_update_folder_modified_time_by_folder_uuid(folder_uuid, folder_path, TRUE, uid);
SAFE_FREE(folder_path);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
g_media_svc_move_item_cur_data_cnt++;
} else if (g_media_svc_move_item_cur_data_cnt == (g_media_svc_move_item_data_cnt - 1)) {
-
/*update item*/
- if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO)) {
- ret = _media_svc_update_item_by_path(db_handle, storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, new_thumb_path, TRUE, uid);
- } else {
- ret = _media_svc_update_item_by_path(db_handle, storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, NULL, TRUE, uid);
- }
+ if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO))
+ ret = _media_svc_update_item_by_path(storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, new_thumb_path, TRUE, uid);
+ else
+ ret = _media_svc_update_item_by_path(storage_id, src_path, dest_storage, dest_path, file_name, modified_time, folder_uuid, NULL, TRUE, uid);
+
SAFE_FREE(file_name);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
/*update folder modified_time*/
folder_path = g_path_get_dirname(dest_path);
- ret = _media_svc_update_folder_modified_time_by_folder_uuid(db_handle, folder_uuid, folder_path, TRUE, uid);
+ ret = _media_svc_update_folder_modified_time_by_folder_uuid(folder_uuid, folder_path, TRUE, uid);
SAFE_FREE(folder_path);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
/*update db*/
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_MOVE_ITEM, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_MOVE_ITEM, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
g_media_svc_move_item_cur_data_cnt = 0;
} else {
media_svc_error("Error in media_svc_move_item");
+ SAFE_FREE(file_name);
return MS_MEDIA_ERR_INTERNAL;
}
/*rename thumbnail file*/
-/* if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO)) { */
- if ((strlen(old_thumb_path) > 0) && (STRING_VALID(MEDIA_SVC_THUMB_DEFAULT_PATH)) && (strncmp(old_thumb_path, MEDIA_SVC_THUMB_DEFAULT_PATH, strlen(MEDIA_SVC_THUMB_DEFAULT_PATH)) != 0)) {
+ if (STRING_VALID(old_thumb_path)) {
ret = _media_svc_rename_file(old_thumb_path, new_thumb_path);
if (ret != MS_MEDIA_ERR_NONE)
media_svc_error("_media_svc_rename_file failed : %d", ret);
}
-/* } */
return MS_MEDIA_ERR_NONE;
}
-int media_svc_set_item_validity_begin(MediaSvcHandle *handle, int data_cnt)
+int media_svc_set_item_validity_begin(int data_cnt)
{
- sqlite3 *db_handle = (sqlite3 *)handle;
-
media_svc_debug("Transaction data count : [%d]", data_cnt);
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
g_media_svc_item_validity_data_cnt = data_cnt;
return MS_MEDIA_ERR_NONE;
}
-int media_svc_set_item_validity_end(MediaSvcHandle *handle, uid_t uid)
+int media_svc_set_item_validity_end(uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_debug_fenter();
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
- if (g_media_svc_item_validity_cur_data_cnt > 0) {
-
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_SET_ITEM_VALIDITY, uid);
- }
+ if (g_media_svc_item_validity_cur_data_cnt > 0)
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SET_ITEM_VALIDITY, uid);
g_media_svc_item_validity_data_cnt = 1;
g_media_svc_item_validity_cur_data_cnt = 0;
return ret;
}
-int media_svc_set_item_validity(MediaSvcHandle *handle, const char *storage_id, const char *path, int validity, uid_t uid)
+int media_svc_set_item_validity(const char *storage_id, const char *path, int validity, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 *db_handle = (sqlite3 *)handle;
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is 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");
if (g_media_svc_item_validity_data_cnt == 1) {
- return _media_svc_update_item_validity(db_handle, storage_id, path, validity, FALSE, uid);
+ return _media_svc_update_item_validity(storage_id, path, validity, FALSE, uid);
} else if (g_media_svc_item_validity_cur_data_cnt < (g_media_svc_item_validity_data_cnt - 1)) {
- ret = _media_svc_update_item_validity(db_handle, storage_id, path, validity, TRUE, uid);
+ ret = _media_svc_update_item_validity(storage_id, path, validity, TRUE, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
g_media_svc_item_validity_cur_data_cnt++;
} else if (g_media_svc_item_validity_cur_data_cnt == (g_media_svc_item_validity_data_cnt - 1)) {
- ret = _media_svc_update_item_validity(db_handle, storage_id, path, validity, TRUE, uid);
+ ret = _media_svc_update_item_validity(storage_id, path, validity, TRUE, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_SET_ITEM_VALIDITY, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SET_ITEM_VALIDITY, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
g_media_svc_item_validity_cur_data_cnt = 0;
ret = _media_svc_get_media_type_by_path(db_handle, storage_id, path, &media_type);
media_svc_retv_if((ret != MS_MEDIA_ERR_NONE), ret);
-#if 0
- if ((media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) || (media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO)) {
- /*Get thumbnail path to delete*/
- ret = _media_svc_get_thumbnail_path_by_path(db_handle, storage_id, path, thumb_path);
- media_svc_retv_if((ret != MS_MEDIA_ERR_NONE) && (ret != MS_MEDIA_ERR_DB_NO_RECORD), ret);
- } else if ((media_type == MEDIA_SVC_MEDIA_TYPE_SOUND) || (media_type == MEDIA_SVC_MEDIA_TYPE_MUSIC)) {
- int count = 0;
- ret = _media_svc_get_media_count_with_album_id_by_path(db_handle, path, &count);
- media_svc_retv_if((ret != MS_MEDIA_ERR_NONE), ret);
-
- if (count == 1) {
- /*Get thumbnail path to delete*/
- ret = _media_svc_get_thumbnail_path_by_path(db_handle, storage_id, path, thumb_path);
- media_svc_retv_if((ret != MS_MEDIA_ERR_NONE) && (ret != MS_MEDIA_ERR_DB_NO_RECORD), ret);
- }
- }
-#endif
/*Get thumbnail path to delete*/
ret = _media_svc_get_thumbnail_path_by_path(db_handle, storage_id, path, thumb_path);
media_svc_retv_if((ret != MS_MEDIA_ERR_NONE) && (ret != MS_MEDIA_ERR_DB_NO_RECORD), ret);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
/*Delete item*/
- ret = _media_svc_delete_item_by_path(db_handle, storage_id, path, FALSE, uid);
+ ret = _media_svc_delete_item_by_path(storage_id, path, FALSE, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_delete_item_by_path failed : %d", ret);
_media_svc_destroy_noti_item(noti_item);
_media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_DELETE, path, media_type, noti_item->media_uuid, noti_item->mime_type);
_media_svc_destroy_noti_item(noti_item);
} else {
- ret = _media_svc_delete_item_by_path(db_handle, storage_id, path, TRUE, uid);
+ ret = _media_svc_delete_item_by_path(storage_id, path, TRUE, uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("_media_svc_delete_item_by_path failed : %d", ret);
return ret;
}
/*Delete thumbnail*/
- char *default_thumbnail_path = _media_svc_get_thumb_default_path(uid);
- if ((strlen(thumb_path) > 0) && ((STRING_VALID(default_thumbnail_path)) && (strncmp(thumb_path, default_thumbnail_path, strlen(default_thumbnail_path)) != 0))) {
-/*
- int thumb_count = 1;
- // Get count of media, which contains same thumbnail for music
- if ((media_type == MEDIA_SVC_MEDIA_TYPE_SOUND) ||(media_type == MEDIA_SVC_MEDIA_TYPE_MUSIC)) {
- ret = _media_svc_get_thumbnail_count(db_handle, storage_id, thumb_path, &thumb_count);
- if (ret != MS_MEDIA_ERR_NONE) {
- media_svc_error("Failed to get thumbnail count : %d", ret);
- }
- }
-
- if (thumb_count == 1) {
-*/
- ret = _media_svc_remove_file(thumb_path);
- if (ret != MS_MEDIA_ERR_NONE) {
- media_svc_error("fail to remove thumbnail file.");
- }
-// }
+ if (STRING_VALID(thumb_path)) {
+ ret = _media_svc_remove_file(thumb_path);
+ if (ret != MS_MEDIA_ERR_NONE)
+ media_svc_error("fail to remove thumbnail file.");
}
- SAFE_FREE(default_thumbnail_path);
-
return MS_MEDIA_ERR_NONE;
}
-int media_svc_delete_all_items_in_storage(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid)
+int media_svc_delete_all_items_in_storage(const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_debug("media_svc_delete_all_items_in_storage [%d]", storage_type);
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
- media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
- ret = _media_svc_truncate_table(db_handle, storage_id, storage_type, uid);
+ ret = _media_svc_truncate_table(storage_id, storage_type, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
if (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB) {
- char *internal_thumb_path = _media_svc_get_thumb_internal_path(uid);
- char *external_thumb_path = _media_svc_get_thumb_external_path(uid);
+ char *internal_thumb_path = NULL;
+ char *external_thumb_path = NULL;
+
+ ret = ms_user_get_default_thumb_store_path(uid, &internal_thumb_path);
+ ret = ms_user_get_mmc_thumb_store_path(uid, &external_thumb_path);
+ if (!STRING_VALID(internal_thumb_path) || !STRING_VALID(external_thumb_path)) {
+ media_svc_error("fail to get thumbnail path");
+ SAFE_FREE(internal_thumb_path);
+ SAFE_FREE(external_thumb_path);
+ return MS_MEDIA_ERR_INTERNAL;
+ }
const char *dirpath = (storage_type == MEDIA_SVC_STORAGE_INTERNAL) ? internal_thumb_path : external_thumb_path;
/* remove thumbnails */
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
- media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
/*Delete from DB and remove thumbnail files*/
return _media_svc_delete_invalid_items(db_handle, storage_id, storage_type, uid);
return _media_svc_delete_invalid_folder_items(db_handle, storage_id, folder_path, is_recursive, uid);
}
-int media_svc_set_all_storage_items_validity(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, int validity, uid_t uid)
+int media_svc_set_all_storage_items_validity(const char *storage_id, media_svc_storage_type_e storage_type, int validity, uid_t uid)
{
- sqlite3 *db_handle = (sqlite3 *)handle;
-
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
- media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
- return _media_svc_update_storage_item_validity(db_handle, storage_id, storage_type, validity, uid);
+ return _media_svc_update_storage_item_validity(storage_id, storage_type, validity, uid);
}
int media_svc_set_folder_items_validity(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid)
media_svc_retvm_if(!STRING_VALID(folder_path), MS_MEDIA_ERR_INVALID_PARAMETER, "folder_path is NULL");
if (recursive)
- return _media_svc_update_recursive_folder_item_validity(db_handle, storage_id, folder_path, validity, uid);
+ return _media_svc_update_recursive_folder_item_validity(storage_id, folder_path, validity, uid);
else
return _media_svc_update_folder_item_validity(db_handle, storage_id, folder_path, validity, uid);
}
int ret = MS_MEDIA_ERR_NONE;
sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_media_type_e media_type;
- int ini_val = _media_svc_get_ini_value();
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is 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(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
media_svc_content_info_s content_info;
memset(&content_info, 0, sizeof(media_svc_content_info_s));
/*Set media info*/
ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, &media_type, TRUE);
- if (ret != MS_MEDIA_ERR_NONE) {
+ if (ret != MS_MEDIA_ERR_NONE)
return ret;
- }
/* Initialize thumbnail information to remake thumbnail. */
- if (ini_val == 1) {
- char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1];
- ret = _media_svc_get_thumbnail_path_by_path(db_handle, storage_id, path, thumb_path);
- if (ret != MS_MEDIA_ERR_NONE) {
- _media_svc_destroy_content_info(&content_info);
- return ret;
- }
+ char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1];
+ ret = _media_svc_get_thumbnail_path_by_path(db_handle, storage_id, path, thumb_path);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ _media_svc_destroy_content_info(&content_info);
+ return ret;
+ }
- if (g_file_test(thumb_path, G_FILE_TEST_EXISTS) && (STRING_VALID(MEDIA_SVC_THUMB_DEFAULT_PATH)) && (strncmp(thumb_path, MEDIA_SVC_THUMB_DEFAULT_PATH, strlen(MEDIA_SVC_THUMB_DEFAULT_PATH)) != 0)) {
- ret = _media_svc_remove_file(thumb_path);
- if (ret != MS_MEDIA_ERR_NONE) {
- media_svc_error("_media_svc_remove_file failed : %s", thumb_path);
- }
- }
+ if (g_file_test(thumb_path, G_FILE_TEST_EXISTS)) {
+ ret = _media_svc_remove_file(thumb_path);
+ if (ret != MS_MEDIA_ERR_NONE)
+ media_svc_error("_media_svc_remove_file failed : %s", thumb_path);
+ }
- ret = _media_svc_update_thumbnail_path(db_handle, storage_id, path, NULL, uid);
- if (ret != MS_MEDIA_ERR_NONE) {
- _media_svc_destroy_content_info(&content_info);
- return ret;
- }
+ ret = _media_svc_update_thumbnail_path(storage_id, path, NULL, uid);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ _media_svc_destroy_content_info(&content_info);
+ return ret;
}
/* Get notification info */
media_type = noti_item->media_type;
content_info.media_type = media_type;
- if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER) {
- /*Do nothing.*/
- } else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) {
+ if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA))
+ 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, &content_info);
- } else {
+ else
ret = _media_svc_extract_media_metadata(db_handle, &content_info, uid);
- }
if (ret != MS_MEDIA_ERR_NONE) {
_media_svc_destroy_noti_item(noti_item);
_media_svc_destroy_content_info(&content_info);
return ret;
}
-#if 1
+
/* Extracting thumbnail */
- if (ini_val == 1) {
- if (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(content_info.path, thumb_path, sizeof(thumb_path), &width, &height, uid);
- if (ret == MS_MEDIA_ERR_NONE) {
- ret = __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path);
- }
-
- if (content_info.media_meta.width <= 0)
- content_info.media_meta.width = width;
-
- if (content_info.media_meta.height <= 0)
- content_info.media_meta.height = height;
- }
+ if (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, };
+
+ ret = _media_svc_request_thumbnail(content_info.path, thumb_path, sizeof(thumb_path), uid);
+ if (ret == MS_MEDIA_ERR_NONE)
+ content_info.thumbnail_path = g_strdup(thumb_path);
}
}
-#endif
-
- ret = _media_svc_update_item_with_data(db_handle, storage_id, &content_info, uid);
+ ret = _media_svc_update_item_with_data(storage_id, &content_info, uid);
if (ret == MS_MEDIA_ERR_NONE) {
media_svc_debug("Update is successful. Sending noti for this");
media_svc_debug("Src path : %s, Dst Path : %s", src_path, dst_path);
- ret = _media_svc_sql_begin_trans(db_handle, uid);
+ ret = _media_svc_sql_begin_trans(uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
/* Update all folder record's modified date, which are changed above */
update_folder_modified_time_sql = sqlite3_mprintf("UPDATE folder SET modified_time = %d WHERE path LIKE '%q';", date, dst_path);
ret = media_db_request_update_db_batch(update_folder_modified_time_sql, uid);
- //ret = _media_svc_sql_query(db_handle, update_folder_modified_time_sql, uid);
- sqlite3_free(update_folder_modified_time_sql);
+ SQLITE3_SAFE_FREE(update_folder_modified_time_sql);
if (ret != SQLITE_OK) {
media_svc_error("failed to update folder modified time");
- _media_svc_sql_rollback_trans(db_handle, uid);
+ _media_svc_sql_rollback_trans(uid);
return MS_MEDIA_ERR_DB_INTERNAL;
}
snprintf(dst_child_path, sizeof(dst_child_path), "%s/%%", dst_path);
- select_all_sql = sqlite3_mprintf("SELECT media_uuid, path, thumbnail_path, media_type from media where folder_uuid IN ( SELECT folder_uuid FROM folder where path='%q' or path like '%q');", dst_path, dst_child_path);
+ select_all_sql = sqlite3_mprintf("SELECT media_uuid, path, thumbnail_path, media_type from '%q' where folder_uuid IN ( SELECT folder_uuid FROM folder where path='%q' or path like '%q');", storage_id, dst_path, dst_child_path);
media_svc_debug("[SQL query] : %s", select_all_sql);
ret = _media_svc_sql_prepare_to_step_simple(db_handle, select_all_sql, &sql_stmt);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("error when media_svc_rename_folder. err = [%d]", ret);
- _media_svc_sql_rollback_trans(db_handle, uid);
+ _media_svc_sql_rollback_trans(uid);
return ret;
}
bool no_thumb = FALSE;
if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 0))) {
- strncpy(media_uuid, (const char *)sqlite3_column_text(sql_stmt, 0), sizeof(media_uuid));
- media_uuid[sizeof(media_uuid) - 1] = '\0';
+ SAFE_STRLCPY(media_uuid, (const char *)sqlite3_column_text(sql_stmt, 0), sizeof(media_uuid));
} else {
media_svc_error("media UUID is NULL");
return MS_MEDIA_ERR_DB_INTERNAL;
}
if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 1))) {
- strncpy(media_path, (const char *)sqlite3_column_text(sql_stmt, 1), sizeof(media_path));
- media_path[sizeof(media_path) - 1] = '\0';
+ SAFE_STRLCPY(media_path, (const char *)sqlite3_column_text(sql_stmt, 1), sizeof(media_path));
} else {
media_svc_error("media path is NULL");
return MS_MEDIA_ERR_DB_INTERNAL;
}
if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 2))) {
- strncpy(media_thumb_path, (const char *)sqlite3_column_text(sql_stmt, 2), sizeof(media_thumb_path));
- media_thumb_path[sizeof(media_thumb_path) - 1] = '\0';
+ SAFE_STRLCPY(media_thumb_path, (const char *)sqlite3_column_text(sql_stmt, 2), sizeof(media_thumb_path));
} else {
media_svc_debug("media thumb path doesn't exist in DB");
no_thumb = TRUE;
if (replaced_path == NULL) {
media_svc_error("_media_svc_replace_path failed");
SQLITE3_FINALIZE(sql_stmt);
- _media_svc_sql_rollback_trans(db_handle, uid);
+ _media_svc_sql_rollback_trans(uid);
return MS_MEDIA_ERR_INTERNAL;
}
media_svc_debug("New media path : %s", replaced_path);
- media_svc_storage_type_e storage_type;
+ ms_user_storage_type_t storage_type = -1;
if (!no_thumb) {
- /* If old thumb path is default or not */
- char *default_thumbnail_path = _media_svc_get_thumb_default_path(uid);
- if (STRING_VALID(default_thumbnail_path) && (strncmp(media_thumb_path, default_thumbnail_path, strlen(default_thumbnail_path)) == 0)) {
- strncpy(media_new_thumb_path, default_thumbnail_path, sizeof(media_new_thumb_path) - 1);
- } else {
- ret = _media_svc_get_storage_type_by_path(replaced_path, &storage_type, uid);
- if (ret != MS_MEDIA_ERR_NONE) {
- media_svc_error("_media_svc_get_storage_type_by_path failed : %d", ret);
- SAFE_FREE(replaced_path);
- SAFE_FREE(default_thumbnail_path);
- _media_svc_sql_rollback_trans(db_handle, uid);
- return ret;
- }
-
- ret = _media_svc_get_thumbnail_path(storage_type, media_new_thumb_path, replaced_path, THUMB_EXT, uid);
- if (ret != MS_MEDIA_ERR_NONE) {
- media_svc_error("_media_svc_get_thumbnail_path failed : %d", ret);
- SAFE_FREE(replaced_path);
- SAFE_FREE(default_thumbnail_path);
- SQLITE3_FINALIZE(sql_stmt);
- _media_svc_sql_rollback_trans(db_handle, uid);
- return ret;
- }
+ ret = ms_user_get_storage_type(uid, replaced_path, &storage_type);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ media_svc_sec_error("ms_user_get_storage_type failed : [%d], path[%s] storage_type[%d]", ret, replaced_path, storage_type);
+ SAFE_FREE(replaced_path);
+ _media_svc_sql_rollback_trans(uid);
+ return ret;
}
- SAFE_FREE(default_thumbnail_path);
+ ret = _media_svc_get_thumbnail_path(storage_type, media_new_thumb_path, replaced_path, THUMB_EXT, uid);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ media_svc_error("_media_svc_get_thumbnail_path failed : %d", ret);
+ SAFE_FREE(replaced_path);
+ SQLITE3_FINALIZE(sql_stmt);
+ _media_svc_sql_rollback_trans(uid);
+ return ret;
+ }
/*media_svc_debug("New media thumbnail path : %s", media_new_thumb_path); */
}
char *update_item_sql = NULL;
if (no_thumb) {
- update_item_sql = sqlite3_mprintf("UPDATE media SET path='%q' WHERE media_uuid='%q'", replaced_path, media_uuid);
+ update_item_sql = sqlite3_mprintf("UPDATE '%q' SET path='%q' WHERE media_uuid='%q'", storage_id, replaced_path, media_uuid);
} else {
#if 0
- if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
- update_item_sql = sqlite3_mprintf("UPDATE media SET path='%q', thumbnail_path='%q' WHERE media_uuid='%q'", replaced_path, media_new_thumb_path, media_uuid);
- } else {
- update_item_sql = sqlite3_mprintf("UPDATE media SET path='%q', thumbnail_path='%q' WHERE media_uuid='%q'", replaced_path, media_thumb_path, media_uuid);
- }
+ if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO)
+ update_item_sql = sqlite3_mprintf("UPDATE '%q' SET path='%q', thumbnail_path='%q' WHERE media_uuid='%q'", storage_id, replaced_path, media_new_thumb_path, media_uuid);
+ else
+ update_item_sql = sqlite3_mprintf("UPDATE '%q' SET path='%q', thumbnail_path='%q' WHERE media_uuid='%q'", storage_id, replaced_path, media_thumb_path, media_uuid);
#else
- update_item_sql = sqlite3_mprintf("UPDATE media SET path='%q', thumbnail_path='%q' WHERE media_uuid='%q'", replaced_path, media_new_thumb_path, media_uuid);
+ update_item_sql = sqlite3_mprintf("UPDATE '%q' SET path='%q', thumbnail_path='%q' WHERE media_uuid='%q'", storage_id, replaced_path, media_new_thumb_path, media_uuid);
#endif
}
ret = media_db_request_update_db_batch(update_item_sql, uid);
- /*ret = _media_svc_sql_query(db_handle, update_item_sql, uid); */
- sqlite3_free(update_item_sql);
+ SQLITE3_SAFE_FREE(update_item_sql);
SAFE_FREE(replaced_path);
if (ret != SQLITE_OK) {
media_svc_error("failed to update item");
SQLITE3_FINALIZE(sql_stmt);
- _media_svc_sql_rollback_trans(db_handle, uid);
+ _media_svc_sql_rollback_trans(uid);
return MS_MEDIA_ERR_DB_INTERNAL;
}
/* Rename thumbnail file of file system */
- char *default_thumbnail_path = _media_svc_get_thumb_default_path(uid);
- if ((!no_thumb) && (strncmp(media_thumb_path, default_thumbnail_path, strlen(default_thumbnail_path)) != 0)) {
+ if (!no_thumb) {
ret = _media_svc_rename_file(media_thumb_path, media_new_thumb_path);
- if (ret != MS_MEDIA_ERR_NONE) {
+ if (ret != MS_MEDIA_ERR_NONE)
media_svc_error("_media_svc_rename_file failed : %d", ret);
- }
}
- SAFE_FREE(default_thumbnail_path);
}
SQLITE3_FINALIZE(sql_stmt);
- ret = _media_svc_sql_end_trans(db_handle, uid);
+ ret = _media_svc_sql_end_trans(uid);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("mb_svc_sqlite3_commit_trans failed.. Now start to rollback");
- _media_svc_sql_rollback_trans(db_handle, uid);
+ _media_svc_sql_rollback_trans(uid);
return ret;
}
{
media_svc_retvm_if(!STRING_VALID(db_query), MS_MEDIA_ERR_INVALID_PARAMETER, "db_query is NULL");
- return _media_svc_sql_query(NULL, db_query, uid);
+ return _media_svc_sql_query(db_query, uid);
}
int media_svc_send_dir_update_noti(MediaSvcHandle *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid)
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
if (folder_id != NULL) {
- uuid = folder_id;
+ uuid = strndup(folder_id, strlen(folder_id));
} else {
- uuid = noti_item->media_uuid;
+ if (noti_item->media_uuid != NULL) {
+ uuid = strndup(noti_item->media_uuid, strlen(noti_item->media_uuid));
+ } else {
+ _media_svc_destroy_noti_item(noti_item);
+ media_svc_error("folder uuid is wrong");
+ return MS_MEDIA_ERR_DB_INTERNAL;
+ }
}
ret = _media_svc_publish_dir_noti(MS_MEDIA_ITEM_DIRECTORY, MS_MEDIA_ITEM_UPDATE, dir_path, -1, noti_item->media_uuid, NULL, pid);
ret = _media_svc_publish_dir_noti_v2(MS_MEDIA_ITEM_DIRECTORY, update_type, dir_path, -1, uuid, NULL, pid);
_media_svc_destroy_noti_item(noti_item);
+ SAFE_FREE(uuid);
return ret;
}
return _media_svc_count_invalid_folder_items(db_handle, storage_id, folder_path, count);
}
-int media_svc_check_db_upgrade(MediaSvcHandle *handle, bool *need_full_scan, int user_version, uid_t uid)
+int media_svc_check_db_upgrade(MediaSvcHandle *handle, int user_version, uid_t uid)
{
sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
- return _media_svc_check_db_upgrade(db_handle, need_full_scan, user_version, uid);
+ return _media_svc_check_db_upgrade(db_handle, user_version, uid);
}
int media_svc_check_db_corrupt(MediaSvcHandle *handle)
ret = _media_svc_get_folder_info_by_foldername(db_handle, storage_id, folder_path, folder_uuid, &sto_time);
if (ret == MS_MEDIA_ERR_NONE) {
- if (sto_time != cur_time) {
- ret = _media_svc_update_folder_modified_time_by_folder_uuid(db_handle, folder_uuid, folder_path, FALSE, uid);
- }
+ if (sto_time != cur_time)
+ ret = _media_svc_update_folder_modified_time_by_folder_uuid(folder_uuid, folder_path, FALSE, uid);
}
return ret;
}
-int media_svc_update_item_begin(MediaSvcHandle *handle, int data_cnt)
+int media_svc_update_item_begin(int data_cnt)
{
- sqlite3 *db_handle = (sqlite3 *)handle;
-
media_svc_debug("Transaction data count : [%d]", data_cnt);
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
g_media_svc_update_item_data_cnt = data_cnt;
return MS_MEDIA_ERR_NONE;
}
-int media_svc_update_item_end(MediaSvcHandle *handle, uid_t uid)
+int media_svc_update_item_end(uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_debug_fenter();
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
- if (g_media_svc_update_item_cur_data_cnt > 0) {
-
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
- }
+ if (g_media_svc_update_item_cur_data_cnt > 0)
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
g_media_svc_update_item_data_cnt = 1;
g_media_svc_update_item_cur_data_cnt = 0;
return ret;
}
-int media_svc_update_item_meta(MediaSvcHandle *handle, const char *file_path, int storage_type, uid_t uid)
+int media_svc_update_item_meta(MediaSvcHandle *handle, const char *file_path, const char *storage_id, int storage_type, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_media_type_e media_type;
-
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(!STRING_VALID(file_path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
- media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
media_svc_content_info_s content_info;
memset(&content_info, 0, sizeof(media_svc_content_info_s));
/*Set media info*/
- ret = _media_svc_set_media_info(&content_info, DEFAULT_MEDIA_SVC_STORAGE_ID, storage_type, file_path, &media_type, FALSE);
- if (ret != MS_MEDIA_ERR_NONE) {
+ ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, file_path, &media_type, FALSE);
+ if (ret != MS_MEDIA_ERR_NONE)
return ret;
- }
- if (media_type == MEDIA_SVC_MEDIA_TYPE_MUSIC) {
+ if (media_type == MEDIA_SVC_MEDIA_TYPE_MUSIC)
ret = _media_svc_extract_music_metadata_for_update(db_handle, &content_info, media_type);
- } else {
+ else {
+ _media_svc_destroy_content_info(&content_info);
return MS_MEDIA_ERR_NONE;
}
if (g_media_svc_update_item_data_cnt == 1) {
- ret = _media_svc_update_meta_with_data(db_handle, &content_info);
+ ret = _media_svc_update_meta_with_data(&content_info);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
} else if (g_media_svc_update_item_cur_data_cnt < (g_media_svc_update_item_data_cnt - 1)) {
- ret = _media_svc_update_meta_with_data(db_handle, &content_info);
+ ret = _media_svc_update_meta_with_data(&content_info);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
g_media_svc_update_item_cur_data_cnt++;
} else if (g_media_svc_update_item_cur_data_cnt == (g_media_svc_update_item_data_cnt - 1)) {
- ret = _media_svc_update_meta_with_data(db_handle, &content_info);
+ ret = _media_svc_update_meta_with_data(&content_info);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
g_media_svc_update_item_cur_data_cnt = 0;
return ret;
}
-int media_svc_publish_noti(MediaSvcHandle *handle, 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)
+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)
{
return _media_svc_publish_noti(update_item, update_type, path, media_type, uuid, mime_type);
}
-int media_svc_get_pinyin(MediaSvcHandle *handle, const char *src_str, char **pinyin_str)
+int media_svc_get_pinyin(const char *src_str, char **pinyin_str)
{
media_svc_retvm_if(!STRING_VALID(src_str), MS_MEDIA_ERR_INVALID_PARAMETER, "String is NULL");
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
- ret = _media_svc_update_storage_validity(db_handle, storage_id, validity, uid);
+ ret = _media_svc_update_storage_validity(storage_id, validity, uid);
media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "update storage validity failed: %d", ret);
ret = _media_svc_update_media_view(db_handle, uid);
return ret;
}
-int media_svc_get_storage_id(MediaSvcHandle *handle, const char *path, char *storage_id)
+int media_svc_get_storage_id(MediaSvcHandle *handle, const char *path, char *storage_id, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
sqlite3 * db_handle = (sqlite3 *)handle;
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
- ret = _media_svc_get_storage_uuid(db_handle, path, storage_id);
+ ret = _media_svc_get_storage_uuid(db_handle, path, storage_id, uid);
return ret;
}
return ret;
}
-int media_svc_set_storage_scan_status(MediaSvcHandle *handle, const char *storage_uuid, media_svc_scan_status_type_e storage_status, uid_t uid)
+int media_svc_set_storage_scan_status(const char *storage_uuid, media_svc_scan_status_type_e storage_status, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 * db_handle = (sqlite3 *)handle;
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
- ret = _media_svc_set_storage_scan_status(db_handle, storage_uuid, storage_status, uid);
+ ret = _media_svc_set_storage_scan_status(storage_uuid, storage_status, uid);
return ret;
}
static int __media_svc_copy_para_to_content(media_svc_content_info_s *content_info, media_svc_content_info_s *new_content_info)
{
- int ret = MS_MEDIA_ERR_NONE;
-
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;
new_content_info->played_count = content_info->played_count;
new_content_info->favourate = content_info->favourate;
+ /* Can be NULL if user not to set display_name using media_info_set_displayname().. */
if (STRING_VALID(content_info->file_name)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->file_name, content_info->file_name);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy file_name failed");
- }
-
- if (STRING_VALID(content_info->media_meta.title)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.title, content_info->media_meta.title);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy title failed");
- }
-
- if (STRING_VALID(content_info->media_meta.album)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.album, content_info->media_meta.album);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy album failed");
- }
-
- if (STRING_VALID(content_info->media_meta.artist)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.artist, content_info->media_meta.artist);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy artist failed");
- }
-
- if (STRING_VALID(content_info->media_meta.genre)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.genre, content_info->media_meta.genre);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy genre failed");
- }
-
- if (STRING_VALID(content_info->media_meta.composer)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.composer, content_info->media_meta.composer);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy composer failed");
- }
-
- if (STRING_VALID(content_info->media_meta.year)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.year, content_info->media_meta.year);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy year failed");
- }
-
- if (STRING_VALID(content_info->media_meta.recorded_date)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.recorded_date, content_info->media_meta.recorded_date);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy recorded_date failed");
- }
-
- if (STRING_VALID(content_info->media_meta.copyright)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.copyright, content_info->media_meta.copyright);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy copyright failed");
- }
-
- if (STRING_VALID(content_info->media_meta.track_num)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.track_num, content_info->media_meta.track_num);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy track_num failed");
- }
-
- if (STRING_VALID(content_info->media_meta.description)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.description, content_info->media_meta.description);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy description failed");
- }
-
- if (STRING_VALID(content_info->media_meta.weather)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.weather, content_info->media_meta.weather);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy weather failed");
- }
-
- if (STRING_VALID(content_info->media_meta.category)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.category, content_info->media_meta.category);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy category failed");
- }
-
- if (STRING_VALID(content_info->media_meta.keyword)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.keyword, content_info->media_meta.keyword);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy keyword failed");
- }
-
- if (STRING_VALID(content_info->media_meta.location_tag)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.location_tag, content_info->media_meta.location_tag);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy location_tag failed");
- }
-
- if (STRING_VALID(content_info->media_meta.content_name)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.content_name, content_info->media_meta.content_name);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy content_name failed");
- }
-
- if (STRING_VALID(content_info->media_meta.age_rating)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.age_rating, content_info->media_meta.age_rating);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy age_rating failed");
- }
-
- if (STRING_VALID(content_info->media_meta.author)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.author, content_info->media_meta.author);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy author failed");
- }
-
- if (STRING_VALID(content_info->media_meta.provider)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.provider, content_info->media_meta.provider);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy provider failed");
- }
+ /* Already filled in _media_svc_set_media_info() */
+ SAFE_FREE(new_content_info->file_name);
+ new_content_info->file_name = g_strdup(content_info->file_name);
+ }
+ new_content_info->media_meta.title = g_strdup(content_info->media_meta.title);
+ new_content_info->media_meta.album = g_strdup(content_info->media_meta.album);
+ new_content_info->media_meta.artist = g_strdup(content_info->media_meta.artist);
+ new_content_info->media_meta.genre = g_strdup(content_info->media_meta.genre);
+ new_content_info->media_meta.composer = g_strdup(content_info->media_meta.composer);
+ new_content_info->media_meta.year = g_strdup(content_info->media_meta.year);
+ new_content_info->media_meta.recorded_date = g_strdup(content_info->media_meta.recorded_date);
+ new_content_info->media_meta.copyright = g_strdup(content_info->media_meta.copyright);
+ new_content_info->media_meta.track_num = g_strdup(content_info->media_meta.track_num);
+ new_content_info->media_meta.description = g_strdup(content_info->media_meta.description);
+ new_content_info->media_meta.weather = g_strdup(content_info->media_meta.weather);
+ new_content_info->media_meta.category = g_strdup(content_info->media_meta.category);
+ new_content_info->media_meta.keyword = g_strdup(content_info->media_meta.keyword);
+ new_content_info->media_meta.location_tag = g_strdup(content_info->media_meta.location_tag);
+ new_content_info->media_meta.content_name = g_strdup(content_info->media_meta.content_name);
+ new_content_info->media_meta.age_rating = g_strdup(content_info->media_meta.age_rating);
+ new_content_info->media_meta.author = g_strdup(content_info->media_meta.author);
+ new_content_info->media_meta.provider = g_strdup(content_info->media_meta.provider);
if (STRING_VALID(content_info->media_meta.datetaken)) {
- ret = __media_svc_malloc_and_strncpy(&new_content_info->media_meta.datetaken, content_info->media_meta.datetaken);
- if (ret != MS_MEDIA_ERR_NONE)
- media_svc_error("strcpy datetaken failed");
+ new_content_info->media_meta.datetaken = g_strdup(content_info->media_meta.datetaken);
new_content_info->timeline = __media_svc_get_timeline_from_str(content_info->media_meta.datetaken);
if (new_content_info->timeline == 0) {
}
}
- //new_content_info->media_meta.bitrate = content_info->media_meta.bitrate;
- //new_content_info->media_meta.samplerate = content_info->media_meta.samplerate;
- //new_content_info->media_meta.channel = content_info->media_meta.channel;
- //new_content_info->media_meta.orientation = content_info->media_meta.orientation;
+ new_content_info->media_meta.is_360 = content_info->media_meta.is_360;
+ /* new_content_info->media_meta.bitrate = content_info->media_meta.bitrate; */
+ /* new_content_info->media_meta.samplerate = content_info->media_meta.samplerate; */
+ /* new_content_info->media_meta.channel = content_info->media_meta.channel; */
+ /* new_content_info->media_meta.orientation = content_info->media_meta.orientation; */
if (content_info->media_meta.longitude != MEDIA_SVC_DEFAULT_GPS_VALUE)
new_content_info->media_meta.longitude = content_info->media_meta.longitude;
new_content_info->media_meta.rating = content_info->media_meta.rating;
- return 0;
+ return MS_MEDIA_ERR_NONE;
}
int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_svc_content_info_s *content_info, uid_t uid)
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;
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) {
- /*Do nothing.*/
- } 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);
-
- /* Extracting thumbnail */
- int ini_val = _media_svc_get_ini_value();
- if (ini_val == 1) {
- 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;
+ 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);
- 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);
- }
+ media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info);
- if (_new_content_info.media_meta.width <= 0)
- _new_content_info.media_meta.width = width;
+ /* 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, };
- if (_new_content_info.media_meta.height <= 0)
- _new_content_info.media_meta.height = height;
- }
- }
+ ret = _media_svc_request_thumbnail(_new_content_info.path, thumb_path, sizeof(thumb_path), uid);
+ if (ret == MS_MEDIA_ERR_NONE)
+ _new_content_info.thumbnail_path = g_strdup(thumb_path);
}
}
/* Set or Get folder id */
ret = _media_svc_get_and_append_folder_id_by_path(handle, _new_content_info.storage_uuid, _new_content_info.path, _new_content_info.storage_type, folder_uuid, uid);
- media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
- ret = __media_svc_malloc_and_strncpy(&_new_content_info.folder_uuid, folder_uuid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &_new_content_info);
+ _new_content_info.folder_uuid = g_strdup(folder_uuid);
+ media_svc_retv_del_if(_new_content_info.folder_uuid == NULL, MS_MEDIA_ERR_INTERNAL, &_new_content_info);
+
/* register album table data */
int album_id = 0;
_new_content_info.album_id = album_id;
append_album = FALSE;
- if ((!strncmp(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))) ||
- (!strncmp(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN)))) {
-
+ if ((!g_strcmp0(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) ||
+ (!g_strcmp0(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN))) {
media_svc_debug("Unknown album or artist already exists. Extract thumbnail for Unknown.");
} else {
}
if (append_album == TRUE) {
-
- if ((strncmp(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))) &&
- (strncmp(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN, strlen(MEDIA_SVC_TAG_UNKNOWN))))
+ if ((g_strcmp0(_new_content_info.media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) &&
+ (g_strcmp0(_new_content_info.media_meta.artist, MEDIA_SVC_TAG_UNKNOWN)))
ret = _media_svc_append_album(handle, _new_content_info.media_meta.album, _new_content_info.media_meta.artist, _new_content_info.thumbnail_path, &album_id, uid);
else
ret = _media_svc_append_album(handle, _new_content_info.media_meta.album, _new_content_info.media_meta.artist, NULL, &album_id, uid);
/* Insert to db - calling _media_svc_insert_item_with_data */
ret = _media_svc_insert_item_with_data(db_handle, _new_content_info.storage_uuid, &_new_content_info, FALSE, FALSE, uid);
- if (ret == MS_MEDIA_ERR_NONE) {
+ if (ret == MS_MEDIA_ERR_NONE)
media_svc_debug("Insertion is successful.");
- }
- if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) {
+ if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL)
media_svc_error("This item is already inserted. This may be normal operation because other process already did this");
- }
_media_svc_destroy_content_info(&_new_content_info);
return _media_svc_get_mmc_info(db_handle, storage_name, storage_path, validity, info_exist);
}
-int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity)
+int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid)
{
sqlite3 * db_handle = (sqlite3 *)handle;
media_svc_retvm_if(storage_path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_path is NULL");
media_svc_retvm_if(validity == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "validity is NULL");
- return _media_svc_check_storage(db_handle, storage_id, storage_name, storage_path, validity);
+ return _media_svc_check_storage(db_handle, storage_id, storage_path, validity, uid);
}
int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid)
return _media_svc_update_storage_path(db_handle, storage_id, storage_path, uid);
}
-int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid)
+int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
media_svc_retvm_if(storage_path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_path is NULL");
- media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
- ret = _media_svc_append_storage(db_handle, storage_id, storage_name, storage_path, storage_account, storage_type, uid);
+ ret = _media_svc_append_storage(storage_id, storage_name, storage_path, storage_type, uid);
media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "append storage failed : %d", ret);
if (strcmp(storage_id, MEDIA_SVC_DB_TABLE_MEDIA)) {
- ret = _media_svc_create_media_table_with_id(db_handle, storage_id, uid);
+ ret = _media_svc_create_media_table_with_id(storage_id, uid);
media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "create media table failed : %d", ret);
ret = _media_svc_update_media_view(db_handle, uid);
return ret;
}
-int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, uid_t uid)
+int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
sqlite3 *db_handle = (sqlite3 *)handle;
media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
ret = _media_svc_get_storage_type(db_handle, storage_id, &storage_type);
- media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_storage_type_by_path failed : %d", ret);
+ media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_storage_type failed : %d", ret);
- ret = _media_svc_delete_storage(db_handle, storage_id, storage_name, uid);
+ ret = _media_svc_delete_storage(storage_id, uid);
media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "remove storage failed : %d", ret);
- ret = _media_svc_delete_folder_by_storage_id(db_handle, storage_id, storage_type, uid);
- if (ret != MS_MEDIA_ERR_NONE) {
+ ret = _media_svc_delete_folder_by_storage_id(storage_id, storage_type, uid);
+ 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) {
- ret = _media_svc_drop_media_table(db_handle, storage_id, uid);
+ ret = _media_svc_drop_media_table(storage_id, uid);
media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "drop table failed : %d", ret);
ret = _media_svc_update_media_view(db_handle, uid);
return ret;
}
-int media_svc_insert_folder_begin(MediaSvcHandle *handle, int data_cnt)
+int media_svc_insert_folder_begin(int data_cnt)
{
- sqlite3 * db_handle = (sqlite3 *)handle;
-
media_svc_debug("Transaction data count : [%d]", data_cnt);
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
g_media_svc_insert_folder_data_cnt = data_cnt;
return MS_MEDIA_ERR_NONE;
}
-int media_svc_insert_folder_end(MediaSvcHandle *handle, uid_t uid)
+int media_svc_insert_folder_end(uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 * db_handle = (sqlite3 *)handle;
media_svc_debug_fenter();
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
- if (g_media_svc_insert_folder_cur_data_cnt > 0) {
-
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
- }
+ if (g_media_svc_insert_folder_cur_data_cnt > 0)
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
g_media_svc_insert_folder_data_cnt = 1;
g_media_svc_insert_folder_cur_data_cnt = 0;
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is 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(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
if (g_media_svc_insert_folder_data_cnt == 1) {
ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, TRUE, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
g_media_svc_insert_folder_cur_data_cnt = 0;
return ret;
}
-int media_svc_delete_invalid_folder(MediaSvcHandle *handle, const char *storage_id, uid_t uid)
+int media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid)
{
int ret = MS_MEDIA_ERR_NONE;
- sqlite3 * db_handle = (sqlite3 *)handle;
- media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-
- ret = _media_svc_delete_invalid_folder(db_handle, storage_id, uid);
+ ret = _media_svc_delete_invalid_folder(storage_id, storage_type, uid);
return ret;
}
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is 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(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+ media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
media_svc_content_info_s content_info;
memset(&content_info, 0, sizeof(media_svc_content_info_s));
return ret;
}
- //media_svc_debug("total %d, cur %d insert flag %d", g_media_svc_insert_item_data_cnt, g_media_svc_insert_item_cur_data_cnt, g_insert_with_noti);
-
/*Set or Get folder id*/
ret = _media_svc_get_and_append_folder_id_by_path(db_handle, storage_id, path, storage_type, folder_uuid, uid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
- ret = __media_svc_malloc_and_strncpy(&content_info.folder_uuid, folder_uuid);
- media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
+ content_info.folder_uuid = g_strdup(folder_uuid);
+ media_svc_retv_del_if(content_info.folder_uuid == NULL, MS_MEDIA_ERR_INTERNAL, &content_info);
if (g_media_svc_insert_item_data_cnt == 1) {
if (g_insert_with_noti)
_media_svc_insert_item_to_noti_list(&content_info, g_media_svc_insert_item_cur_data_cnt);
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_INSERT_ITEM, uid);
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_ITEM, uid);
media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
media_svc_debug("_media_svc_list_query_do over");
GArray *db_data_array = NULL;
media_svc_item_info_s *db_data = NULL;
int idx = 0;
- char *sql = NULL;
media_svc_debug_fenter();
media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
- media_svc_retvm_if(__media_svc_check_storage(storage_type, FALSE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
- if (scan_type == MS_MSG_DIRECTORY_SCANNING) {
- sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 AND title IS NULL AND path LIKE '%q/%%'", storage_id, extract_path);
- } else if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE) {
- char folder_uuid[MEDIA_SVC_UUID_SIZE+1] = {0, };
+ if ((storage_type != MEDIA_SVC_STORAGE_INTERNAL) && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL) && (storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB)) {
+ media_svc_error("storage type is incorrect[%d]", storage_type);
+ return MS_MEDIA_ERR_INVALID_PARAMETER;
+ }
+
+ db_data_array = g_array_new(FALSE, FALSE, sizeof(media_svc_item_info_s*));
+ if (db_data_array == NULL) {
+ media_svc_error("db_data_array is NULL. Out of memory");
+ return MS_MEDIA_ERR_OUT_OF_MEMORY;
+ }
+
+ char *sql;
+ char folder_uuid[MEDIA_SVC_UUID_SIZE+1] = {0,};
+ if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE)
ret = _media_svc_get_folder_id_by_foldername(handle, storage_id, extract_path, folder_uuid, uid);
- media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
- sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 AND title IS NULL AND folder_uuid = '%q'", storage_id, folder_uuid);
- } else { /*Storage Scanning*/
- sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 AND title IS NULL", storage_id);
+ if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE && ret == MS_MEDIA_ERR_NONE) {
+ media_svc_error("folder no recursive extract");
+ if (is_burst == 1)
+ sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 AND title IS NULL and folder_uuid = '%q' ", storage_id, folder_uuid);
+ else
+ sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 AND title IS NULL and folder_uuid = '%q' LIMIT %d", storage_id, folder_uuid, BATCH_REQUEST_MAX);
+ } else if (scan_type == MS_MSG_DIRECTORY_SCANNING) {
+ media_svc_error("folder recursive extract");
+ if (is_burst == 1)
+ sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 and title IS NULL and path LIKE '%q%%' ", storage_id, extract_path);
+ else
+ sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 and title IS NULL and path LIKE '%q%%' LIMIT %d", storage_id, extract_path, BATCH_REQUEST_MAX);
+ } else {
+ if (is_burst == 1)
+ sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 and title IS NULL", storage_id);
+ else
+ sql = sqlite3_mprintf("SELECT path, media_type FROM '%s' WHERE validity = 1 and title IS NULL LIMIT %d", storage_id, BATCH_REQUEST_MAX);
}
ret = _media_svc_sql_prepare_to_step_simple(handle, sql, &sql_stmt);
if (ret != MS_MEDIA_ERR_NONE) {
media_svc_error("error when get list. err = [%d]", ret);
+ g_array_free(db_data_array, FALSE);
return ret;
}
- db_data_array = g_array_new(FALSE, FALSE, sizeof(media_svc_item_info_s*));
- if (db_data_array == NULL) {
- media_svc_error("db_data_array is NULL. Out of memory");
- return MS_MEDIA_ERR_OUT_OF_MEMORY;
- }
-
while (sqlite3_step(sql_stmt) == SQLITE_ROW) {
db_data = NULL;
db_data = malloc(sizeof(media_svc_item_info_s));
}
SQLITE3_FINALIZE(sql_stmt);
+ media_svc_error("Insert Pass 2 get %d items!", db_data_array->len);
while (db_data_array->len != 0) {
db_data = NULL;
}
media_type = db_data->media_type;
- media_svc_debug("path is %s, media type %d", db_data->path, media_type);
+ /* media_svc_debug("path is %s, media type %d", db_data->path, media_type); */
memset(&content_info, 0, sizeof(media_svc_content_info_s));
- __media_svc_malloc_and_strncpy(&content_info.path, db_data->path);
+ content_info.path = g_strdup(db_data->path);
content_info.media_type = media_type;
content_info.storage_type = storage_type;
_media_svc_set_default_value(&content_info, FALSE);
- if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER) {
- /*Do nothing.*/
- } else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) {
+ if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
+ || (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA))
+ 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, &content_info);
- } else {
+ else
ret = _media_svc_extract_media_metadata(db_handle, &content_info, uid);
- }
- ret = _media_svc_insert_item_pass2(db_handle, storage_id, &content_info, is_burst, TRUE, uid);
+ ret = _media_svc_insert_item_pass2(storage_id, &content_info, is_burst, TRUE, uid);
_media_svc_destroy_content_info(&content_info);
SAFE_FREE(db_data->path);
idx++;
}
- if (idx > 0)
- ret = _media_svc_list_query_do(db_handle, MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
+ if (idx > 0) {
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
+ if (0) {
+ _media_svc_publish_noti_list(idx);
+ _media_svc_destroy_noti_list(idx);
+
+ /* Recreate noti list */
+ ret = _media_svc_create_noti_list(idx);
+ }
+ }
+
+ while (db_data_array->len != 0) {
+ db_data = NULL;
+ db_data = g_array_index(db_data_array, media_svc_item_info_s*, 0);
+ g_array_remove_index(db_data_array, 0);
+
+ if (db_data) {
+ SAFE_FREE(db_data->path);
+ free(db_data);
+ db_data = NULL;
+ }
+ }
g_array_free(db_data_array, FALSE);
db_data_array = NULL;
return MS_MEDIA_ERR_NONE;
}
+int media_svc_get_folder_scan_status(MediaSvcHandle *handle, const char *storage_id, const char *path, int *storage_status)
+{
+ int ret = MS_MEDIA_ERR_NONE;
+ sqlite3 * db_handle = (sqlite3 *)handle;
+
+ media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
+ media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+
+ ret = _media_svc_get_folder_scan_status(db_handle, storage_id, path, storage_status);
+
+ return ret;
+}
+
+int media_svc_set_folder_scan_status(const char *storage_id, const char *path, int storage_status, uid_t uid)
+{
+ int ret = MS_MEDIA_ERR_NONE;
+
+ ret = _media_svc_set_folder_scan_status(storage_id, path, storage_status, uid);
+
+ return ret;
+}
+
+int media_svc_get_folder_modified_time(MediaSvcHandle *handle, const char *path, const char *storage_id, bool *modified)
+{
+ int ret = MS_MEDIA_ERR_NONE;
+ sqlite3 * db_handle = (sqlite3 *)handle;
+ time_t modified_time = 0;
+ int system_time = 0;
+
+ media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
+
+ ret = _media_svc_get_folder_modified_time_by_path(db_handle, path, storage_id, &modified_time);
+
+ system_time = _media_svc_get_file_time(path);
+ media_svc_error("modified_time = [%ld], system_time = [%d], path = [%s]", modified_time, system_time, path);
+
+ if (system_time != modified_time && system_time != 0)
+ *modified = TRUE;
+ else
+ *modified = FALSE;
+
+ return ret;
+}
+
+int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, char ***folder_list, int *count)
+{
+ sqlite3 * db_handle = (sqlite3 *)handle;
+
+ media_svc_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
+ media_svc_retvm_if(count == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "count is NULL");
+
+ return _media_svc_get_null_scan_folder_list(db_handle, storage_id, folder_path, folder_list, count);
+}
+
+int media_svc_change_validity_item_batch(const char *storage_id, const char *path, int des_validity, int src_validity, uid_t uid)
+{
+ media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
+ media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+
+ return _media_svc_change_validity_item_batch(storage_id, path, des_validity, src_validity, uid);
+}
+
int media_svc_delete_invalid_folder_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid, int *delete_count)
{
int ret = MS_MEDIA_ERR_NONE;
return ret;
}
+int media_svc_append_query(const char *query, uid_t uid)
+{
+ int ret = MS_MEDIA_ERR_NONE;
+
+ media_svc_retvm_if(query == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "query is NULL");
+
+ ret = _media_svc_append_query_list(query, uid);
+
+ return ret;
+}
+
+int media_svc_send_query(uid_t uid)
+{
+ int ret = MS_MEDIA_ERR_NONE;
+
+ ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_COMMON, uid);
+
+ return ret;
+}
+
+int media_svc_get_media_type(const char *path, int *mediatype)
+{
+ media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+
+ return _media_svc_get_media_type(path, mediatype);
+}
+
+
projects / platform / core / multimedia / libmedia-service.git / blobdiff