Remove extracted flag process

No longer needed.

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

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index b23983f..a18aaed 100755 (executable)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -130,21 +130,6 @@ static const char sound_mime_table[SOUND_MIME_NUM][MIME_LENGTH] = {
        "x-smaf",
 };
 
-typedef enum {
-       MEDIA_SVC_EXTRACTED_FIELD_NONE                  = 0x00000001,
-       MEDIA_SVC_EXTRACTED_FIELD_TITLE                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 1,
-       MEDIA_SVC_EXTRACTED_FIELD_DESC                  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 2,
-       MEDIA_SVC_EXTRACTED_FIELD_COPYRIGHT             = MEDIA_SVC_EXTRACTED_FIELD_NONE << 3,
-       MEDIA_SVC_EXTRACTED_FIELD_AUTHOR                = MEDIA_SVC_EXTRACTED_FIELD_NONE << 4,
-       MEDIA_SVC_EXTRACTED_FIELD_ARTIST                        = MEDIA_SVC_EXTRACTED_FIELD_NONE << 5,
-       MEDIA_SVC_EXTRACTED_FIELD_GENRE                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 6,
-       MEDIA_SVC_EXTRACTED_FIELD_ALBUM                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 7,
-       MEDIA_SVC_EXTRACTED_FIELD_TRACKNUM              = MEDIA_SVC_EXTRACTED_FIELD_NONE << 8,
-       MEDIA_SVC_EXTRACTED_FIELD_YEAR                  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 9,
-       MEDIA_SVC_EXTRACTED_FIELD_CATEGORY              = MEDIA_SVC_EXTRACTED_FIELD_NONE << 10,
-       MEDIA_SVC_EXTRACTED_FIELD_ALBUM_ARTIST  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 11,
-} media_svc_extracted_field_e;
-
 char *_media_info_generate_uuid(void)
 {
        uuid_t uuid_value;
@@ -1459,7 +1444,6 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
        MMHandleType tag = 0;
        char *p = NULL;
        int size = -1;
-       int extracted_field = MEDIA_SVC_EXTRACTED_FIELD_NONE;
        int mmf_error = FILEINFO_ERROR_NONE;
        char *err_attr_name = NULL;
        int album_id = 0;
@@ -1469,28 +1453,28 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
 
        if (mmf_error == FILEINFO_ERROR_NONE) {
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ALBUM, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_ALBUM)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.album = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ARTIST, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_ARTIST)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.artist = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ALBUM_ARTIST, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_ALBUM_ARTIST)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.album_artist = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_GENRE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_GENRE)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.genre = g_strdup(p);
 
                        /* If genre is Ringtone, it's categorized as sound. But this logic is commented */
@@ -1504,11 +1488,9 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_TITLE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        if (!isspace(*p)) {
                                content_info->media_meta.title = g_strdup(p);
-
-                               extracted_field |= MEDIA_SVC_EXTRACTED_FIELD_TITLE;
                        } else {
                                int idx = 0;
 
@@ -1527,24 +1509,22 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_DESCRIPTION, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_DESC)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.description = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_AUTHOR, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_AUTHOR)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.composer = g_strdup(p);
-                       extracted_field |= MEDIA_SVC_EXTRACTED_FIELD_AUTHOR;
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_COPYRIGHT, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_COPYRIGHT)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.copyright = g_strdup(p);
-                       extracted_field |= MEDIA_SVC_EXTRACTED_FIELD_COPYRIGHT;
                } else {
                        SAFE_FREE(err_attr_name);
                }
@@ -1566,7 +1546,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
        char *p = NULL;
        unsigned char *image = NULL;
        unsigned int size = 0;
-       int extracted_field = MEDIA_SVC_EXTRACTED_FIELD_NONE;
        int mmf_error = FILEINFO_ERROR_NONE;
        char *err_attr_name = NULL;
        bool extract_thumbnail = FALSE;
@@ -1582,28 +1561,28 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
 
        if (mmf_error == FILEINFO_ERROR_NONE) {
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ALBUM, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_ALBUM)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.album = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ARTIST, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_ARTIST)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.artist = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_ALBUM_ARTIST, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_ALBUM_ARTIST)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.album_artist = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_GENRE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_GENRE)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.genre = g_strdup(p);
 
                        /* If genre is Ringtone, it's categorized as sound. But this logic is commented */
@@ -1617,10 +1596,9 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_TITLE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        if (!isspace(*p)) {
                                content_info->media_meta.title = g_strdup(p);
-                               extracted_field |= MEDIA_SVC_EXTRACTED_FIELD_TITLE;
                        } else {
                                int idx = 0;
 
@@ -1639,7 +1617,7 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_DESCRIPTION, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_DESC)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.description = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
@@ -1691,30 +1669,28 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_AUTHOR, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_AUTHOR)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.composer = g_strdup(p);
-                       extracted_field |= MEDIA_SVC_EXTRACTED_FIELD_AUTHOR;
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_COPYRIGHT, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_COPYRIGHT)) && (mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.copyright = g_strdup(p);
-                       extracted_field |= MEDIA_SVC_EXTRACTED_FIELD_COPYRIGHT;
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_TRACK_NUM, &p, &size, NULL);
-               if ((mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        content_info->media_meta.track_num = g_strdup(p);
                } else {
                        SAFE_FREE(err_attr_name);
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_DATE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_YEAR)) && (mmf_error == FILEINFO_ERROR_NONE) && (size == 4)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size == 4) {
                        int year = 0;
                        if ((p != NULL) && ((ret != __media_svc_safe_atoi(p, &year)) == MS_MEDIA_ERR_NONE)) {
                                content_info->media_meta.year = g_strdup(p);
@@ -1726,7 +1702,7 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_RATING, &p, &size, NULL);
-               if ((mmf_error == FILEINFO_ERROR_NONE) && (size > 0)) {
+               if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
                        int rate = 0;
                        if (__media_svc_safe_atoi(p, &rate) == MS_MEDIA_ERR_NONE)
                                content_info->media_meta.rating = rate;