Remove path replacement function

[platform/core/api/media-content.git] / src / media_playlist.c

diff --git a/src/media_playlist.c b/src/media_playlist.c
index c1005bf..8f5ece7 100755 (executable)
--- a/src/media_playlist.c
+++ b/src/media_playlist.c
@@ -188,7 +188,6 @@ static int __media_playlist_import_item_from_file(const char *playlist_path, GSL
 {
        int tmp_str_len = 0;
        char tmp_str[MAX_PATH_LEN] = {0, };
-       char repl_item[MAX_PATH_LEN] = {0, };
        FILE *fp = NULL;
 
        fp = fopen(playlist_path, "rb");
@@ -198,22 +197,19 @@ static int __media_playlist_import_item_from_file(const char *playlist_path, GSL
        }
 
        while (fgets(tmp_str, MAX_PATH_LEN, fp) != NULL) {
-               memset(repl_item, 0, sizeof(repl_item));
-               _media_content_replace_path(tmp_str, repl_item);
-
-               tmp_str_len = strlen(repl_item);
+               tmp_str_len = strlen(tmp_str);
                /* Check for empty file */
                if (tmp_str_len <= 1)
                        continue;
 
-               if (repl_item[0] == '#')
+               if (tmp_str[0] == '#')
                        continue;
 
 
-               if (repl_item[tmp_str_len - 1] == '\n')
-                       repl_item[tmp_str_len - 1] = '\0';
+               if (tmp_str[tmp_str_len - 1] == '\n')
+                       tmp_str[tmp_str_len - 1] = '\0';
 
-               *item_list = g_slist_append(*item_list, g_strdup(repl_item));
+               *item_list = g_slist_append(*item_list, g_strdup(tmp_str));
        }
 
        fclose(fp);
@@ -621,18 +617,14 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name,
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        GSList *item_list = NULL;
-       char repl_path[MAX_PATH_LEN] = {0, };
 
        content_retip_if_fail(STRING_VALID(path));
        content_retip_if_fail(STRING_VALID(playlist_name));
 
-       ret = _media_content_replace_path(path, repl_path);
-       content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
-
        ret = media_playlist_insert_to_db(playlist_name, playlist);
        content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_playlist_insert_to_db fail");
 
-       ret = __media_playlist_import_item_from_file(repl_path, &item_list);
+       ret = __media_playlist_import_item_from_file(path, &item_list);
        content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "Fail to get playlist from file");
 
        g_slist_foreach(item_list, __media_playlist_foreach_item, playlist);
@@ -648,38 +640,35 @@ int media_playlist_export_to_file(media_playlist_h playlist, const char *path)
        int ret = MEDIA_CONTENT_ERROR_NONE;
        media_playlist_s *_playlist = (media_playlist_s *)playlist;
        GList *item_list = NULL;
-       unsigned int idx = 0;
-       char repl_path[MAX_PATH_LEN] = {0, };
+       GList *iter = NULL;
+       char *item = NULL;
 
        content_retip_if_fail(STRING_VALID(path));
        content_retip_if_fail(playlist);
        content_retipm_if_fail(_playlist->playlist_id > 0, "%d", _playlist->playlist_id);
 
-       ret = _media_content_replace_path(path, repl_path);
-       content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
-
        ret = _media_db_get_playlist_item(_playlist->playlist_id, NULL, __media_playlist_member_cb, &item_list);
        content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "_media_db_get_playlist_item fail");
 
-       ret = __media_playlist_reset_file(repl_path);
+       ret = __media_playlist_reset_file(path);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               g_list_free_full(item_list, g_free);
                content_error("Fail to init playlist file");
-               return ret;
+               goto FINALIZE;
        }
 
-       for (idx = 0; idx < g_list_length(item_list); idx++) {
-               char *item = g_list_nth_data(item_list, idx);
-               if (STRING_VALID(item)) {
-                       ret = __media_playlist_append_to_file(repl_path, item);
-                       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-                               g_list_free_full(item_list, g_free);
-                               content_error("Fail to export paths into file");
-                               return ret;
-                       }
+       for (iter = item_list; iter; iter = g_list_next(iter)) {
+               item = (char *)iter->data;
+               if (!STRING_VALID(item))
+                       continue;
+
+               ret = __media_playlist_append_to_file(path, item);
+               if (ret != MEDIA_CONTENT_ERROR_NONE) {
+                       content_error("Fail to export paths into file");
+                       goto FINALIZE;
                }
        }
 
+FINALIZE:
        g_list_free_full(item_list, g_free);
 
        return ret;