Move get_storage_list

Move plugin to media-common

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

diff --git a/include/media-svc.h b/include/media-svc.h
index 23e9c3a..25b0656 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -65,7 +65,6 @@ int media_svc_insert_storage(sqlite3 *handle, const char *storage_id, const char
 int media_svc_update_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid);
 int media_svc_set_storage_validity(sqlite3 *handle, const char *storage_id, int validity, uid_t uid);
 int media_svc_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t uid);
-int media_svc_get_storage_list(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count);
 int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
 
 int media_svc_insert_folder_begin(int data_cnt);

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index 5367929..5c8a242 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -140,11 +140,6 @@ int set_storage_scan_status(sqlite3 *handle, const char *storage_id, int status,
        return MS_MEDIA_ERR_NONE;
 }
 
-int get_storage_list(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count)
-{
-       return media_svc_get_storage_list(handle, storage_list, storage_id_list, count);
-}
-
 int update_item_begin(int item_cnt)
 {
        return media_svc_update_item_begin(item_cnt);

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index 1483584..fbca9ae 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -283,94 +283,3 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage
 
        return ret;
 }
-
-static int __media_svc_count_all_storage(sqlite3 *handle, int *count)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       sqlite3_stmt *sql_stmt = NULL;
-       char *sql = sqlite3_mprintf("SELECT count(*) FROM '%q' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE);
-
-       ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               media_svc_error("error when _media_svc_sql_prepare_to_step. err = [%d]", ret);
-               return ret;
-       }
-
-       *count = sqlite3_column_int(sql_stmt, 0);
-
-       SQLITE3_FINALIZE(sql_stmt);
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       int idx = 0;
-       sqlite3_stmt *sql_stmt = NULL;
-       char *sql = NULL;
-       int cnt = 0;
-
-       media_svc_retvm_if(count == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "count is NULL");
-
-       ret = __media_svc_count_all_storage(handle, &cnt);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               media_svc_error("error when __media_svc_count_all_folders. err = [%d]", ret);
-               return ret;
-       }
-
-       if (cnt > 0) {
-               sql = sqlite3_mprintf("SELECT storage_path, storage_uuid FROM '%q' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE);
-       } else {
-               *storage_list = NULL;
-               return MS_MEDIA_ERR_NONE;
-       }
-
-       *storage_list = malloc(sizeof(char *) * cnt);
-       *storage_id_list = malloc(sizeof(char *) * cnt);
-       if (*storage_list == NULL || *storage_id_list == NULL) {
-               media_svc_error("Allocation failed");
-               SAFE_FREE(*storage_list);
-               SAFE_FREE(*storage_id_list);
-               SQLITE3_SAFE_FREE(sql);
-               return MS_MEDIA_ERR_OUT_OF_MEMORY;
-       }
-
-       ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               media_svc_error("prepare error [%s]", sqlite3_errmsg(handle));
-               SAFE_FREE(*storage_list);
-               SAFE_FREE(*storage_id_list);
-               return ret;
-       }
-
-       media_svc_debug("QEURY OK");
-
-       while (1) {
-               (*storage_list)[idx] = g_strdup((char *)sqlite3_column_text(sql_stmt, 0));
-               (*storage_id_list)[idx] = g_strdup((char *)sqlite3_column_text(sql_stmt, 1));
-               if (sqlite3_step(sql_stmt) != SQLITE_ROW)
-                       break;
-               idx++;
-       }
-
-       if (cnt == idx + 1) {
-               *count = cnt;
-               media_svc_debug("OK");
-       } else {
-               /* free all data */
-               int i = 0;
-               for (i = 0; i < idx; i++) {
-                       SAFE_FREE((*storage_list)[i]);
-                       SAFE_FREE((*storage_id_list)[i]);
-               }
-               SAFE_FREE(*storage_list);
-               SAFE_FREE(*storage_id_list);
-               *count = 0;
-               ret = MS_MEDIA_ERR_INTERNAL;
-       }
-
-       SQLITE3_FINALIZE(sql_stmt);
-
-       return ret;
-}

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index ce3a330..49974ae 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -843,13 +843,6 @@ int media_svc_get_storage_id(sqlite3 *handle, const char *path, char *storage_id
        return _media_svc_get_storage_uuid(handle, path, storage_id, uid);
 }
 
-int media_svc_get_storage_list(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count)
-{
-       media_svc_debug_fenter();
-
-       return _media_svc_get_all_storage(handle, storage_list, storage_id_list, count);
-}
-
 int media_svc_generate_uuid(char **uuid)
 {
        char *gen_uuid = NULL;

diff --git a/src/include/common/media-svc-storage.h b/src/include/common/media-svc-storage.h
index b1fe3d4..6da41e2 100755 (executable)
--- a/src/include/common/media-svc-storage.h
+++ b/src/include/common/media-svc-storage.h
@@ -30,6 +30,5 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
 int _media_svc_delete_invalid_storage(sqlite3 *handle, ms_user_storage_type_e storage_type, uid_t uid);
 int _media_svc_update_storage_validity(const char *storage_id, int validity, uid_t uid);
 int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage_id, uid_t uid);
-int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count);
 
 #endif /*_MEDIA_SVC_STORAGE_H_*/