Modify the procedure for extracting media metadata

As:
Check album info -> Extract album art
To be:
Extract album art -> Check album info

For categorize extract type and reduce the extra flags, modify the procedure

Change-Id: I829a9bfc13ebd1d59a6312256ce91d7bab9c1832
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index e7e93fa..dd81101 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version: 0.3.22
+Version: 0.3.23
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0 and PD

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 26112f7..2c62a2f 100755 (executable)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -1520,8 +1520,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
        unsigned int size = 0;
        int mmf_error = FILEINFO_ERROR_NONE;
        char *err_attr_name = NULL;
-       bool extract_thumbnail = FALSE;
-       bool append_album = FALSE;
        int album_id = 0;
        int ret = MS_MEDIA_ERR_NONE;
        int cdis_value = 0;
@@ -1688,39 +1686,8 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                        content_info->media_meta.rating = 0;
                }
 
-               /*Initialize album_id to 0. below code will set the album_id*/
-               content_info->album_id = album_id;
-               ret = _media_svc_get_album_id(handle, content_info->media_meta.album, content_info->media_meta.artist, &album_id);
-
-               if (ret != MS_MEDIA_ERR_NONE) {
-                       if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
-                               media_svc_debug("album does not exist. So start to make album art");
-                               extract_thumbnail = TRUE;
-                               append_album = TRUE;
-                       } else {
-                               extract_thumbnail = TRUE;
-                               append_album = FALSE;
-                       }
-               } else {
-                       content_info->album_id = album_id;
-                       append_album = FALSE;
-
-                       if ((!g_strcmp0(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) ||
-                               (!g_strcmp0(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN))) {
-                               media_svc_debug("Unknown album or artist already exists. Extract thumbnail for Unknown.");
-                               extract_thumbnail = TRUE;
-                       } else {
-                               media_svc_debug("album already exists. don't need to make album art");
-                               ret = _media_svc_get_album_art_by_album_id(handle, album_id, &content_info->thumbnail_path);
-                               extract_thumbnail = TRUE;
-                       }
-               }
-
                /*Do not extract artwork for the USB Storage content*/
-               if (content_info->storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB)
-                       extract_thumbnail = FALSE;
-
-               if (extract_thumbnail == TRUE) {
+               if (content_info->storage_type != MEDIA_SVC_STORAGE_EXTERNAL_USB) {
                        mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ARTWORK, &image, &size, NULL);
                        if (mmf_error != FILEINFO_ERROR_NONE) {
                                media_svc_error("fail to get tag artwork - err(%x)", mmf_error);
@@ -1766,13 +1733,21 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                        }
                }
 
-               if (append_album == TRUE) {
-                       if ((g_strcmp0(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) &&
-                               (g_strcmp0(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN)))
-                               ret = _media_svc_append_album(handle, content_info->media_meta.album, content_info->media_meta.artist, content_info->thumbnail_path, &album_id, uid);
-                       else
-                               ret = _media_svc_append_album(handle, content_info->media_meta.album, content_info->media_meta.artist, NULL, &album_id, uid);
+               /*Initialize album_id to 0. below code will set the album_id*/
+               content_info->album_id = album_id;
+               ret = _media_svc_get_album_id(handle, content_info->media_meta.album, content_info->media_meta.artist, &album_id);
+               if (ret != MS_MEDIA_ERR_NONE) {
+                       if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
+                               media_svc_debug("album does not exist. So start to make album art");
+                               if ((g_strcmp0(content_info->media_meta.album, MEDIA_SVC_TAG_UNKNOWN)) &&
+                                       (g_strcmp0(content_info->media_meta.artist, MEDIA_SVC_TAG_UNKNOWN)))
+                                       ret = _media_svc_append_album(handle, content_info->media_meta.album, content_info->media_meta.artist, content_info->thumbnail_path, &album_id, uid);
+                               else
+                                       ret = _media_svc_append_album(handle, content_info->media_meta.album, content_info->media_meta.artist, NULL, &album_id, uid);
 
+                               content_info->album_id = album_id;
+                       }
+               } else {
                        content_info->album_id = album_id;
                }