#include <string.h>
#include <unistd.h>
#include <sys/types.h>
-#include <media-util-err.h>
#include "media-svc-media.h"
#include "media-svc-media-folder.h"
#include "media-svc-debug.h"
{
int ret = MS_MEDIA_ERR_NONE;
- const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_description, media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_timeline, storage_uuid, media_360";
+ const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_year, media_recorded_date, media_copyright, media_track_num, media_width, media_height, media_datetaken, media_orientation, storage_uuid";
- const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, album_id, media_timeline, storage_uuid, media_360";
+ const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, album_id, storage_uuid";
- /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
- /* This code will be removed when sqlite3_mprintf works clearly */
- char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
- SQLITE3_SAFE_FREE(test_sql);
-
- char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, \
- %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, \
- %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %d, \
- %d, %d, %Q, %d);",
+ char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, %d, %Q);",
DB_TABLE_MEDIA, db_fields,
content_info->media_uuid,
content_info->path,
content_info->size,
content_info->added_time,
content_info->modified_time,
- content_info->folder_id, /* 1st line */
+ content_info->folder_id,
content_info->thumbnail_path,
content_info->media_meta.title,
content_info->album_id,
content_info->media_meta.artist,
content_info->media_meta.album_artist,
content_info->media_meta.genre,
- content_info->media_meta.composer,
content_info->media_meta.year,
content_info->media_meta.recorded_date,
content_info->media_meta.copyright,
content_info->media_meta.track_num,
- content_info->media_meta.description, /* 2nd line */
- content_info->media_meta.bitrate,
- content_info->media_meta.bitpersample,
- content_info->media_meta.samplerate,
- content_info->media_meta.channel,
- content_info->media_meta.duration,
- content_info->media_meta.longitude,
- content_info->media_meta.latitude,
- content_info->media_meta.altitude,
- content_info->media_meta.exposure_time,
- content_info->media_meta.fnumber,
- content_info->media_meta.iso,
- content_info->media_meta.model,
content_info->media_meta.width,
content_info->media_meta.height,
content_info->media_meta.datetaken,
- content_info->media_meta.orientation, /* 3rd line */
- content_info->media_meta.rating,
- content_info->timeline,
- content_info->storage_uuid,
- content_info->media_meta.is_360 /* 4th line */
- );
+ content_info->media_meta.orientation,
+ content_info->storage_uuid);
/* Check query length */
if (sql != NULL && strlen(sql) >= (MEDIA_SVC_QUERY_LEN_MAX - 1) && is_direct == false) {
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 %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %d, %d, %d, %d, %Q, %d);",
+ sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %d, %Q);",
DB_TABLE_MEDIA, db_fields_basic,
content_info->media_uuid,
content_info->path,
content_info->added_time,
content_info->modified_time,
content_info->folder_id,
- content_info->thumbnail_path,
content_info->album_id,
- content_info->timeline,
- content_info->storage_uuid,
- content_info->media_meta.is_360
+ content_info->storage_uuid
);
}
{
int ret = MS_MEDIA_ERR_NONE;
- /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
- /* This code will be removed when sqlite3_mprintf works clearly */
- char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
- SQLITE3_SAFE_FREE(test_sql);
-
- char *sql = sqlite3_mprintf("UPDATE %q SET media_size=%lld, media_modified_time=%d, media_thumbnail_path=%Q, media_title=%Q, album_id=%d, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, \
- media_composer=%Q, media_year=%Q, media_recorded_date=%Q, media_copyright=%Q, media_track_num=%Q, media_description=%Q, media_bitrate=%d, media_bitpersample=%d, media_samplerate=%d, media_channel=%d, media_duration=%d, \
- media_longitude=%f, media_latitude=%f, media_altitude=%f, exposure_time=%Q, fnumber=%f, iso=%d, model=%Q, media_width=%d, media_height=%d, media_datetaken=%Q, media_orientation=%d, validity=1 WHERE media_path=%Q;",
+ char *sql = sqlite3_mprintf("UPDATE %q SET media_size=%lld, media_modified_time=%d, media_thumbnail_path=%Q, media_title=%Q, album_id=%d, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, media_year=%Q, media_recorded_date=%Q, media_copyright=%Q, media_track_num=%Q, media_width=%d, media_height=%d, media_datetaken=%Q, media_orientation=%d, validity=1 WHERE media_path=%Q;",
DB_TABLE_MEDIA,
content_info->size,
content_info->modified_time,
content_info->media_meta.artist,
content_info->media_meta.album_artist,
content_info->media_meta.genre,
- content_info->media_meta.composer,
content_info->media_meta.year,
content_info->media_meta.recorded_date,
content_info->media_meta.copyright,
content_info->media_meta.track_num,
- content_info->media_meta.description,
- content_info->media_meta.bitrate,
- content_info->media_meta.bitpersample,
- content_info->media_meta.samplerate,
- content_info->media_meta.channel,
- content_info->media_meta.duration,
- content_info->media_meta.longitude,
- content_info->media_meta.latitude,
- content_info->media_meta.altitude,
- content_info->media_meta.exposure_time,
- content_info->media_meta.fnumber,
- content_info->media_meta.iso,
- content_info->media_meta.model,
content_info->media_meta.width,
content_info->media_meta.height,
content_info->media_meta.datetaken,
return ret;
}
- SAFE_STRLCPY(thumbnail_path, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_PATHNAME_SIZE);
+ g_strlcpy(thumbnail_path, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_PATHNAME_SIZE);
SQLITE3_FINALIZE(sql_stmt);
projects / platform / core / multimedia / libmedia-service.git / blobdiff