From 4e52a9cd059eab5dfd55479b5ea0ff2e43c641f2 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 8 Feb 2018 16:20:42 +0900 Subject: [PATCH] [SATIZENVUL-1318] Modified sql print type. %s to %q Change-Id: I467ca206a50a82a02f7f47ef7f44a55baeddf7e4 Signed-off-by: Minje Ahn --- packaging/libmedia-service.spec | 2 +- src/common/media-svc-media-folder.c | 42 ++++++++++++++++---------------- src/common/media-svc-media.c | 48 ++++++++++++++++++------------------- src/common/media-svc-storage.c | 38 ++++++++++++++--------------- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index 5a57b67..b146918 100644 --- a/packaging/libmedia-service.spec +++ b/packaging/libmedia-service.spec @@ -1,6 +1,6 @@ Name: libmedia-service Summary: Media information service library for multimedia applications -Version: 0.3.20 +Version: 0.3.21 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 and PD diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c index 9b8958f..0ad368b 100755 --- a/src/common/media-svc-media-folder.c +++ b/src/common/media-svc-media-folder.c @@ -38,7 +38,7 @@ int _media_svc_get_folder_id_by_foldername(sqlite3 *handle, const char *storage_ sqlite3_stmt *sql_stmt = NULL; char *sql = NULL; - sql = sqlite3_mprintf("SELECT folder_uuid FROM '%s' WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name); + sql = sqlite3_mprintf("SELECT folder_uuid FROM %q WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); if (ret != MS_MEDIA_ERR_NONE) { @@ -63,7 +63,7 @@ int _media_svc_get_folder_id_by_foldername_with_validity(sqlite3 *handle, const sqlite3_stmt *sql_stmt = NULL; char *sql = NULL; - sql = sqlite3_mprintf("SELECT folder_uuid, validity FROM '%s' WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name); + sql = sqlite3_mprintf("SELECT folder_uuid, validity FROM %q WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); if (ret != MS_MEDIA_ERR_NONE) { @@ -99,7 +99,7 @@ static int __media_svc_append_folder(const char *storage_id, media_svc_storage_t _media_svc_get_pinyin_str(folder_name, &folder_name_pinyin); /* Sometime SQLITE3 returns NO_RECORD, so need to consider conflict case.. */ media_svc_debug("UNIQUE:path[%s], storage_uuid[%s]", folder_path, storage_id); - char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %s (folder_uuid, path, name, storage_uuid, storage_type, modified_time, name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ", + char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_uuid, path, name, storage_uuid, storage_type, modified_time, name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ", MEDIA_SVC_DB_TABLE_FOLDER, folder_id, folder_path, folder_name, storage_id, storage_type, folder_modified_date, folder_name_pinyin); if (!stack_query) { @@ -122,7 +122,7 @@ int _media_svc_update_folder_modified_time_by_folder_uuid(const char *folder_uui modified_time = _media_svc_get_file_time(folder_path); - char *sql = sqlite3_mprintf("UPDATE %s SET modified_time=%d WHERE folder_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, modified_time, folder_uuid); + char *sql = sqlite3_mprintf("UPDATE %q SET modified_time=%d WHERE folder_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, modified_time, folder_uuid); if (!stack_query) { ret = _media_svc_sql_query(sql, uid); @@ -306,7 +306,7 @@ int _media_svc_update_folder_table(const char *storage_id, uid_t uid) int ret = MS_MEDIA_ERR_NONE; char *sql = NULL; - sql = sqlite3_mprintf("DELETE FROM '%s' WHERE folder_uuid IN (SELECT folder_uuid FROM '%s' WHERE folder_uuid NOT IN (SELECT folder_uuid FROM '%s'));", + sql = sqlite3_mprintf("DELETE FROM %q WHERE folder_uuid IN (SELECT folder_uuid FROM '%q' WHERE folder_uuid NOT IN (SELECT folder_uuid FROM '%q'));", MEDIA_SVC_DB_TABLE_FOLDER, MEDIA_SVC_DB_TABLE_FOLDER, storage_id); ret = _media_svc_sql_query(sql, uid); @@ -320,7 +320,7 @@ int _media_svc_get_folder_info_by_foldername(sqlite3 *handle, const char *storag int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT folder_uuid, modified_time FROM %s WHERE (storage_uuid = '%q' AND path = '%q');", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name); + char *sql = sqlite3_mprintf("SELECT folder_uuid, modified_time FROM %q WHERE (storage_uuid = '%q' AND path = '%q');", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -357,7 +357,7 @@ int _media_svc_get_and_append_folder_id_by_folder_path(sqlite3 *handle, const ch if (ret == MS_MEDIA_ERR_DB_NO_RECORD) { ret = __media_svc_get_and_append_parent_folder(handle, storage_id, path_name, storage_type, folder_id, uid); } else { - sql = sqlite3_mprintf("UPDATE '%s' SET validity=1 WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); + sql = sqlite3_mprintf("UPDATE %q SET validity=1 WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); if (!stack_query) { ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -376,7 +376,7 @@ int _media_svc_delete_invalid_folder(const char *storage_id, int storage_type, u int ret = MS_MEDIA_ERR_NONE; char *sql = NULL; - sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid = '%q' AND storage_type = %d AND validity = 0;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type); + sql = sqlite3_mprintf("DELETE FROM %q WHERE storage_uuid = '%q' AND storage_type = %d AND validity = 0;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -395,10 +395,10 @@ int _media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, cons media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_folder_id_by_foldername fail"); media_svc_retvm_if(!STRING_VALID(start_path_id), MS_MEDIA_ERR_INVALID_PARAMETER, "start_path_id is NULL"); - sql = sqlite3_mprintf("UPDATE '%s' SET validity = %d WHERE storage_uuid = '%q' AND (path LIKE '%q/%%' OR folder_uuid ='%q');", + sql = sqlite3_mprintf("UPDATE %q SET validity = %d WHERE storage_uuid = '%q' AND (path LIKE '%q/%%' OR folder_uuid ='%q');", MEDIA_SVC_DB_TABLE_FOLDER, validity, storage_id, start_path, start_path_id); } else { - sql = sqlite3_mprintf("UPDATE '%s' SET validity = %d WHERE storage_uuid = '%q' AND path = '%q';", + sql = sqlite3_mprintf("UPDATE %q SET validity = %d WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, validity, storage_id, start_path); } @@ -414,7 +414,7 @@ int _media_svc_delete_folder_by_storage_id(const char *storage_id, media_svc_sto int ret = MS_MEDIA_ERR_NONE; char *sql = NULL; - sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid = '%q' AND storage_type = %d;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type); + sql = sqlite3_mprintf("DELETE FROM %q WHERE storage_uuid = '%q' AND storage_type = %d;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -438,7 +438,7 @@ int _media_svc_get_folder_scan_status(sqlite3 *handle, const char *storage_id, c ret = MS_MEDIA_ERR_INVALID_PARAMETER; } - sql = sqlite3_mprintf("SELECT scan_status FROM '%s' WHERE path = '%q' AND storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id); + sql = sqlite3_mprintf("SELECT scan_status FROM %q WHERE path = '%q' AND storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id); ret = _media_svc_sql_prepare_to_step_simple(handle, sql, &sql_stmt); @@ -458,9 +458,9 @@ int _media_svc_set_folder_scan_status(const char *storage_id, const char *path, char *sql = NULL; if (path) - sql = sqlite3_mprintf("UPDATE '%s' SET scan_status=%d WHERE path = '%q' AND storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, scan_status, path, storage_id); + sql = sqlite3_mprintf("UPDATE %q SET scan_status=%d WHERE path = '%q' AND storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, scan_status, path, storage_id); else - sql = sqlite3_mprintf("UPDATE '%s' SET scan_status=%d WHERE storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, scan_status, storage_id); + sql = sqlite3_mprintf("UPDATE %q SET scan_status=%d WHERE storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, scan_status, storage_id); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -473,7 +473,7 @@ int _media_svc_get_folder_modified_time_by_path(sqlite3 *handle, const char *pat int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT modified_time FROM '%s' WHERE path = '%q' AND storage_uuid = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id); + char *sql = sqlite3_mprintf("SELECT modified_time FROM %q WHERE path = '%q' AND storage_uuid = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -502,7 +502,7 @@ int _media_svc_get_null_scan_folder_list(sqlite3 *handle, const char *storage_id sqlite3_stmt *sql_stmt = NULL; if (path == NULL) { - sql = sqlite3_mprintf("SELECT count(*) FROM '%s' WHERE storage_uuid = '%q' AND scan_status!=%d", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, FOLDER_SCAN_DONE); + sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE storage_uuid = '%q' AND scan_status!=%d", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, FOLDER_SCAN_DONE); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); if (ret != MS_MEDIA_ERR_NONE) { @@ -520,7 +520,7 @@ int _media_svc_get_null_scan_folder_list(sqlite3 *handle, const char *storage_id cnt = sqlite3_column_int(sql_stmt, 0); SQLITE3_FINALIZE(sql_stmt); if (cnt > 0) { - sql = sqlite3_mprintf("SELECT path FROM '%s' WHERE storage_uuid = '%q' AND scan_status!=%d", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, FOLDER_SCAN_DONE); + sql = sqlite3_mprintf("SELECT path FROM %q WHERE storage_uuid = '%q' AND scan_status!=%d", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, FOLDER_SCAN_DONE); } else { *folder_list = NULL; *count = 0; @@ -539,7 +539,7 @@ int _media_svc_get_null_scan_folder_list(sqlite3 *handle, const char *storage_id return ret; } } else { - sql = sqlite3_mprintf("SELECT count(*) FROM '%s' WHERE path IN (SELECT DISTINCT '%q/'||name from '%s' WHERE path LIKE '%q/%%')", + sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE path IN (SELECT DISTINCT '%q/'||name from '%s' WHERE path LIKE '%q/%%')", MEDIA_SVC_DB_TABLE_FOLDER, path, MEDIA_SVC_DB_TABLE_FOLDER, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -551,7 +551,7 @@ int _media_svc_get_null_scan_folder_list(sqlite3 *handle, const char *storage_id cnt = sqlite3_column_int(sql_stmt, 0); SQLITE3_FINALIZE(sql_stmt); if (cnt > 0) { - sql = sqlite3_mprintf("SELECT path FROM '%s' WHERE path IN (SELECT DISTINCT '%q/'||name from '%s' WHERE path LIKE '%q/%%')", + sql = sqlite3_mprintf("SELECT path FROM %q WHERE path IN (SELECT DISTINCT '%q/'||name from '%s' WHERE path LIKE '%q/%%')", MEDIA_SVC_DB_TABLE_FOLDER, path, MEDIA_SVC_DB_TABLE_FOLDER, path); } else { *folder_list = NULL; @@ -614,7 +614,7 @@ int _media_svc_count_folder_with_path(sqlite3 *handle, const char *storage_id, c int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT count(*) FROM '%s' WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); + char *sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -633,7 +633,7 @@ int _media_svc_get_folder_uuid(sqlite3 *handle, const char *storage_id, const ch sqlite3_stmt *sql_stmt = NULL; char *sql = NULL; - sql = sqlite3_mprintf("SELECT folder_uuid FROM '%s' WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); + sql = sqlite3_mprintf("SELECT folder_uuid FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c index 53f51de..3a98ac5 100755 --- a/src/common/media-svc-media.c +++ b/src/common/media-svc-media.c @@ -42,7 +42,7 @@ static int __media_svc_get_invalid_records_with_thumbnail(sqlite3 *handle, media { int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT thumbnail_path FROM '%s' WHERE validity=0 AND storage_type=%d AND thumbnail_path IS NOT NULL", MEDIA_SVC_DB_TABLE_MEDIA, storage_type); + char *sql = sqlite3_mprintf("SELECT thumbnail_path FROM '%q' WHERE validity=0 AND storage_type=%d AND thumbnail_path IS NOT NULL", MEDIA_SVC_DB_TABLE_MEDIA, storage_type); media_svc_debug("[SQL query] : %s", sql); @@ -65,7 +65,7 @@ int _media_svc_count_record_with_path(sqlite3 *handle, const char *storage_id, c int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT count(*) FROM '%s' WHERE path='%q'", storage_id, path); + char *sql = sqlite3_mprintf("SELECT count(*) FROM '%q' WHERE path='%q'", storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -138,7 +138,7 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me _media_svc_get_pinyin_str(content_info->media_meta.description, &content_info->media_meta.description_pinyin); } - char *sql = sqlite3_mprintf("INSERT INTO '%s' (%s) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, \ + char *sql = sqlite3_mprintf("INSERT INTO '%q' (%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, \ %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %d, \ %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %d, \ %d, %d, %d, %Q, %d, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);", @@ -216,7 +216,7 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me media_svc_debug("Query length is over %d byte.. So, remake query using only basic information..", MEDIA_SVC_QUERY_LEN_MAX - 1); SQLITE3_SAFE_FREE(sql); - sql = sqlite3_mprintf("INSERT INTO '%s' (%s) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, %Q, %d, %d, %d, %d, %d, %d, %Q, %d, %d, %Q, %Q, %d);", + sql = sqlite3_mprintf("INSERT INTO '%q' (%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, %Q, %d, %d, %d, %d, %d, %d, %Q, %d, %d, %Q, %Q, %d);", content_info->storage_uuid, db_fields_basic, content_info->media_uuid, content_info->path, @@ -291,7 +291,7 @@ int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info) _media_svc_get_pinyin_str(content_info->media_meta.description, &content_info->media_meta.description_pinyin); } - char *sql = sqlite3_mprintf("UPDATE %s SET title=%Q, album=%Q, artist=%Q, album_artist=%Q, genre=%Q, composer=%Q, copyright=%Q, description=%Q, \ + char *sql = sqlite3_mprintf("UPDATE '%q' SET title=%Q, album=%Q, artist=%Q, album_artist=%Q, genre=%Q, composer=%Q, copyright=%Q, description=%Q, \ file_name_pinyin=%Q, title_pinyin=%Q, album_pinyin=%Q, artist_pinyin=%Q, album_artist_pinyin=%Q, genre_pinyin=%Q, composer_pinyin=%Q, copyright_pinyin=%Q, description_pinyin=%Q \ WHERE path=%Q;", MEDIA_SVC_DB_TABLE_MEDIA, @@ -357,7 +357,7 @@ int _media_svc_update_item_with_data(const char *storage_id, media_svc_content_i _media_svc_get_pinyin_str(content_info->media_meta.description, &content_info->media_meta.description_pinyin); } - char *sql = sqlite3_mprintf("UPDATE '%s' SET size=%lld, modified_time=%d, thumbnail_path=%Q, title=%Q, album_id=%d, album=%Q, artist=%Q, album_artist=%Q, genre=%Q, \ + char *sql = sqlite3_mprintf("UPDATE '%q' SET size=%lld, modified_time=%d, thumbnail_path=%Q, title=%Q, album_id=%d, album=%Q, artist=%Q, album_artist=%Q, genre=%Q, \ composer=%Q, year=%Q, recorded_date=%Q, copyright=%Q, track_num=%Q, description=%Q, bitrate=%d, bitpersample=%d, samplerate=%d, channel=%d, duration=%d, \ longitude=%f, latitude=%f, altitude=%f, exposure_time=%Q, fnumber=%f, iso=%d, model=%Q, width=%d, height=%d, datetaken=%Q, orientation=%d WHERE path=%Q;", storage_id, @@ -405,7 +405,7 @@ int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, cha int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT thumbnail_path FROM '%s' WHERE path='%q'", MEDIA_SVC_DB_TABLE_MEDIA, path); + char *sql = sqlite3_mprintf("SELECT thumbnail_path FROM '%q' WHERE path='%q'", MEDIA_SVC_DB_TABLE_MEDIA, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -430,7 +430,7 @@ int _media_svc_get_media_type_by_path(sqlite3 *handle, const char *storage_id, c int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT media_type FROM '%s' WHERE path='%q'", storage_id, path); + char *sql = sqlite3_mprintf("SELECT media_type FROM '%q' WHERE path='%q'", storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -449,7 +449,7 @@ int _media_svc_get_media_type_by_path(sqlite3 *handle, const char *storage_id, c int _media_svc_delete_item_by_path(const char *storage_id, const char *path, bool stack_query, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("DELETE FROM '%s' WHERE path='%q';", storage_id, path); + char *sql = sqlite3_mprintf("DELETE FROM '%q' WHERE path='%q';", storage_id, path); if (!stack_query) { ret = _media_svc_sql_query(sql, uid); @@ -470,7 +470,7 @@ int _media_svc_truncate_table(const char *storage_id, media_svc_storage_type_e s { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("DELETE FROM '%s' where storage_type=%d;", storage_id, storage_type); + char *sql = sqlite3_mprintf("DELETE FROM '%q' where storage_type=%d;", storage_id, storage_type); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -496,7 +496,7 @@ int _media_svc_delete_invalid_items(sqlite3 *handle, const char *storage_id, med } } - char *sql = sqlite3_mprintf("DELETE FROM '%s' WHERE validity = 0 AND storage_type = %d;", storage_id, storage_type); + char *sql = sqlite3_mprintf("DELETE FROM '%q' WHERE validity = 0 AND storage_type = %d;", storage_id, storage_type); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -535,7 +535,7 @@ int _media_svc_update_item_validity(const char *storage_id, const char *path, in { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE path= '%q';", storage_id, validity, path); + char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE path= '%q';", storage_id, validity, path); if (!stack_query) { ret = _media_svc_sql_query(sql, uid); @@ -551,7 +551,7 @@ int _media_svc_update_thumbnail_path(const char *path, const char *thumb_path, u { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("UPDATE '%s' SET thumbnail_path=%Q WHERE path= %Q;", MEDIA_SVC_DB_TABLE_MEDIA, thumb_path, path); + char *sql = sqlite3_mprintf("UPDATE '%q' SET thumbnail_path=%Q WHERE path= %Q;", MEDIA_SVC_DB_TABLE_MEDIA, thumb_path, path); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -563,7 +563,7 @@ int _media_svc_update_storage_item_validity(const char *storage_id, media_svc_st { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_type=%d;", storage_id, validity, storage_type); + char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE storage_type=%d;", storage_id, validity, storage_type); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -579,7 +579,7 @@ int _media_svc_update_folder_item_validity(sqlite3 *handle, const char *storage_ sqlite3_stmt *sql_stmt = NULL; /*Get folder ID*/ - sql = sqlite3_mprintf("SELECT folder_uuid FROM '%s' WHERE path='%q' AND storage_uuid='%q'", MEDIA_SVC_DB_TABLE_FOLDER, folder_path, storage_id); + sql = sqlite3_mprintf("SELECT folder_uuid FROM '%q' WHERE path='%q' AND storage_uuid='%q'", MEDIA_SVC_DB_TABLE_FOLDER, folder_path, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); if (ret != MS_MEDIA_ERR_NONE) { @@ -595,7 +595,7 @@ int _media_svc_update_folder_item_validity(sqlite3 *handle, const char *storage_ SQLITE3_FINALIZE(sql_stmt); /*Update folder item validity*/ - sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE folder_uuid='%q';", storage_id, validity, folder_uuid); + sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE folder_uuid='%q';", storage_id, validity, folder_uuid); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -608,7 +608,7 @@ int _media_svc_update_recursive_folder_item_validity(const char *storage_id, con int ret = MS_MEDIA_ERR_NONE; /*Update folder item validity*/ - char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE (storage_type = 0 OR storage_type = 1) AND path LIKE '%q/%%';", storage_id, validity, folder_path); + char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE (storage_type = 0 OR storage_type = 1) AND path LIKE '%q/%%';", storage_id, validity, folder_path); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -626,11 +626,11 @@ int _media_svc_update_item_by_path(const char *src_path, media_svc_storage_type_ char *sql = NULL; if (thumb_path != NULL) { - sql = sqlite3_mprintf("UPDATE '%s' SET path=%Q, file_name=%Q, modified_time=%d, folder_uuid=%Q, thumbnail_path=%Q, storage_type=%d, \ + sql = sqlite3_mprintf("UPDATE '%q' SET path=%Q, file_name=%Q, modified_time=%d, folder_uuid=%Q, thumbnail_path=%Q, storage_type=%d, \ played_count=0, last_played_time=0, last_played_position=0 WHERE path=%Q;", MEDIA_SVC_DB_TABLE_MEDIA, dest_path, file_name, modified_time, folder_uuid, thumb_path, dest_storage, src_path); } else { - sql = sqlite3_mprintf("UPDATE '%s' SET path=%Q, file_name=%Q, modified_time=%d, folder_uuid=%Q, storage_type=%d, \ + sql = sqlite3_mprintf("UPDATE '%q' SET path=%Q, file_name=%Q, modified_time=%d, folder_uuid=%Q, storage_type=%d, \ played_count=0, last_played_time=0, last_played_position=0 WHERE path=%Q;", MEDIA_SVC_DB_TABLE_MEDIA, dest_path, file_name, modified_time, folder_uuid, dest_storage, src_path); } @@ -698,7 +698,7 @@ int _media_svc_get_burst_id(sqlite3 *handle, const char *storage_id, int *id) int ret = MS_MEDIA_ERR_NONE; int cur_id = -1; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT max(CAST(burst_id AS INTEGER)) FROM '%s'", storage_id); + char *sql = sqlite3_mprintf("SELECT max(CAST(burst_id AS INTEGER)) FROM '%q'", storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -727,9 +727,9 @@ int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char } if (update_item == MS_MEDIA_ITEM_FILE) - sql = sqlite3_mprintf("SELECT media_uuid, media_type, mime_type FROM '%s' WHERE path=%Q", storage_id, path); + sql = sqlite3_mprintf("SELECT media_uuid, media_type, mime_type FROM '%q' WHERE path=%Q", storage_id, path); else if (update_item == MS_MEDIA_ITEM_DIRECTORY) - sql = sqlite3_mprintf("SELECT folder_uuid FROM '%s' WHERE path=%Q AND storage_uuid='%s'", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id); + sql = sqlite3_mprintf("SELECT folder_uuid FROM '%q' WHERE path=%Q AND storage_uuid='%q'", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id); else { media_svc_error("_media_svc_get_noti_info failed : update item"); return MS_MEDIA_ERR_INVALID_PARAMETER; @@ -774,7 +774,7 @@ int _media_svc_get_fileinfo_by_path(sqlite3 *handle, const char *storage_id, con { int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT modified_time, size FROM '%s' WHERE path='%q'", storage_id, path); + char *sql = sqlite3_mprintf("SELECT modified_time, size FROM '%q' WHERE path='%q'", storage_id, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -795,7 +795,7 @@ int _media_svc_change_validity_item_batch(const char *storage_id, const char *pa { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE validity=%d AND path LIKE '%q%%'", storage_id, des_validity, src_validity, path); + char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE validity=%d AND path LIKE '%q%%'", storage_id, des_validity, src_validity, path); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c index 1ef9f63..f4fa3d9 100755 --- a/src/common/media-svc-storage.c +++ b/src/common/media-svc-storage.c @@ -32,7 +32,7 @@ int _media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char ** sqlite3_stmt *sql_stmt = NULL; char *sql = NULL; - sql = sqlite3_mprintf("SELECT storage_name, storage_path, validity FROM '%s' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_TABLE_MEDIA); + sql = sqlite3_mprintf("SELECT storage_name, storage_path, validity FROM '%q' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_TABLE_MEDIA); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); if (ret != MS_MEDIA_ERR_NONE) { @@ -64,12 +64,12 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **sto *storage_path = NULL; *validity = 0; - sql = sqlite3_mprintf("SELECT * FROM '%s' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); + sql = sqlite3_mprintf("SELECT storage_path, validity FROM '%q' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); - *storage_path = g_strdup((const char *)sqlite3_column_text(sql_stmt, 2)); - *validity = sqlite3_column_int(sql_stmt, 6); + *storage_path = g_strdup((const char *)sqlite3_column_text(sql_stmt, 0)); + *validity = sqlite3_column_int(sql_stmt, 1); SQLITE3_FINALIZE(sql_stmt); @@ -101,7 +101,7 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **sto int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("INSERT INTO %s (storage_uuid, storage_name, storage_path, storage_type) values (%Q, %Q, %Q, %d); ", + char *sql = sqlite3_mprintf("INSERT INTO %q (storage_uuid, storage_name, storage_path, storage_type) values (%Q, %Q, %Q, %d); ", MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name, storage_path, storage_type); ret = _media_svc_sql_query(sql, uid); @@ -122,7 +122,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); /*Storage table update*/ - sql = sqlite3_mprintf("UPDATE '%s' SET storage_path=%Q WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, path, storage_id); + sql = sqlite3_mprintf("UPDATE '%q' SET storage_path=%Q WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, path, storage_id); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); if (ret != MS_MEDIA_ERR_NONE) { @@ -131,7 +131,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons } /*Folder table update*/ - sql = sqlite3_mprintf("UPDATE '%s' SET path=REPLACE(path, %Q, %Q) WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, old_storage_path, path, storage_id); + sql = sqlite3_mprintf("UPDATE '%q' SET path=REPLACE(path, %Q, %Q) WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, old_storage_path, path, storage_id); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); if (ret != MS_MEDIA_ERR_NONE) { @@ -140,7 +140,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons } /*Media table update*/ - sql = sqlite3_mprintf("UPDATE '%s' SET path=REPLACE(path, %Q, %Q);", storage_id, old_storage_path, path); + sql = sqlite3_mprintf("UPDATE '%q' SET path=REPLACE(path, %Q, %Q);", storage_id, old_storage_path, path); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); G_SAFE_FREE(old_storage_path); @@ -155,7 +155,7 @@ int _media_svc_delete_storage(const char *storage_id, uid_t uid) char *sql = NULL; if (storage_id != NULL) - sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); + sql = sqlite3_mprintf("DELETE FROM '%q' WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -169,9 +169,9 @@ int _media_svc_update_storage_validity(const char *storage_id, int validity, uid char *sql = NULL; if (storage_id == NULL) - sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_uuid != 'media';", MEDIA_SVC_DB_TABLE_STORAGE, validity); + sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE storage_uuid != 'media';", MEDIA_SVC_DB_TABLE_STORAGE, validity); else - sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, validity, storage_id); + sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, validity, storage_id); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -206,7 +206,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage storage_path = strndup(path, strlen(path) - remain_len); - sql = sqlite3_mprintf("SELECT storage_uuid FROM '%s' WHERE validity=1 AND storage_path = '%s'", MEDIA_SVC_DB_TABLE_STORAGE, storage_path); + sql = sqlite3_mprintf("SELECT storage_uuid FROM '%q' WHERE validity=1 AND storage_path = '%q'", MEDIA_SVC_DB_TABLE_STORAGE, storage_path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); SAFE_FREE(storage_path); @@ -236,7 +236,7 @@ int _media_svc_get_storage_type(sqlite3 *handle, const char *storage_id, media_s ret = MS_MEDIA_ERR_INVALID_PARAMETER; } - sql = sqlite3_mprintf("SELECT storage_type FROM '%s' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); + sql = sqlite3_mprintf("SELECT storage_type FROM '%q' WHERE storage_uuid=%Q", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -267,7 +267,7 @@ int _media_svc_get_storage_path(sqlite3 *handle, const char *storage_id, char ** ret = MS_MEDIA_ERR_INVALID_PARAMETER; } - sql = sqlite3_mprintf("SELECT storage_path FROM '%s' WHERE (storage_uuid=%Q AND validity=1)", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); + sql = sqlite3_mprintf("SELECT storage_path FROM '%q' WHERE (storage_uuid=%Q AND validity=1)", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); @@ -298,7 +298,7 @@ int _media_svc_get_storage_scan_status(sqlite3 *handle, const char *storage_id, return MS_MEDIA_ERR_INVALID_PARAMETER; } - sql = sqlite3_mprintf("SELECT scan_status FROM '%s' WHERE (storage_uuid=%Q AND validity=1)", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); + sql = sqlite3_mprintf("SELECT scan_status FROM '%q' WHERE (storage_uuid=%Q AND validity=1)", MEDIA_SVC_DB_TABLE_STORAGE, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); if (ret != MS_MEDIA_ERR_NONE) { @@ -323,9 +323,9 @@ int _media_svc_set_storage_scan_status(const char *storage_id, media_svc_scan_st char *sql = NULL; if (storage_id == NULL) - sql = sqlite3_mprintf("UPDATE '%s' SET scan_status=%d WHERE storage_uuid != 'media';", MEDIA_SVC_DB_TABLE_STORAGE, scan_status); + sql = sqlite3_mprintf("UPDATE '%q' SET scan_status=%d WHERE storage_uuid != 'media';", MEDIA_SVC_DB_TABLE_STORAGE, scan_status); else - sql = sqlite3_mprintf("UPDATE '%s' SET scan_status=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, scan_status, storage_id); + sql = sqlite3_mprintf("UPDATE '%q' SET scan_status=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, scan_status, storage_id); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); @@ -337,7 +337,7 @@ 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 '%s' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE); + 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) { @@ -367,7 +367,7 @@ int _media_svc_get_all_storage(sqlite3 *handle, char ***storage_list, char ***st } if (cnt > 0) { - sql = sqlite3_mprintf("SELECT storage_path, storage_uuid, scan_status FROM '%s' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE); + sql = sqlite3_mprintf("SELECT storage_path, storage_uuid, scan_status FROM '%q' WHERE validity = 1", MEDIA_SVC_DB_TABLE_STORAGE); } else { *storage_list = NULL; *scan_status_list = NULL; -- 2.7.4