Apply definition for product mode code

Change-Id: Ia8a3cbebb5a50f16fc752e0831b853552f7ef8dd

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 21d67d2..dc116b0 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -36,89 +36,51 @@ typedef enum {
        MS_ITEM_UPDATE  = 2,
 } ms_noti_type_e;
 
-typedef int (*CLEANUP_DB)(sqlite3*, uid_t);
-typedef int (*INSERT_ITEM_BEGIN)(bool, int);
-typedef int (*INSERT_ITEM_END)(uid_t);
-
-typedef int (*SEND_DIR_UPDATE_NOTI)(const char *, const char *, int, int);
-typedef int (*INSERT_ITEM)(sqlite3 *, const char *, const char *, int, uid_t);
-typedef int (*SET_ITEM_VALIDITY)(const char *, const char *, int, int, uid_t);
-typedef int (*DELETE_ALL_INVALID_ITEMS_IN_FOLDER)(sqlite3 *, const char *, const char *, bool, uid_t);
-typedef int (*UPDATE_FOLDER_TIME)(sqlite3 *, const char *, const char *, uid_t);
-typedef int (*GET_STORAGE_ID)(sqlite3 *, const char *, char *, uid_t uid);
-typedef int (*SET_STORAGE_SCAN_STATUS)(sqlite3 *, const char *, int, uid_t);
-typedef int (*INSERT_FOLDER)(sqlite3 *, const char *, const char *, int, uid_t);
-typedef int (*SET_FOLDER_VALIDITY)(sqlite3 *, const char *, const char *, int, bool, uid_t);
-typedef int (*INSERT_ITEM_SCAN)(sqlite3 *, const char *, const char *, int, uid_t);
-typedef int (*GET_FOLDER_SCAN_STATUS)(sqlite3 *, const char *, const char *, int *);
-typedef int (*SET_FOLDER_SCAN_STATUS)(sqlite3 *, const char *, const char *, int, uid_t);
-typedef int (*CHECK_FOLDER_MODIFIED)(sqlite3 *, const char *, const char *, bool *);
-typedef int (*GET_NULL_SCAN_FOLDER_LIST)(sqlite3 *, const char *, const char *, GPtrArray **);
-typedef int (*CHANGE_VALIDITY_ITEM_BATCH)(sqlite3 *, const char *, const char *, int, int, uid_t);
-
-typedef int (*CHECK_DB)(sqlite3*, uid_t);
-typedef int (*GET_UUID)(char **);
-typedef int (*CHECK_STORAGE)(sqlite3 *, const char *, char **, int *, uid_t);
-typedef int (*INSERT_STORAGE)(sqlite3 *, const char *, int, const char *, uid_t);
-typedef int (*UPDATE_STORAGE)(sqlite3 *, const char *, const char *, uid_t);
-typedef int (*SET_STORAGE_VALIDITY)(sqlite3 *, const char *, int, uid_t uid);
-typedef int (*SET_ALL_STORAGE_VALIDITY)(sqlite3 *, int, uid_t);
-
-typedef int (*UPDATE_ITEM_META)(sqlite3 *, uid_t);
-
-typedef int (*DELETE_INVALID_FOLDER_BY_PATH)(sqlite3 *, const char *, const char *, uid_t);
-typedef int (*CHECK_FOLDER_EXIST)(sqlite3*, const char*, const char*);
-typedef int (*GET_AND_EXTRACT_MEDIA)(sqlite3*, const char*, int, const char *);
-typedef int (*GET_MEDIA_TYPE)(const char *, int *);
-typedef int (*REFRESH_ITEM)(sqlite3 *, const char *, const char *, uid_t);
-
 int ms_load_functions(void);
 void ms_unload_functions(void);
 int ms_connect_db(sqlite3 **handle, uid_t uid);
 void ms_disconnect_db(sqlite3 *handle);
-int ms_cleanup_db(sqlite3 *handle, uid_t uid);
 int ms_validate_item(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_insert_item_batch(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_validity_change_all_items(sqlite3 *handle, const char *storage_id, bool validity, uid_t uid);
 int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid);
 int ms_set_folder_item_validity(sqlite3 *handle, const char *storage_id, const char *path, int validity, int recursive, uid_t uid);
-int ms_delete_invalid_items_in_folder(sqlite3 *handle, const char *storage_id, const char *path, bool is_recursive, uid_t uid);
 int ms_send_dir_update_noti(const char *path, const char *folder_id, ms_noti_type_e noti_type, int pid);
-int ms_update_folder_time(sqlite3 *handle, const char *storage_id, char *folder_path, uid_t uid);
 int ms_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t uid);
-int ms_set_storage_scan_status(sqlite3 *handle, char *storage_id, media_scan_status_e scan_status, uid_t uid);
 int ms_insert_folder(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int ms_delete_invalid_folder(const char *storage_id, uid_t uid);
 int ms_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
-int ms_scan_item_batch(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
-int ms_scan_validate_item(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
-int ms_get_folder_scan_status(sqlite3 *handle, const char *storage_id, const char *path, int *scan_status);
-int ms_set_folder_scan_status(sqlite3 *handle, const char *storage_id, const char *path, int scan_status, uid_t uid);
-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_check_db_upgrade(sqlite3 *handle, uid_t uid);
-int ms_genarate_uuid(char **uuid);
 int ms_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
 int ms_insert_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid);
 int ms_update_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid);
 int ms_set_storage_validity(sqlite3 *handle, const char *storage_id, int validity, uid_t uid);
 int ms_set_all_storage_validity(sqlite3 *handle, int validity, uid_t uid);
 int ms_update_meta_batch(sqlite3 *handle, uid_t uid);
-int ms_delete_invalid_folder_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path, uid_t uid);
 int ms_check_folder_exist(sqlite3 *handle, const char *storage_id, const char *folder_path);
 int ms_get_folder_id(sqlite3 *handle, const char *storage_id, const char *path, char **folder_id);
 int ms_get_media_type(const char *path, int *media_type);
 bool ms_check_support_media_type(const char *path);
-
-/* FOR BULK COMMIT */
 void ms_register_start(bool noti_status, int pid);
 void ms_register_end(uid_t uid);
-
-int ms_get_and_extract_media(sqlite3 *handle, const char *storage_id, int scan_type, const char *path);
-
 void ms_batch_commit_enable(bool noti_enable, int pid);
 void ms_batch_commit_disable(uid_t uid);
 
+#ifdef _USE_TVPD_MODE
+int ms_cleanup_db(sqlite3 *handle, uid_t uid);
+int ms_update_folder_time(sqlite3 *handle, const char *storage_id, char *folder_path, uid_t uid);
+int ms_set_storage_scan_status(sqlite3 *handle, char *storage_id, media_scan_status_e scan_status, uid_t uid);
+int ms_genarate_uuid(char **uuid);
+int ms_scan_item_batch(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
+int ms_get_and_extract_media(sqlite3 *handle, const char *storage_id, int scan_type, const char *path);
+int ms_delete_invalid_items_in_folder(sqlite3 *handle, const char *storage_id, const char *path, bool is_recursive, uid_t uid);
+int ms_delete_invalid_folder_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path, uid_t uid);
+int ms_get_folder_scan_status(sqlite3 *handle, const char *storage_id, const char *path, int *scan_status);
+int ms_set_folder_scan_status(sqlite3 *handle, const char *storage_id, const char *path, int scan_status, uid_t uid);
+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 12cfe3a..598ee4f 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -35,6 +35,42 @@ static void **func_array;
 static void *func_handle = NULL; /*dlopen handle */
 static int scan_other_type = -1;
 
+typedef int (*CLEANUP_DB)(sqlite3*, uid_t);
+typedef int (*INSERT_ITEM_BEGIN)(bool, int);
+typedef int (*INSERT_ITEM_END)(uid_t);
+
+typedef int (*SEND_DIR_UPDATE_NOTI)(const char *, const char *, int, int);
+typedef int (*INSERT_ITEM)(sqlite3 *, const char *, const char *, int, uid_t);
+typedef int (*SET_ITEM_VALIDITY)(const char *, const char *, int, int, uid_t);
+typedef int (*DELETE_ALL_INVALID_ITEMS_IN_FOLDER)(sqlite3 *, const char *, const char *, bool, uid_t);
+typedef int (*UPDATE_FOLDER_TIME)(sqlite3 *, const char *, const char *, uid_t);
+typedef int (*GET_STORAGE_ID)(sqlite3 *, const char *, char *, uid_t uid);
+typedef int (*SET_STORAGE_SCAN_STATUS)(sqlite3 *, const char *, int, uid_t);
+typedef int (*INSERT_FOLDER)(sqlite3 *, const char *, const char *, int, uid_t);
+typedef int (*SET_FOLDER_VALIDITY)(sqlite3 *, const char *, const char *, int, bool, uid_t);
+typedef int (*INSERT_ITEM_SCAN)(sqlite3 *, const char *, const char *, int, uid_t);
+typedef int (*GET_FOLDER_SCAN_STATUS)(sqlite3 *, const char *, const char *, int *);
+typedef int (*SET_FOLDER_SCAN_STATUS)(sqlite3 *, const char *, const char *, int, uid_t);
+typedef int (*CHECK_FOLDER_MODIFIED)(sqlite3 *, const char *, const char *, bool *);
+typedef int (*GET_NULL_SCAN_FOLDER_LIST)(sqlite3 *, const char *, const char *, GPtrArray **);
+typedef int (*CHANGE_VALIDITY_ITEM_BATCH)(sqlite3 *, const char *, const char *, int, int, uid_t);
+
+typedef int (*CHECK_DB)(sqlite3*, uid_t);
+typedef int (*GET_UUID)(char **);
+typedef int (*CHECK_STORAGE)(sqlite3 *, const char *, char **, int *, uid_t);
+typedef int (*INSERT_STORAGE)(sqlite3 *, const char *, int, const char *, uid_t);
+typedef int (*UPDATE_STORAGE)(sqlite3 *, const char *, const char *, uid_t);
+typedef int (*SET_STORAGE_VALIDITY)(sqlite3 *, const char *, int, uid_t uid);
+typedef int (*SET_ALL_STORAGE_VALIDITY)(sqlite3 *, int, uid_t);
+
+typedef int (*UPDATE_ITEM_META)(sqlite3 *, uid_t);
+
+typedef int (*DELETE_INVALID_FOLDER_BY_PATH)(sqlite3 *, const char *, const char *, uid_t);
+typedef int (*CHECK_FOLDER_EXIST)(sqlite3*, const char*, const char*);
+typedef int (*GET_AND_EXTRACT_MEDIA)(sqlite3*, const char*, int, const char *);
+typedef int (*GET_MEDIA_TYPE)(const char *, int *);
+typedef int (*REFRESH_ITEM)(sqlite3 *, const char *, const char *, uid_t);
+
 enum func_list {
        eCLEANUP_DB,
        eINSERT_BEGIN,
@@ -264,6 +300,7 @@ int ms_validate_item(sqlite3 *handle, const char *storage_id, const char *path,
        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;
@@ -289,6 +326,7 @@ 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/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index 70b7f9d..0e36ca7 100755 (executable)
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -130,6 +130,7 @@ int ms_write_device_info(const char *root_path, char *device_uuid)
        return MS_MEDIA_ERR_NONE;
 }
 
+#ifndef _USE_DEVICED_DBUS
 int ms_get_added_storage_path(const char *add_path, char **device_id)
 {
        int ret = MS_MEDIA_ERR_NONE;
@@ -154,4 +155,4 @@ int ms_get_added_storage_path(const char *add_path, char **device_id)
 
        return ret;
 }
-
+#endif

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index 199cc07..1df9f8d 100644 (file)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -67,16 +67,19 @@ int ms_storage_insert_handler(const char *mount_path, const char *mount_uuid)
 
                        scan_type = MS_SCAN_PART;
                        ms_set_storage_validity(handle, mount_uuid, 1, uid);
+#ifdef _USE_TVPD_MODE
                        if (ms_set_storage_scan_status(handle, uuid, MEDIA_SCAN_PREPARE, uid) != MS_MEDIA_ERR_NONE)
                                MS_DBG_ERR("ms_set_storage_scan_status failed");
-
+#endif
                        MS_DBG_WARN("init storage data in DB");
                        /* update storage_id table set validity=0 first */
                        ms_validity_change_all_items(handle, mount_uuid, false, uid);
                        /*update folder table set validity = 0*/
                        ms_set_folder_validity(handle, mount_uuid, storage_path, MS_INVALID, true, uid);
+#ifdef _USE_TVPD_MODE
                        /* update folder table set scan_status=0 first */
                        ms_set_folder_scan_status(handle, mount_uuid, NULL, MS_DIR_SCAN_NONE, uid);
+#endif
                        MS_DBG_WARN("init storage data in DB end");
                } else {
                        /* there is no information of this storage in Media DB */