Remove useless __media_svc_get_title_from_filepath() call to make title. 02/136402/2
authorHaejeong Kim <backto.kim@samsung.com>
Thu, 29 Jun 2017 09:33:54 +0000 (18:33 +0900)
committerHaejeong Kim <backto.kim@samsung.com>
Fri, 30 Jun 2017 01:43:47 +0000 (10:43 +0900)
Default title is already set in _media_svc_set_default_value(), so don't need to make title again

Change-Id: I7a94346d87869ed2a8bfb07d08a93e0d66e3c0f4

src/common/media-svc-util.c

index e82cf46..b10d8f6 100755 (executable)
@@ -1562,7 +1562,6 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
        int extracted_field = MEDIA_SVC_EXTRACTED_FIELD_NONE;
        int mmf_error = FILEINFO_ERROR_NONE;
        char *err_attr_name = NULL;
-       char *title = NULL;
        int album_id = 0;
        int ret = MS_MEDIA_ERR_NONE;
 
@@ -1646,30 +1645,6 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
                                                break;
                                        }
                                }
-
-                               if (idx == size) {
-                                       media_svc_debug("Can't extract title. All string is space");
-                                       title = __media_svc_get_title_from_filepath(content_info->path);
-                                       if (title) {
-                                               ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title);
-                                               if (ret != MS_MEDIA_ERR_NONE)
-                                                       media_svc_error("strcpy error");
-                                               SAFE_FREE(title);
-                                       } else {
-                                               media_svc_error("Can't extract title");
-                                       }
-                               }
-                       }
-               } else {
-                       SAFE_FREE(err_attr_name);
-                       title = __media_svc_get_title_from_filepath(content_info->path);
-                       if (title) {
-                               ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title);
-                               if (ret != MS_MEDIA_ERR_NONE)
-                                       media_svc_error("strcpy error");
-                               SAFE_FREE(title);
-                       } else {
-                               media_svc_error("Can't extract title");
                        }
                }
 
@@ -1711,20 +1686,6 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
                if (mmf_error != FILEINFO_ERROR_NONE)
                        media_svc_error("fail to free tag attr - err(%x)", mmf_error);
        } else {
-               /* in case of file size 0, MMFW Can't parsting tag info but add it to Music DB. */
-               char *no_tag_title = NULL;
-               media_svc_error("no tag information");
-
-               no_tag_title = __media_svc_get_title_from_filepath(content_info->path);
-               if (no_tag_title) {
-                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, no_tag_title);
-                       if (ret != MS_MEDIA_ERR_NONE)
-                               media_svc_error("strcpy error");
-                       SAFE_FREE(no_tag_title);
-               } else {
-                       media_svc_error("Can't extract title");
-               }
-
                content_info->album_id = album_id;
        }
 
@@ -1741,7 +1702,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
        int extracted_field = MEDIA_SVC_EXTRACTED_FIELD_NONE;
        int mmf_error = FILEINFO_ERROR_NONE;
        char *err_attr_name = NULL;
-       char *title = NULL;
        bool extract_thumbnail = FALSE;
        bool append_album = FALSE;
        int album_id = 0;
@@ -1830,30 +1790,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                                                break;
                                        }
                                }
-
-                               if (idx == size) {
-                                       media_svc_debug("Can't extract title. All string is space");
-                                       title = __media_svc_get_title_from_filepath(content_info->path);
-                                       if (title) {
-                                               ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title);
-                                               if (ret != MS_MEDIA_ERR_NONE)
-                                                       media_svc_error("strcpy error");
-                                               SAFE_FREE(title);
-                                       } else {
-                                               media_svc_error("Can't extract title");
-                                       }
-                               }
-                       }
-               } else {
-                       SAFE_FREE(err_attr_name);
-                       title = __media_svc_get_title_from_filepath(content_info->path);
-                       if (title) {
-                               ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title);
-                               if (ret != MS_MEDIA_ERR_NONE)
-                                       media_svc_error("strcpy error");
-                               SAFE_FREE(title);
-                       } else {
-                               media_svc_error("Can't extract title");
                        }
                }
 
@@ -2096,20 +2032,6 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                if (mmf_error != FILEINFO_ERROR_NONE)
                        media_svc_error("fail to free tag attr - err(%x)", mmf_error);
        }       else {
-               /* in case of file size 0, MMFW Can't parsting tag info but add it to Music DB. */
-               char *no_tag_title = NULL;
-               media_svc_error("no tag information");
-
-               no_tag_title = __media_svc_get_title_from_filepath(content_info->path);
-               if (no_tag_title) {
-                       ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, no_tag_title);
-                       if (ret != MS_MEDIA_ERR_NONE)
-                               media_svc_error("strcpy error");
-                       SAFE_FREE(no_tag_title);
-               } else {
-                       media_svc_error("Can't extract title");
-               }
-
                content_info->album_id = album_id;
        }