Merge valid_item functions

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

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 0819068..144ec58 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -78,7 +78,6 @@ int ms_set_folder_scan_status(sqlite3 *handle, const char *storage_id, const cha
 int ms_check_folder_modified(sqlite3 *handle, const char *path, const char *storage_id, bool *modified);
 int ms_get_null_scan_folder_list(sqlite3 *handle, const char *stroage_id, const char *path, GPtrArray **dir_array);
 int ms_change_validity_item_batch(sqlite3 *handle, const char *storage_id, const char *path, int des_validity, int src_validity, uid_t uid);
-int ms_scan_validate_item(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 #endif
 
 #endif /*_MEDIA_COMMON_DB_SVC_H_*/

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 9bb00e7..f261dd6 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -278,31 +278,11 @@ int ms_validate_item(sqlite3 *handle, const char *storage_id, const char *path,
 
        ret = __ms_check_item_exist(handle, storage_id, path, &modified);
        if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
-               ret = ms_insert_item_batch(handle, storage_id, path, uid);
-       } else if (ret == MS_MEDIA_ERR_NONE) {
-               if (!modified) {
-                       ret = ((SET_ITEM_VALIDITY)func_array[eSET_VALIDITY])(storage_id, path, true, true, uid);
-                       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "SET_ITEM_VALIDITY failed [%d]", ret);
-               } else {
-                       ret = ((REFRESH_ITEM)func_array[eREFRESH_ITEM])(handle, storage_id, path, uid);
-                       MS_DBG_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "REFRESH_ITEM failed [%d]", ret);
-               }
-       } else {
-               MS_DBG_ERR("check_item_exist failed [%d]", ret);
-       }
-
-       return ret;
-}
-
 #ifdef _USE_TVPD_MODE
-int ms_scan_validate_item(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       bool modified = false;
-
-       ret = __ms_check_item_exist(handle, storage_id, path, &modified);
-       if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
                ret = ms_scan_item_batch(handle, storage_id, path, uid);
+#else
+               ret = ms_insert_item_batch(handle, storage_id, path, uid);
+#endif
        } else if (ret == MS_MEDIA_ERR_NONE) {
                if (!modified) {
                        ret = ((SET_ITEM_VALIDITY)func_array[eSET_VALIDITY])(storage_id, path, true, true, uid);
@@ -317,7 +297,6 @@ int ms_scan_validate_item(sqlite3 *handle, const char *storage_id, const char *p
 
        return ret;
 }
-#endif
 
 int ms_validity_change_all_items(sqlite3 *handle, const char *storage_id, bool validity , uid_t uid)
 {

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 2fa62f1..4c1c124 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -306,7 +306,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, ch
                                if (!ms_check_support_media_type(path))
                                        continue;
 
-                               ret = ms_scan_validate_item(handle, storage_id, path, uid);
+                               ret = ms_validate_item(handle, storage_id, path, uid);
                                if (ret != MS_MEDIA_ERR_NONE) {
                                        MS_DBG_ERR("failed to update db : %d", ret);
                                        continue;
@@ -414,7 +414,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
        if (ms_insert_folder(handle, storage_id, new_start_path, uid) != MS_MEDIA_ERR_NONE)
                MS_DBG_ERR("insert folder failed");
 
-       scan_function = (scan_type == MS_MSG_STORAGE_ALL) ? ms_scan_item_batch : ms_scan_validate_item;
+       scan_function = (scan_type == MS_MSG_STORAGE_ALL) ? ms_scan_item_batch : ms_validate_item;
 
        ms_register_end(uid);