Improve msc_metadata_update

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-media.c

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 365c885..0fe9de4 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -46,7 +46,7 @@ int _media_svc_count_record_with_path(sqlite3 *handle, const char *storage_id, c
        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");
 
-       sql = sqlite3_mprintf("SELECT count(*) FROM '%q' WHERE MEDIA_path='%q'", storage_id, path);
+       sql = sqlite3_mprintf("SELECT count(*) FROM '%q' WHERE media_path='%q'", storage_id, path);
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
@@ -66,7 +66,7 @@ int _media_svc_get_modified_time(sqlite3 *handle, const char *storage_id, const
        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");
 
-       sql = sqlite3_mprintf("SELECT media_modified_time FROM '%q' WHERE MEDIA_path='%q'", storage_id, path);
+       sql = sqlite3_mprintf("SELECT media_modified_time FROM '%q' WHERE media_path='%q'", storage_id, path);
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
@@ -77,7 +77,7 @@ int _media_svc_get_modified_time(sqlite3 *handle, const char *storage_id, const
        return MS_MEDIA_ERR_NONE;
 }
 
-int _media_svc_insert_item_with_data(sqlite3 *handle, bool is_direct, const char *storage_id, media_svc_content_info_s *content_info, bool stack_query, uid_t uid)
+int _media_svc_insert_item_with_data(bool is_direct, const char *storage_id, media_svc_content_info_s *content_info, bool stack_query, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
@@ -233,31 +233,7 @@ int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info)
        char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
        SQLITE3_SAFE_FREE(test_sql);
 
-       /*Update Pinyin If Support Pinyin*/
-       if (_media_svc_check_pinyin_support()) {
-               if (STRING_VALID(content_info->file_name))
-                       _media_svc_get_pinyin_str(content_info->file_name, &content_info->file_name_pinyin);
-               if (STRING_VALID(content_info->media_meta.title))
-                       _media_svc_get_pinyin_str(content_info->media_meta.title, &content_info->media_meta.title_pinyin);
-               if (STRING_VALID(content_info->media_meta.album))
-                       _media_svc_get_pinyin_str(content_info->media_meta.album, &content_info->media_meta.album_pinyin);
-               if (STRING_VALID(content_info->media_meta.artist))
-                       _media_svc_get_pinyin_str(content_info->media_meta.artist, &content_info->media_meta.artist_pinyin);
-               if (STRING_VALID(content_info->media_meta.album_artist))
-                       _media_svc_get_pinyin_str(content_info->media_meta.album_artist, &content_info->media_meta.album_artist_pinyin);
-               if (STRING_VALID(content_info->media_meta.genre))
-                       _media_svc_get_pinyin_str(content_info->media_meta.genre, &content_info->media_meta.genre_pinyin);
-               if (STRING_VALID(content_info->media_meta.composer))
-                       _media_svc_get_pinyin_str(content_info->media_meta.composer, &content_info->media_meta.composer_pinyin);
-               if (STRING_VALID(content_info->media_meta.copyright))
-                       _media_svc_get_pinyin_str(content_info->media_meta.copyright, &content_info->media_meta.copyright_pinyin);
-               if (STRING_VALID(content_info->media_meta.description))
-                       _media_svc_get_pinyin_str(content_info->media_meta.description, &content_info->media_meta.description_pinyin);
-       }
-
-       char *sql = sqlite3_mprintf("UPDATE '%q' SET media_title=%Q, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, media_composer=%Q, media_copyright=%Q, media_description=%Q, \
-               media_file_name_pinyin=%Q, media_title_pinyin=%Q, media_album_pinyin=%Q, media_artist_pinyin=%Q, media_album_artist_pinyin=%Q, media_genre_pinyin=%Q, media_composer_pinyin=%Q, media_copyright_pinyin=%Q, media_description_pinyin=%Q \
-               WHERE path=%Q;",
+       char *sql = sqlite3_mprintf("UPDATE '%q' SET media_title=%Q, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, media_composer=%Q, media_copyright=%Q, media_description=%Q WHERE media_path=%Q;",
                                content_info->storage_uuid,
                                content_info->media_meta.title,
                                content_info->media_meta.album,
@@ -267,15 +243,6 @@ int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info)
                                content_info->media_meta.composer,
                                content_info->media_meta.copyright,
                                content_info->media_meta.description,
-                               content_info->file_name_pinyin,
-                               content_info->media_meta.title_pinyin,
-                               content_info->media_meta.album_pinyin,
-                               content_info->media_meta.artist_pinyin,
-                               content_info->media_meta.album_artist_pinyin,
-                               content_info->media_meta.genre_pinyin,
-                               content_info->media_meta.composer_pinyin,
-                               content_info->media_meta.copyright_pinyin,
-                               content_info->media_meta.description_pinyin,
                                content_info->path
                                );
 
@@ -365,8 +332,8 @@ int _media_svc_update_item_with_data(bool is_direct, const char *storage_id, med
                _media_svc_sql_query_add(&g_media_svc_insert_item_query_list, &sql);
        } else {
                ret = _media_svc_sql_query(sql, uid);
+               SQLITE3_SAFE_FREE(sql);
        }
-       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -544,9 +511,6 @@ int _media_svc_list_query_do(media_svc_query_type_e query_type, uid_t uid)
        case MEDIA_SVC_QUERY_UPDATE_ITEM:
                ret = _media_svc_sql_query_list_direct(&g_media_svc_update_item_query_list, uid);
                break;
-       case MEDIA_SVC_QUERY_INSERT_FOLDER:
-               ret = _media_svc_sql_query_list_direct(_media_svc_get_folder_list_ptr(), uid);
-               break;
        default:
                media_svc_error("Wrong type[%d]", query_type);
                return MS_MEDIA_ERR_INVALID_PARAMETER;
@@ -571,6 +535,34 @@ int _media_svc_append_query_list(const char *query, uid_t uid)
        return ret;
 }
 
+int _media_svc_get_media(sqlite3 *handle, const char *sql, GArray **path_list)
+{
+       int ret = MS_MEDIA_ERR_NONE;
+       sqlite3_stmt *sql_stmt = NULL;
+       media_svc_file_s *file_info = NULL;
+
+       media_svc_retvm_if(!sql, MS_MEDIA_ERR_INVALID_PARAMETER, "query is NULL");
+       media_svc_retvm_if(!path_list, MS_MEDIA_ERR_INVALID_PARAMETER, "array is NULL");
+
+       ret = _media_svc_sql_prepare_to_step_simple(handle, sql, &sql_stmt);
+       media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_sql_prepare_to_step_simple() failed [%d]", ret);
+       while (sqlite3_step(sql_stmt) == SQLITE_ROW) {
+               file_info = malloc(sizeof(media_svc_file_s));
+               if (!file_info) {
+                       media_svc_error("Allcation failed");
+                       continue;
+               }
+
+               SAFE_STRLCPY(file_info->path, (char *)sqlite3_column_text(sql_stmt, 0), sizeof(file_info->path));
+               SAFE_STRLCPY(file_info->storage_id, (char *)sqlite3_column_text(sql_stmt, 1), sizeof(file_info->storage_id));
+               g_array_append_val(*path_list, file_info);
+       }
+
+       SQLITE3_FINALIZE(sql_stmt);
+
+       return ret;
+}
+
 int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char *path, media_svc_noti_item **item)
 {
        int ret = MS_MEDIA_ERR_NONE;