Merge "check src before doing g_strlcpy and g_strlcat" into tizen

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc-album.c

diff --git a/src/common/media-svc-album.c b/src/common/media-svc-album.c
index cb634d0..e45ddfc 100755 (executable)
--- a/src/common/media-svc-album.c
+++ b/src/common/media-svc-album.c
@@ -57,42 +57,16 @@ int _media_svc_get_album_id(sqlite3 *handle, const char *album, const char *arti
        return ret;
 }
 
-int _media_svc_get_album_art_by_album_id(sqlite3 *handle, int album_id, char **album_art)
+int _media_svc_append_album(sqlite3 *handle, bool is_direct, const char *album, const char *artist, const char *album_art, int *album_id, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       sqlite3_stmt *sql_stmt = NULL;
-       char *value = NULL;
-
-       char *sql = sqlite3_mprintf("SELECT album_art FROM %s WHERE album_id=%d", MEDIA_SVC_DB_TABLE_ALBUM, album_id);
-
-       ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-
-       if (ret != MS_MEDIA_ERR_NONE) {
-               if (ret == MS_MEDIA_ERR_DB_NO_RECORD)
-                       media_svc_debug("there is no album_id.");
-               else
-                       media_svc_error("error when get album_art. err = [%d]", ret);
-
-               return ret;
-       }
 
-       value = (char *)sqlite3_column_text(sql_stmt, 0);
-       if (STRING_VALID(value))
-               *album_art = g_strdup(value);
+       char *sql = sqlite3_mprintf("INSERT INTO %s (name, artist, album_art) values (%Q, %Q, %Q);", MEDIA_SVC_DB_TABLE_ALBUM, album, artist, album_art);
+       if (is_direct)
+               ret = _media_svc_sql_query_direct(sql, uid);
        else
-               *album_art = NULL;
-
-       SQLITE3_FINALIZE(sql_stmt);
-
-       return MS_MEDIA_ERR_NONE;
-}
+               ret = _media_svc_sql_query(sql, uid);
 
-int _media_svc_append_album(sqlite3 *handle, const char *album, const char *artist, const char *album_art, int *album_id, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       char *sql = sqlite3_mprintf("INSERT INTO %s (name, artist, album_art) values (%Q, %Q, %Q);", MEDIA_SVC_DB_TABLE_ALBUM, album, artist, album_art);
-       ret = _media_svc_sql_query(sql, uid);
        SQLITE3_SAFE_FREE(sql);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);