From 36162b631bb78093b00695484a5f116fe526cf32 Mon Sep 17 00:00:00 2001 From: "Haejeong, Kim" Date: Mon, 19 Oct 2015 15:18:52 +0900 Subject: [PATCH] Apply tizen coding rule Change-Id: I77b0516385184c312f041d7f7ed1bdca67c7df8a --- include/media_content_type.h | 26 +- include/media_tag.h | 4 +- packaging/capi-content-media-content.spec | 2 +- src/media_audio.c | 304 +++------- src/media_bookmark.c | 69 +-- src/media_content.c | 206 ++++--- src/media_db.c | 351 +++++------- src/media_filter.c | 540 ++++++------------ src/media_folder.c | 194 ++----- src/media_group.c | 136 ++--- src/media_image.c | 183 ++---- src/media_info.c | 4 +- src/media_playlist.c | 243 +++----- src/media_storage.c | 151 ++--- src/media_tag.c | 136 ++--- src/media_util_private.c | 44 +- src/media_video.c | 297 +++------- test/media-content_test.c | 891 ++++++++++++++---------------- 18 files changed, 1354 insertions(+), 2427 deletions(-) diff --git a/include/media_content_type.h b/include/media_content_type.h index d315769..ec2fe1b 100755 --- a/include/media_content_type.h +++ b/include/media_content_type.h @@ -49,11 +49,11 @@ extern "C" { * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif */ typedef enum { - MEDIA_CONTENT_TYPE_IMAGE = 0, /**media_id); SAFE_FREE(_audio->title); SAFE_FREE(_audio->album); @@ -39,9 +38,7 @@ int audio_meta_destroy(audio_meta_h audio) SAFE_FREE(_audio); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -54,126 +51,103 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_src = (audio_meta_s*)src; - if (_src != NULL) - { + if (_src != NULL) { audio_meta_s *_dst = (audio_meta_s*)calloc(1, sizeof(audio_meta_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - if(STRING_VALID(_src->media_id)) - { + if (STRING_VALID(_src->media_id)) { _dst->media_id = strdup(_src->media_id); - if (_dst->media_id == NULL) - { + if (_dst->media_id == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->title)) - { + if (STRING_VALID(_src->title)) { _dst->title = strdup(_src->title); - if(_dst->title == NULL) - { + if (_dst->title == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->album)) - { + if (STRING_VALID(_src->album)) { _dst->album = strdup(_src->album); - if(_dst->album == NULL) - { + if (_dst->album == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->artist)) - { + if (STRING_VALID(_src->artist)) { _dst->artist = strdup(_src->artist); - if(_dst->artist == NULL) - { + if (_dst->artist == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->album_artist)) - { + if (STRING_VALID(_src->album_artist)) { _dst->album_artist = strdup(_src->album_artist); - if(_dst->album_artist == NULL) - { + if (_dst->album_artist == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->genre)) - { + if (STRING_VALID(_src->genre)) { _dst->genre = strdup(_src->genre); - if(_dst->genre == NULL) - { + if (_dst->genre == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->composer)) - { + if (STRING_VALID(_src->composer)) { _dst->composer = strdup(_src->composer); - if(_dst->composer == NULL) - { + if (_dst->composer == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->year)) - { + if (STRING_VALID(_src->year)) { _dst->year = strdup(_src->year); - if(_dst->year == NULL) - { + if (_dst->year == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->recorded_date)) - { + if (STRING_VALID(_src->recorded_date)) { _dst->recorded_date = strdup(_src->recorded_date); - if(_dst->recorded_date == NULL) - { + if (_dst->recorded_date == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->copyright)) - { + if (STRING_VALID(_src->copyright)) { _dst->copyright = strdup(_src->copyright); - if(_dst->copyright == NULL) - { + if (_dst->copyright == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->track_num)) - { + if (STRING_VALID(_src->track_num)) { _dst->track_num = strdup(_src->track_num); - if(_dst->track_num == NULL) - { + if (_dst->track_num == NULL) { audio_meta_destroy((audio_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -192,9 +166,7 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src) *dst = (audio_meta_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -206,22 +178,16 @@ int audio_meta_get_media_id(audio_meta_h audio, char **media_id) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if (STRING_VALID(_audio->media_id)) - { + if (_audio) { + if (STRING_VALID(_audio->media_id)) { *media_id = strdup(_audio->media_id); media_content_retvm_if(*media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *media_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -233,22 +199,16 @@ int audio_meta_get_album(audio_meta_h audio, char **album) { int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->album)) - { + if (_audio) { + if (STRING_VALID(_audio->album)) { *album = strdup(_audio->album); media_content_retvm_if(*album == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *album = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -261,22 +221,16 @@ int audio_meta_get_artist(audio_meta_h audio, char **artist) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->artist)) - { + if (_audio) { + if (STRING_VALID(_audio->artist)) { *artist = strdup(_audio->artist); media_content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -289,22 +243,16 @@ int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->album_artist)) - { + if (_audio) { + if (STRING_VALID(_audio->album_artist)) { *album_artist = strdup(_audio->album_artist); media_content_retvm_if(*album_artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *album_artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -317,22 +265,16 @@ int audio_meta_get_genre(audio_meta_h audio, char **genre) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->genre)) - { + if (_audio) { + if (STRING_VALID(_audio->genre)) { *genre = strdup(_audio->genre); media_content_retvm_if(*genre == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *genre = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -345,22 +287,16 @@ int audio_meta_get_composer(audio_meta_h audio, char **composer) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->composer)) - { + if (_audio) { + if (STRING_VALID(_audio->composer)) { *composer = strdup(_audio->composer); media_content_retvm_if(*composer == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *composer = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -373,22 +309,16 @@ int audio_meta_get_year(audio_meta_h audio, char **year) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->year)) - { + if (_audio) { + if (STRING_VALID(_audio->year)) { *year = strdup(_audio->year); media_content_retvm_if(*year == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *year = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -401,22 +331,16 @@ int audio_meta_get_recorded_date(audio_meta_h audio, char **recorded_date) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->recorded_date)) - { + if (_audio) { + if (STRING_VALID(_audio->recorded_date)) { *recorded_date = strdup(_audio->recorded_date); media_content_retvm_if(*recorded_date == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *recorded_date = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -429,22 +353,16 @@ int audio_meta_get_copyright(audio_meta_h audio, char **copyright) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->copyright)) - { + if (_audio) { + if (STRING_VALID(_audio->copyright)) { *copyright = strdup(_audio->copyright); media_content_retvm_if(*copyright == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *copyright = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -457,22 +375,16 @@ int audio_meta_get_track_num(audio_meta_h audio, char **track_num) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { - if(STRING_VALID(_audio->track_num)) - { + if (_audio) { + if (STRING_VALID(_audio->track_num)) { *track_num = strdup(_audio->track_num); media_content_retvm_if(*track_num == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *track_num = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -485,13 +397,10 @@ int audio_meta_get_bit_rate(audio_meta_h audio, int *bit_rate) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio && bit_rate) - { + if (_audio && bit_rate) { *bit_rate = _audio->bitrate; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -504,13 +413,10 @@ int audio_meta_get_bitpersample(audio_meta_h audio, int *bitpersample) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio && bitpersample) - { + if (_audio && bitpersample) { *bitpersample = _audio->bitpersample; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -523,13 +429,10 @@ int audio_meta_get_sample_rate(audio_meta_h audio, int *sample_rate) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio && sample_rate) - { + if (_audio && sample_rate) { *sample_rate = _audio->samplerate; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -542,13 +445,10 @@ int audio_meta_get_channel(audio_meta_h audio, int *channel) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio && channel) - { + if (_audio && channel) { *channel = _audio->channel; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -561,13 +461,10 @@ int audio_meta_get_duration(audio_meta_h audio, int *duration) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { + if (_audio) { *duration = _audio->duration; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -580,13 +477,10 @@ int audio_meta_get_played_count(audio_meta_h audio, int *played_count) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio && played_count) - { + if (_audio && played_count) { *played_count = _audio->played_count; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -599,13 +493,10 @@ int audio_meta_get_played_time(audio_meta_h audio, time_t* played_time) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { + if (_audio) { *played_time = _audio->played_time; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -618,13 +509,10 @@ int audio_meta_get_played_position(audio_meta_h audio, int *played_position) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if (_audio) - { + if (_audio) { *played_position = _audio->played_position; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -637,12 +525,9 @@ int audio_meta_set_played_count(audio_meta_h audio, int played_count) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if ((_audio != NULL) && (played_count >= 0)) - { + if ((_audio != NULL) && (played_count >= 0)) { _audio->played_count = played_count; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -655,12 +540,9 @@ int audio_meta_set_played_time(audio_meta_h audio, time_t played_time) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if ((_audio != NULL) && (played_time >= 0)) - { + if ((_audio != NULL) && (played_time >= 0)) { _audio->played_time = played_time; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -673,12 +555,9 @@ int audio_meta_set_played_position(audio_meta_h audio, int played_position) int ret = MEDIA_CONTENT_ERROR_NONE; audio_meta_s *_audio = (audio_meta_s*)audio; - if ((_audio != NULL) && (played_position >= 0)) - { + if ((_audio != NULL) && (played_position >= 0)) { _audio->played_position = played_position; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -692,8 +571,7 @@ int audio_meta_update_to_db(audio_meta_h audio) audio_meta_s *_audio = (audio_meta_s*)audio; char *sql = NULL; - if (_audio != NULL && STRING_VALID(_audio->media_id)) - { + if (_audio != NULL && STRING_VALID(_audio->media_id)) { char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; memset(storage_id, 0x00, sizeof(storage_id)); @@ -703,9 +581,7 @@ int audio_meta_update_to_db(audio_meta_h audio) sql = sqlite3_mprintf(UPDATE_AV_META_FROM_MEDIA, storage_id, _audio->played_count, _audio->played_time, _audio->played_position, _audio->media_id); ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/src/media_bookmark.c b/src/media_bookmark.c index edb94b5..dba6eb9 100755 --- a/src/media_bookmark.c +++ b/src/media_bookmark.c @@ -23,14 +23,11 @@ int media_bookmark_insert_to_db(const char *media_id, time_t time, const char *t int ret = MEDIA_CONTENT_ERROR_NONE; char *sql = NULL; - if(STRING_VALID(media_id)) - { + if (STRING_VALID(media_id)) { sql = sqlite3_mprintf(INSERT_BOOKMARK_TO_BOOKMARK, media_id, time, thumbnail_path); ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -43,8 +40,7 @@ int media_bookmark_delete_from_db(int bookmark_id) int ret = MEDIA_CONTENT_ERROR_NONE; char *query_str = NULL; - if(bookmark_id < 0) - { + if (bookmark_id < 0) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -62,8 +58,7 @@ int media_bookmark_get_bookmark_count_from_db(filter_h filter, int *bookmark_cou { int ret = MEDIA_CONTENT_ERROR_NONE; - if (bookmark_count == NULL) - { + if (bookmark_count == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -78,15 +73,12 @@ int media_bookmark_destroy(media_bookmark_h bookmark) int ret = MEDIA_CONTENT_ERROR_NONE; media_bookmark_s *_bookmark = (media_bookmark_s*)bookmark; - if(_bookmark) - { + if (_bookmark) { SAFE_FREE(_bookmark->media_id); SAFE_FREE(_bookmark->thumbnail_path); free(_bookmark); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -97,19 +89,16 @@ int media_bookmark_clone(media_bookmark_h *dst, media_bookmark_h src) { int ret = MEDIA_CONTENT_ERROR_NONE; - if((src != NULL)) - { + if ((src != NULL)) { media_bookmark_s *_src = (media_bookmark_s*)src; media_bookmark_s *_dst = (media_bookmark_s*)calloc(1, sizeof(media_bookmark_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _dst->bookmark_id = _src->bookmark_id; - if(STRING_VALID(_src->media_id)) - { - _dst->media_id = (char*)strdup(_src->media_id); - if(_dst->media_id == NULL) - { + if (STRING_VALID(_src->media_id)) { + _dst->media_id = (char *)strdup(_src->media_id); + if (_dst->media_id == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_bookmark_destroy((media_bookmark_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -118,11 +107,9 @@ int media_bookmark_clone(media_bookmark_h *dst, media_bookmark_h src) _dst->marked_time = _src->marked_time; - if(STRING_VALID(_src->thumbnail_path)) - { + if (STRING_VALID(_src->thumbnail_path)) { _dst->thumbnail_path = (char*)strdup(_src->thumbnail_path); - if(_dst->thumbnail_path == NULL) - { + if (_dst->thumbnail_path == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_bookmark_destroy((media_bookmark_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -132,9 +119,7 @@ int media_bookmark_clone(media_bookmark_h *dst, media_bookmark_h src) *dst = (media_bookmark_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -147,13 +132,10 @@ int media_bookmark_get_bookmark_id(media_bookmark_h bookmark, int *bookmark_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_bookmark_s *_bookmark = (media_bookmark_s*)bookmark; - if(_bookmark) - { + if (_bookmark) { *bookmark_id = _bookmark->bookmark_id; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -166,13 +148,10 @@ int media_bookmark_get_marked_time(media_bookmark_h bookmark, time_t* marked_tim int ret = MEDIA_CONTENT_ERROR_NONE; media_bookmark_s *_bookmark = (media_bookmark_s*)bookmark; - if(_bookmark) - { + if (_bookmark) { *marked_time = _bookmark->marked_time; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -185,22 +164,16 @@ int media_bookmark_get_thumbnail_path(media_bookmark_h bookmark, char **path) int ret = MEDIA_CONTENT_ERROR_NONE; media_bookmark_s *_bookmark = (media_bookmark_s*)bookmark; - if(_bookmark) - { - if(STRING_VALID(_bookmark->thumbnail_path)) - { + if (_bookmark) { + if (STRING_VALID(_bookmark->thumbnail_path)) { *path = strdup(_bookmark->thumbnail_path); media_content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *path = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/src/media_content.c b/src/media_content.c index 9bd3041..31f6025 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -212,52 +212,52 @@ static int __media_content_create_attr_handle(void) media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); /* Pinyin*/ - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_FILE_NAME_PINYIN, DB_FIELD_MEDIA_FILE_NAME_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_FILE_NAME_PINYIN, DB_FIELD_MEDIA_FILE_NAME_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_TITLE_PINYIN, DB_FIELD_MEDIA_TITLE_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_TITLE_PINYIN, DB_FIELD_MEDIA_TITLE_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_ALBUM_PINYIN, DB_FIELD_MEDIA_ALBUM_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_ALBUM_PINYIN, DB_FIELD_MEDIA_ALBUM_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_ARTIST_PINYIN, DB_FIELD_MEDIA_ARTIST_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_ARTIST_PINYIN, DB_FIELD_MEDIA_ARTIST_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_ALBUM_ARTIST_PINYIN, DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_ALBUM_ARTIST_PINYIN, DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_GENRE_PINYIN, DB_FIELD_MEDIA_GENRE_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_GENRE_PINYIN, DB_FIELD_MEDIA_GENRE_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_COMPOSER_PINYIN, DB_FIELD_MEDIA_COMPOSER_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_COMPOSER_PINYIN, DB_FIELD_MEDIA_COMPOSER_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_COPYRIGHT_PINYIN, DB_FIELD_MEDIA_COPYRIGHT_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_COPYRIGHT_PINYIN, DB_FIELD_MEDIA_COPYRIGHT_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_DESCRIPTION_PINYIN, DB_FIELD_MEDIA_DESCRIPTION_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_DESCRIPTION_PINYIN, DB_FIELD_MEDIA_DESCRIPTION_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_AUTHOR_PINYIN, DB_FIELD_MEDIA_AUTHOR_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_AUTHOR_PINYIN, DB_FIELD_MEDIA_AUTHOR_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_PROVIDER_PINYIN, DB_FIELD_MEDIA_PROVIDER_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_PROVIDER_PINYIN, DB_FIELD_MEDIA_PROVIDER_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_CONTENT_NAME_PINYIN, DB_FIELD_MEDIA_CONTENT_NAME_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_CONTENT_NAME_PINYIN, DB_FIELD_MEDIA_CONTENT_NAME_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_CATEGORY_PINYIN, DB_FIELD_MEDIA_CATEGORY_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_CATEGORY_PINYIN, DB_FIELD_MEDIA_CATEGORY_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_LOCATION_TAG_PINYIN, DB_FIELD_MEDIA_LOCATION_TAG_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_LOCATION_TAG_PINYIN, DB_FIELD_MEDIA_LOCATION_TAG_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_AGE_RATING_PINYIN, DB_FIELD_MEDIA_AGE_RATING_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_AGE_RATING_PINYIN, DB_FIELD_MEDIA_AGE_RATING_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_attr_handle, MEDIA_KEYWORD_PINYIN, DB_FIELD_MEDIA_KEYWORD_PINYIN); + ret = _media_filter_attribute_add(g_attr_handle, MEDIA_KEYWORD_PINYIN, DB_FIELD_MEDIA_KEYWORD_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); /* Playlist*/ @@ -453,52 +453,52 @@ static int __media_content_create_alias_attr_handle(void) media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); /* Pinyin*/ - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_FILE_NAME_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_FILE_NAME_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_FILE_NAME_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_FILE_NAME_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_TITLE_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_TITLE_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_TITLE_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_TITLE_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_ALBUM_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_ALBUM_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_ALBUM_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_ALBUM_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_ARTIST_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_ARTIST_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_ARTIST_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_ARTIST_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_ALBUM_ARTIST_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_ALBUM_ARTIST_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_GENRE_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_GENRE_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_GENRE_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_GENRE_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_COMPOSER_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_COMPOSER_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_COMPOSER_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_COMPOSER_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_COPYRIGHT_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_COPYRIGHT_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_COPYRIGHT_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_COPYRIGHT_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_DESCRIPTION_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_DESCRIPTION_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_DESCRIPTION_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_DESCRIPTION_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_AUTHOR_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_AUTHOR_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_AUTHOR_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_AUTHOR_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_PROVIDER_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_PROVIDER_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_PROVIDER_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_PROVIDER_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_CONTENT_NAME_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_CONTENT_NAME_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_CONTENT_NAME_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_CONTENT_NAME_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_CATEGORY_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_CATEGORY_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_CATEGORY_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_CATEGORY_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_LOCATION_TAG_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_LOCATION_TAG_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_LOCATION_TAG_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_LOCATION_TAG_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_AGE_RATING_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_AGE_RATING_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_AGE_RATING_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_AGE_RATING_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_KEYWORD_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_KEYWORD_PINYIN); + ret = _media_filter_attribute_add(g_alias_attr_handle, MEDIA_KEYWORD_PINYIN, DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_KEYWORD_PINYIN); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); /* Folder */ @@ -551,7 +551,7 @@ static int __media_content_create_attribute_handle(void) media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); ret = __media_content_create_alias_attr_handle(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) _media_filter_attribute_destory(g_attr_handle); return ret; @@ -570,7 +570,7 @@ static int __media_content_destroy_attribute_handle(void) return ret; } -/* Temporary Code [remove after inserted gid patch by security part] */ +/* Temporary Code [remove after inserted gid patch by security part] */ int __media_content_cynara_check(const char *privilege) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -598,7 +598,7 @@ int __media_content_cynara_check(const char *privilege) return MEDIA_CONTENT_ERROR_INVALID_OPERATION; } - pFile = fopen( "/proc/self/attr/current", "r" ); + pFile = fopen("/proc/self/attr/current", "r"); if (pFile != NULL) { smack = fgets(buf, sizeof(buf), pFile); fclose(pFile); @@ -649,11 +649,11 @@ int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condit media_content_retvm_if(db_handle == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected"); media_content_retvm_if(!STRING_VALID(select_query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query"); - if(!STRING_VALID(condition_query)) { + if (!STRING_VALID(condition_query)) { condition_query = (char *)" "; } - if(!STRING_VALID(option_query)) { + if (!STRING_VALID(option_query)) { option_query = (char *)" "; } @@ -672,8 +672,7 @@ int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condit media_content_sec_debug("Query : [%s]", query); err = sqlite3_prepare_v2((sqlite3*)db_handle, query, strlen(query), stmt, NULL); - if(err != SQLITE_OK) - { + if (err != SQLITE_OK) { media_content_error("DB_FAILED(0x%08x) fail to sqlite3_prepare(), %s", MEDIA_CONTENT_ERROR_DB_FAILED, sqlite3_errmsg((sqlite3*)db_handle)); if (err == SQLITE_BUSY) { @@ -693,41 +692,40 @@ int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condit int _content_error_capi(int type, int content_error) { - if(content_error != MEDIA_CONTENT_ERROR_NONE) - { + if (content_error != MEDIA_CONTENT_ERROR_NONE) { media_content_error("[type : %d] content_error : %d ", type, content_error); } /*Error None*/ - if(content_error == MS_MEDIA_ERR_NONE) + if (content_error == MS_MEDIA_ERR_NONE) return MEDIA_CONTENT_ERROR_NONE; /* Internal operation error*/ - else if((content_error == MS_MEDIA_ERR_INVALID_PARAMETER) || + else if ((content_error == MS_MEDIA_ERR_INVALID_PARAMETER) || (content_error == MS_MEDIA_ERR_INVALID_PATH) || (content_error == MS_MEDIA_ERR_THUMB_DUPLICATED_REQUEST)) return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - else if(content_error == MS_MEDIA_ERR_OUT_OF_MEMORY) + else if (content_error == MS_MEDIA_ERR_OUT_OF_MEMORY) return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; /* DB operation error*/ - else if(content_error == MS_MEDIA_ERR_DB_BUSY_FAIL) + else if (content_error == MS_MEDIA_ERR_DB_BUSY_FAIL) return MEDIA_CONTENT_ERROR_DB_BUSY; - else if((content_error <= MS_MEDIA_ERR_DB_CONNECT_FAIL) && (content_error >= MS_MEDIA_ERR_DB_INTERNAL)) + else if ((content_error <= MS_MEDIA_ERR_DB_CONNECT_FAIL) && (content_error >= MS_MEDIA_ERR_DB_INTERNAL)) return MEDIA_CONTENT_ERROR_DB_FAILED; /* IPC operation error*/ - else if((content_error <= MS_MEDIA_ERR_SOCKET_CONN) && (content_error >= MS_MEDIA_ERR_SOCKET_INTERNAL)) + else if ((content_error <= MS_MEDIA_ERR_SOCKET_CONN) && (content_error >= MS_MEDIA_ERR_SOCKET_INTERNAL)) return MEDIA_CONTENT_ERROR_NETWORK; /* MEDIA SERVER error*/ - else if(content_error == MS_MEDIA_ERR_PERMISSION_DENIED) + else if (content_error == MS_MEDIA_ERR_PERMISSION_DENIED) return MEDIA_CONTENT_ERROR_PERMISSION_DENIED; /* Thumbnail error*/ - else if(content_error == MS_MEDIA_ERR_THUMB_TOO_BIG) + else if (content_error == MS_MEDIA_ERR_THUMB_TOO_BIG) return MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT; /*ETC*/ @@ -739,7 +737,7 @@ int _content_query_sql(char *query_str) int ret = MEDIA_CONTENT_ERROR_NONE; //DB will be updated by Media Server. - ret = media_svc_request_update_db(query_str,tzplatform_getuid(TZ_USER_NAME)); + ret = media_svc_request_update_db(query_str, tzplatform_getuid(TZ_USER_NAME)); return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } @@ -751,15 +749,13 @@ int media_content_connect(void) if (g_mutex_trylock(&db_mutex)) { media_content_info("ref count : %d", ref_count); - if(ref_count == 0) - { - if(db_handle == NULL) - { + if (ref_count == 0) { + if (db_handle == NULL) { ret = __media_content_create_attribute_handle(); - if(ret == MEDIA_CONTENT_ERROR_NONE) { - ret = media_svc_connect(&db_handle,tzplatform_getuid(TZ_USER_NAME), false); + if (ret == MEDIA_CONTENT_ERROR_NONE) { + ret = media_svc_connect(&db_handle, tzplatform_getuid(TZ_USER_NAME), false); ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); - if(ret == MEDIA_CONTENT_ERROR_NONE) { + if (ret == MEDIA_CONTENT_ERROR_NONE) { ref_count++; } else { __media_content_destroy_attribute_handle(); @@ -772,7 +768,7 @@ int media_content_connect(void) ret = MEDIA_CONTENT_ERROR_DB_FAILED; } } else { - if(db_handle != NULL) { + if (db_handle != NULL) { ref_count++; } else { media_content_error("Wrong DB Handle status"); @@ -796,29 +792,24 @@ int media_content_disconnect(void) if (g_mutex_trylock(&db_mutex)) { media_content_debug("ref count : %d", ref_count); - if(ref_count > 0) - { - if(db_handle != NULL) { + if (ref_count > 0) { + if (db_handle != NULL) { ref_count--; } else { media_content_error("Wrong DB Handle status"); ret = MEDIA_CONTENT_ERROR_DB_FAILED; } - } - else - { + } else { media_content_error("DB_FAILED(0x%08x) database is not connected", MEDIA_CONTENT_ERROR_DB_FAILED); g_mutex_unlock(&db_mutex); return MEDIA_CONTENT_ERROR_DB_FAILED; } - if(ref_count == 0) - { - if(db_handle != NULL) - { + if (ref_count == 0) { + if (db_handle != NULL) { ret = media_svc_disconnect(db_handle); ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); - if(ret == MEDIA_CONTENT_ERROR_NONE) { + if (ret == MEDIA_CONTENT_ERROR_NONE) { ret = __media_content_destroy_attribute_handle(); db_handle = NULL; } else { @@ -866,8 +857,7 @@ int media_content_scan_file(const char *path) memset(storage_id, 0x00, sizeof(storage_id)); ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id); - if(ret != MS_MEDIA_ERR_NONE) - { + if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_id failed : %d", ret); return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } @@ -884,23 +874,23 @@ int media_content_scan_file(const char *path) media_svc_storage_type_e storage_type; ret = media_svc_get_storage_type(path, &storage_type, tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) { + if (ret != MS_MEDIA_ERR_NONE) { media_content_sec_error("media_svc_get_storage_type failed : %d (%s)", ret, path); return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, path); if (ret == MS_MEDIA_ERR_NONE) { /* Refresh */ - ret = media_svc_refresh_item(_content_get_db_handle(), storage_id, storage_type, path,tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) { + ret = media_svc_refresh_item(_content_get_db_handle(), storage_id, storage_type, path, tzplatform_getuid(TZ_USER_NAME)); + if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_refresh_item failed : %d", ret); return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } } else if (ret == MS_MEDIA_ERR_DB_NO_RECORD) { /* Insert */ - ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, path,tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) { + ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, path, tzplatform_getuid(TZ_USER_NAME)); + if (ret != MS_MEDIA_ERR_NONE) { if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) { media_content_sec_error("This item is already inserted. This may be normal operation because other process already did this (%s)", path); ret = MEDIA_CONTENT_ERROR_NONE; @@ -921,7 +911,7 @@ int media_content_scan_file(const char *path) /* This means this path has to be deleted */ media_content_debug("This path doesn't exists in file system... So now start to delete it from DB"); ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) { + if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_delete_item_by_path failed : %d", ret); return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } @@ -976,7 +966,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - /* Temporary Code [remove after inserted gid patch by security part] */ + /* Temporary Code [remove after inserted gid patch by security part] */ if (strncmp(path, "/usr/storage", strlen("/usr/storage")) == 0) { ret = __media_content_cynara_check("http://tizen.org/privilege/externalstorage"); media_content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission Denied"); @@ -1004,7 +994,7 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co /*FIX ME. need to check ret value?*/ ret = media_directory_scanning_async(path, storage_id, is_recursive, _media_content_scan_cb, cb_data, tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) { + if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_directory_scanning_async failed : %d", ret); } @@ -1016,7 +1006,7 @@ int media_content_cancel_scan_folder(const char *path) int ret = MEDIA_CONTENT_ERROR_NONE; ret = media_directory_scanning_cancel(path, tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) { + if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_directory_scanning_async failed : %d", ret); } @@ -1037,8 +1027,7 @@ void _media_content_db_update_noti_cb( media_noti_cb_s *_noti_info = (media_noti_cb_s *)user_data; - if(_noti_info != NULL) - { + if (_noti_info != NULL) { if (_noti_info->update_noti_cb) _noti_info->update_noti_cb(error_value, pid, item, update_type, content_type, uuid, path, mime_type, _noti_info->user_data); } @@ -1053,7 +1042,7 @@ int media_content_set_db_updated_cb(media_content_db_update_cb callback, void *u media_content_retvm_if(callback == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid callback"); media_content_retvm_if(g_noti_info != NULL, MEDIA_CONTENT_ERROR_INVALID_OPERATION, "Noti callback is already set"); - g_noti_info = (media_noti_cb_s*)calloc(1, sizeof(media_noti_cb_s)); + g_noti_info = (media_noti_cb_s *)calloc(1, sizeof(media_noti_cb_s)); media_content_retvm_if(g_noti_info == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); g_noti_info->update_noti_cb = callback; @@ -1076,48 +1065,47 @@ int media_content_unset_db_updated_cb(void) int media_content_set_db_updated_cb_v2(media_content_noti_h *noti_handle, media_content_db_update_cb callback, void *user_data) { - int ret = MEDIA_CONTENT_ERROR_NONE; - media_noti_cb_s *noti_info = NULL; + int ret = MEDIA_CONTENT_ERROR_NONE; + media_noti_cb_s *noti_info = NULL; - if (noti_handle == NULL) { - media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } + if (noti_handle == NULL) { + media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; + } - if (callback == NULL) { - media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } + if (callback == NULL) { + media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; + } - noti_info = (media_noti_cb_s*)calloc(1, sizeof(media_noti_cb_s)); - if (noti_info == NULL) { - media_content_error("Failed to create noti info"); - return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; - } + noti_info = (media_noti_cb_s *)calloc(1, sizeof(media_noti_cb_s)); + if (noti_info == NULL) { + media_content_error("Failed to create noti info"); + return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; + } - noti_info->update_noti_cb = callback; - noti_info->user_data = user_data; + noti_info->update_noti_cb = callback; + noti_info->user_data = user_data; - ret = media_db_update_subscribe_internal((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); + ret = media_db_update_subscribe_internal((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(MEDIA_REGISTER_TYPE, ret); } void __media_content_clear_user_data(void *user_data) { - media_noti_cb_s *noti_info = user_data; + media_noti_cb_s *noti_info = user_data; - SAFE_FREE(noti_info); + SAFE_FREE(noti_info); - return; + return; } int media_content_unset_db_updated_cb_v2(media_content_noti_h noti_handle) { - int ret = MEDIA_CONTENT_ERROR_NONE; + int ret = MEDIA_CONTENT_ERROR_NONE; - ret = media_db_update_unsubscribe_internal((MediaNotiHandle)noti_handle, __media_content_clear_user_data); + ret = media_db_update_unsubscribe_internal((MediaNotiHandle)noti_handle, __media_content_clear_user_data); - return _content_error_capi(MEDIA_REGISTER_TYPE, ret); + return _content_error_capi(MEDIA_REGISTER_TYPE, ret); } - diff --git a/src/media_db.c b/src/media_db.c index 436f911..98984f2 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -23,8 +23,7 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select static char * __media_db_get_group_name(media_group_e group) { - switch(group) - { + switch (group) { case MEDIA_CONTENT_GROUP_DISPLAY_NAME: return (char *)DB_FIELD_MEDIA_DISPLAY_NAME; case MEDIA_CONTENT_GROUP_TYPE: @@ -95,12 +94,10 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = NULL; - if(filter != NULL) - { + if (filter != NULL) { _filter = (filter_s*)filter; - if(STRING_VALID(_filter->condition)) - { + if (STRING_VALID(_filter->condition)) { /*bracket should be added to condition. If application use "OR" condition, F/W restriction condition like "validity=1" is disregared ex) select path from media where validity=1 and media_type=3 or media_type=1;*/ char bracket_added_condition[MAX_QUERY_SIZE] = {0, }; @@ -115,14 +112,12 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select } ret = _media_filter_attribute_option_generate(attr, filter, option_query); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(*condition_query); return ret; } - if(STRING_VALID(*condition_query)) - { + if (STRING_VALID(*condition_query)) { SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, select_query_size); SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, select_query_size); } @@ -144,7 +139,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - switch(group_type) { + switch (group_type) { case MEDIA_GROUP_NONE: case MEDIA_GROUP_TAG_BY_MEDIA_ID: case MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID: @@ -156,7 +151,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro case MEDIA_GROUP_ALBUM: attr = _content_get_alias_attirbute_handle(); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_ALBUM_COUNT, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_ALBUM_COUNT, DB_TABLE_MEDIA_VIEW); @@ -164,28 +159,25 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro break; case MEDIA_GROUP_FOLDER: attr = _content_get_alias_attirbute_handle(); - if(!SAFE_STRLCPY(select_query, SELECT_FOLDER_COUNT, sizeof(select_query))) - { + if (!SAFE_STRLCPY(select_query, SELECT_FOLDER_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_FOLDER_COUNT, DB_TABLE_MEDIA_VIEW); break; case MEDIA_GROUP_PLAYLIST: - if(!SAFE_STRLCPY(select_query, SELECT_PLAYLIST_COUNT, sizeof(select_query))) - { + if (!SAFE_STRLCPY(select_query, SELECT_PLAYLIST_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } break; case MEDIA_GROUP_TAG: - if(!SAFE_STRLCPY(select_query, SELECT_TAG_COUNT, sizeof(select_query))) - { + if (!SAFE_STRLCPY(select_query, SELECT_TAG_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -193,20 +185,19 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro case MEDIA_GROUP_BOOKMARK: attr = _content_get_alias_attirbute_handle(); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_COUNT, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_COUNT, DB_TABLE_MEDIA_VIEW); break; case MEDIA_GROUP_STORAGE: - if(!SAFE_STRLCPY(select_query, SELECT_STORAGE_COUNT, sizeof(select_query))) - { + if (!SAFE_STRLCPY(select_query, SELECT_STORAGE_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } break; - default : + default: { media_content_error("Invalid group type [%d]", group_type); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -222,8 +213,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { *group_count = (int)sqlite3_column_int(stmt, 0); } @@ -245,7 +235,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), DB_TABLE_MEDIA_VIEW); @@ -254,9 +244,9 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query)); - if(STRING_VALID(condition_query)) + if (STRING_VALID(condition_query)) SAFE_STRLCAT(select_query, condition_query, sizeof(select_query)); - if(STRING_VALID(option_query)) + if (STRING_VALID(option_query)) SAFE_STRLCAT(select_query, option_query, sizeof(select_query)); SAFE_STRLCAT(select_query, QUERY_KEYWORD_BRACKET, sizeof(select_query)); @@ -268,8 +258,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { *group_count = (int)sqlite3_column_int(stmt, 0); } @@ -292,7 +281,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), DB_TABLE_MEDIA_VIEW); @@ -305,12 +294,10 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { name = g_strdup((const char *)sqlite3_column_text(stmt, 0)); - if(callback(name, user_data) == false) - { + if (callback(name, user_data) == false) { SAFE_FREE(name); break; } @@ -336,7 +323,7 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat attr = _content_get_alias_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_ALBUM_LIST, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_ALBUM_LIST, DB_TABLE_MEDIA_VIEW); @@ -349,12 +336,10 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_album_s *album = (media_album_s*)calloc(1, sizeof(media_album_s)); - if(album == NULL) - { + if (album == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -365,8 +350,7 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat album->artist = g_strdup((const char *)sqlite3_column_text(stmt, 2)); album->album_art_path = g_strdup((const char *)sqlite3_column_text(stmt, 3)); - if(callback((media_album_h)album, user_data) == false) - { + if (callback((media_album_h)album, user_data) == false) { media_album_destroy((media_album_h)album); break; } @@ -392,7 +376,7 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d attr = _content_get_alias_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_FOLDER_LIST, DB_TABLE_MEDIA_VIEW); @@ -406,12 +390,10 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_folder_s *_folder = (media_folder_s*)calloc(1, sizeof(media_folder_s)); - if(_folder == NULL) - { + if (_folder == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -424,10 +406,9 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d _folder->modified_time = (int)sqlite3_column_int(stmt, 4); _folder->storage_uuid = g_strdup((const char *)sqlite3_column_text(stmt, 5)); _folder->folder_order = (int)sqlite3_column_int(stmt, 6); - _folder->parent_folder_id= g_strdup((const char *)sqlite3_column_text(stmt, 7)); + _folder->parent_folder_id = g_strdup((const char *)sqlite3_column_text(stmt, 7)); - if(callback((media_folder_h)_folder, user_data) == false) - { + if (callback((media_folder_h)_folder, user_data) == false) { media_folder_destroy((media_folder_h) _folder); break; } @@ -452,8 +433,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(!SAFE_STRLCPY(select_query, SELECT_PLAYLIST_LIST, sizeof(select_query))) - { + if (!SAFE_STRLCPY(select_query, SELECT_PLAYLIST_LIST, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -466,12 +446,10 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_playlist_s *_playlist = (media_playlist_s*)calloc(1, sizeof(media_playlist_s)); - if(_playlist == NULL) - { + if (_playlist == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -481,8 +459,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us _playlist->name = g_strdup((const char *)sqlite3_column_text(stmt, 1)); _playlist->thumbnail_path = g_strdup((const char *)sqlite3_column_text(stmt, 2)); - if(callback((media_playlist_h)_playlist, user_data) == false) - { + if (callback((media_playlist_h)_playlist, user_data) == false) { media_playlist_destroy((media_playlist_h)_playlist); break; } @@ -517,15 +494,13 @@ int _media_db_get_playlist_item(int playlist_id, filter_h filter, playlist_membe SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { int playlist_member_id = 0; playlist_member_id = (int)sqlite3_column_int(stmt, MEDIA_INFO_ITEM_MAX); //MEDIA_INFO_ITEM_MAX is pm_id media_info_s *_media = (media_info_s*)calloc(1, sizeof(media_info_s)); - if(_media == NULL) - { + if (_media == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -533,8 +508,7 @@ int _media_db_get_playlist_item(int playlist_id, filter_h filter, playlist_membe _media_info_item_get_detail(stmt, (media_info_h)_media); - if(callback(playlist_member_id, (media_info_h)_media, user_data) == false) - { + if (callback(playlist_member_id, (media_info_h)_media, user_data) == false) { media_info_destroy((media_info_h)_media); break; } @@ -559,18 +533,13 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(!STRING_VALID(media_id)) - { - if(!SAFE_STRLCPY(select_query, SELECT_TAG_LIST, sizeof(select_query))) - { + if (!STRING_VALID(media_id)) { + if (!SAFE_STRLCPY(select_query, SELECT_TAG_LIST, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - } - else - { + } else snprintf(select_query, sizeof(select_query), SELECT_TAG_LIST_BY_MEDIA_ID, media_id); - } ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); @@ -582,12 +551,10 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_tag_s *_tag = (media_tag_s*)calloc(1, sizeof(media_tag_s)); - if(_tag == NULL) - { + if (_tag == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -596,8 +563,7 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba _tag->tag_id = (int)sqlite3_column_int(stmt, 0); _tag->name = g_strdup((const char *)sqlite3_column_text(stmt, 1)); - if(callback((media_tag_h)_tag, user_data) == false) - { + if (callback((media_tag_h)_tag, user_data) == false) { media_tag_destroy((media_tag_h)_tag); break; } @@ -623,7 +589,7 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark memset(select_query, 0x00, sizeof(select_query)); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_LIST_BY_MEDIA_ID, _filter->storage_id, media_id); else snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_LIST_BY_MEDIA_ID, DB_TABLE_MEDIA_VIEW, media_id); @@ -636,12 +602,10 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_bookmark_s *bookmark = (media_bookmark_s*)calloc(1, sizeof(media_bookmark_s)); - if(bookmark == NULL) - { + if (bookmark == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -652,8 +616,7 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark bookmark->marked_time = (int)sqlite3_column_int(stmt, 2); bookmark->thumbnail_path = g_strdup((const char *)sqlite3_column_text(stmt, 3)); - if(callback((media_bookmark_h)bookmark, user_data) == false) - { + if (callback((media_bookmark_h)bookmark, user_data) == false) { media_bookmark_destroy((media_bookmark_h)bookmark); break; } @@ -681,7 +644,7 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call memset(select_query, 0x00, sizeof(select_query)); - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_FACE_LIST_BY_MEDIA_ID, _filter->storage_id, media_id); else snprintf(select_query, sizeof(select_query), SELECT_FACE_LIST_BY_MEDIA_ID, DB_TABLE_MEDIA_VIEW, media_id); @@ -694,12 +657,10 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_face_s *face = (media_face_s*)calloc(1, sizeof(media_face_s)); - if(face == NULL) - { + if (face == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -711,11 +672,10 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call face->face_rect_y = (int)sqlite3_column_int(stmt, 3); face->face_rect_w = (int)sqlite3_column_int(stmt, 4); face->face_rect_h = (int)sqlite3_column_int(stmt, 5); - face->orientation= (int)sqlite3_column_int(stmt, 6); + face->orientation = (int)sqlite3_column_int(stmt, 6); face->face_tag = g_strdup((const char *)sqlite3_column_text(stmt, 7)); - if(callback((media_face_h)face, user_data) == false) - { + if (callback((media_face_h)face, user_data) == false) { media_face_destroy((media_face_h)face); break; } @@ -742,23 +702,16 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(group_type == MEDIA_GROUP_ALBUM) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (group_type == MEDIA_GROUP_ALBUM) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_ALBUM, _filter->storage_id, group_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_ALBUM, DB_TABLE_MEDIA_VIEW, group_id); - } - else if(group_type == MEDIA_GROUP_PLAYLIST) - { + } else if (group_type == MEDIA_GROUP_PLAYLIST) { snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_PLAYLIST, group_id); - } - else if(group_type == MEDIA_GROUP_TAG) - { + } else if (group_type == MEDIA_GROUP_TAG) { snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_TAG, group_id); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -771,10 +724,8 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) *item_count = (int)sqlite3_column_int(stmt, 0); - } SQLITE3_FINALIZE(stmt); @@ -796,13 +747,12 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(group_type == MEDIA_GROUP_NONE) - { + if (group_type == MEDIA_GROUP_NONE) { /* There are 2 ways to get count for media table for performance If user wants to set offset and count, use SQL SELECT_MEDIA_COUNT_FROM_MEDIA. If user wants to get count without setting count, SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE */ if (_filter && ((_filter->offset < 0) && (_filter->count < 0))) { - if(STRING_VALID(_filter->storage_id)) + if (STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_TABLE_MEDIA_VIEW); @@ -810,64 +760,50 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou } else { snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA, DB_TABLE_MEDIA_VIEW); } - } - else if(group_type == MEDIA_GROUP_FOLDER) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else if (group_type == MEDIA_GROUP_FOLDER) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) tmp_query = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_FOLDER, _filter->storage_id, group_name); else tmp_query = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_FOLDER, DB_TABLE_MEDIA_VIEW, group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); - } - else if(group_type == MEDIA_GROUP_TAG_BY_MEDIA_ID) - { + } else if (group_type == MEDIA_GROUP_TAG_BY_MEDIA_ID) { snprintf(select_query, sizeof(select_query), SELECT_TAG_COUNT_BY_MEDIA_ID, group_name); - } - else if(group_type == MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else if (group_type == MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) tmp_query = sqlite3_mprintf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name); else tmp_query = sqlite3_mprintf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, DB_TABLE_MEDIA_VIEW, group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); - } - else if(group_type == MEDIA_GROUP_STORAGE) - { + } else if (group_type == MEDIA_GROUP_STORAGE) { tmp_query = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_STORAGE, group_name, group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); - } - else if (group_type == MEDIA_GROUP_FACE_BY_MEDIA_ID) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else if (group_type == MEDIA_GROUP_FACE_BY_MEDIA_ID) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) tmp_query = sqlite3_mprintf(SELECT_FACE_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name); else tmp_query = sqlite3_mprintf(SELECT_FACE_COUNT_BY_MEDIA_ID, DB_TABLE_MEDIA_VIEW, group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { - if(tmp_query != NULL) + if (ret != MEDIA_CONTENT_ERROR_NONE) { + if (tmp_query != NULL) SQLITE3_SAFE_FREE(tmp_query); return ret; } - if(group_type == MEDIA_GROUP_NONE) - { + if (group_type == MEDIA_GROUP_NONE) { SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query)); - if(STRING_VALID(condition_query)) + if (STRING_VALID(condition_query)) SAFE_STRLCAT(select_query, condition_query, sizeof(select_query)); - if(STRING_VALID(option_query)) + if (STRING_VALID(option_query)) SAFE_STRLCAT(select_query, option_query, sizeof(select_query)); if (!is_simple) @@ -878,14 +814,13 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou } ret = _content_query_prepare(&stmt, select_query, condition_query, option_query); - if(tmp_query != NULL) + if (tmp_query != NULL) SQLITE3_SAFE_FREE(tmp_query); SAFE_FREE(condition_query); SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { *item_count = (int)sqlite3_column_int(stmt, 0); } @@ -907,29 +842,22 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(group_type == MEDIA_GROUP_ALBUM) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (group_type == MEDIA_GROUP_ALBUM) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_ALBUM, _filter->storage_id, group_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_ALBUM, DB_TABLE_MEDIA_VIEW, group_id); - } - else if(group_type == MEDIA_GROUP_PLAYLIST) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else if (group_type == MEDIA_GROUP_PLAYLIST) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, _filter->storage_id, group_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, DB_TABLE_MEDIA_VIEW, group_id); - } - else if(group_type == MEDIA_GROUP_TAG) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else if (group_type == MEDIA_GROUP_TAG) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, _filter->storage_id, group_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, DB_TABLE_MEDIA_VIEW, group_id); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -942,11 +870,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_info_s *item = (media_info_s*)calloc(1, sizeof(media_info_s)); - if(item == NULL) - { + if (item == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -954,8 +880,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb _media_info_item_get_detail(stmt, (media_info_h)item); - if(callback((media_info_h)item, user_data) == false) - { + if (callback((media_info_h)item, user_data) == false) { media_info_destroy((media_info_h)item); break; } @@ -981,26 +906,19 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(group_type == MEDIA_GROUP_NONE) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (group_type == MEDIA_GROUP_NONE) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_ITEM, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_ITEM, DB_TABLE_MEDIA_VIEW); - } - else if(group_type == MEDIA_GROUP_FOLDER) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else if (group_type == MEDIA_GROUP_FOLDER) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, _filter->storage_id, group_name); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, DB_TABLE_MEDIA_VIEW, group_name); - } - else if(group_type == MEDIA_GROUP_STORAGE) - { + } else if (group_type == MEDIA_GROUP_STORAGE) { snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_STORAGE, group_name, group_name); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1013,11 +931,9 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_info_s *item = (media_info_s*)calloc(1, sizeof(media_info_s)); - if(item == NULL) - { + if (item == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -1025,8 +941,7 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info _media_info_item_get_detail(stmt, (media_info_h)item); - if(callback((media_info_h)item, user_data) == false) - { + if (callback((media_info_h)item, user_data) == false) { media_info_destroy((media_info_h)item); break; } @@ -1053,39 +968,32 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(group_name != NULL) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) - { + if (group_name != NULL) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) { tmp_query = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); - } - else - { + } else { tmp_query = sqlite3_mprintf(SELECT_MEDIA_COUNT_FROM_GROUP, DB_TABLE_MEDIA_VIEW, __media_db_get_group_name(group), group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); } - } - else - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, _filter->storage_id, __media_db_get_group_name(group)); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, DB_TABLE_MEDIA_VIEW, __media_db_get_group_name(group)); } ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { - if(tmp_query != NULL) + if (ret != MEDIA_CONTENT_ERROR_NONE) { + if (tmp_query != NULL) SQLITE3_SAFE_FREE(tmp_query); return ret; } SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query)); - if(STRING_VALID(condition_query)) + if (STRING_VALID(condition_query)) SAFE_STRLCAT(select_query, condition_query, sizeof(select_query)); - if(STRING_VALID(option_query)) + if (STRING_VALID(option_query)) SAFE_STRLCAT(select_query, option_query, sizeof(select_query)); SAFE_STRLCAT(select_query, QUERY_KEYWORD_BRACKET, sizeof(select_query)); @@ -1093,14 +1001,13 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter SAFE_FREE(option_query); ret = _content_query_prepare(&stmt, select_query, condition_query, option_query); - if(tmp_query != NULL) + if (tmp_query != NULL) SQLITE3_SAFE_FREE(tmp_query); SAFE_FREE(condition_query); SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { *item_count = (int)sqlite3_column_int(stmt, 0); } @@ -1123,43 +1030,37 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(group_name != NULL) - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (group_name != NULL) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) tmp_query = sqlite3_mprintf(SELECT_MEDIA_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name); else tmp_query = sqlite3_mprintf(SELECT_MEDIA_FROM_GROUP, DB_TABLE_MEDIA_VIEW, __media_db_get_group_name(group), group_name); SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query)); - } - else - { - if((_filter != NULL) && STRING_VALID(_filter->storage_id)) + } else { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, _filter->storage_id, __media_db_get_group_name(group)); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, DB_TABLE_MEDIA_VIEW, __media_db_get_group_name(group)); } ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { - if(tmp_query != NULL) + if (ret != MEDIA_CONTENT_ERROR_NONE) { + if (tmp_query != NULL) SQLITE3_SAFE_FREE(tmp_query); return ret; } ret = _content_query_prepare(&stmt, select_query, condition_query, option_query); - if(tmp_query != NULL) + if (tmp_query != NULL) SQLITE3_SAFE_FREE(tmp_query); SAFE_FREE(condition_query); SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_info_s *item = (media_info_s*)calloc(1, sizeof(media_info_s)); - if(item == NULL) - { + if (item == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -1167,8 +1068,7 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi _media_info_item_get_detail(stmt, (media_info_h)item); - if(callback((media_info_h)item, user_data) == false) - { + if (callback((media_info_h)item, user_data) == false) { media_info_destroy((media_info_h)item); break; } @@ -1193,8 +1093,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user attr = _content_get_attirbute_handle(); memset(select_query, 0x00, sizeof(select_query)); - if(!SAFE_STRLCPY(select_query, SELECT_STORAGE_LIST, sizeof(select_query))) - { + if (!SAFE_STRLCPY(select_query, SELECT_STORAGE_LIST, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1207,12 +1106,10 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user SAFE_FREE(option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_storage_s *_storage = (media_storage_s*)calloc(1, sizeof(media_storage_s)); - if(_storage == NULL) - { + if (_storage == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -1224,8 +1121,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user _storage->storage_account = g_strdup((const char *)sqlite3_column_text(stmt, 3)); _storage->storage_type = (int)sqlite3_column_int(stmt, 4); - if(callback((media_storage_h)_storage, user_data) == false) - { + if (callback((media_storage_h)_storage, user_data) == false) { media_storage_destroy((media_storage_h) _storage); break; } @@ -1250,9 +1146,8 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char *storage_id) SQLITE3_SAFE_FREE(select_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - if(sqlite3_step(stmt) == SQLITE_ROW) - { - if(STRING_VALID((const char *)sqlite3_column_text(stmt, 0))) + if (sqlite3_step(stmt) == SQLITE_ROW) { + if (STRING_VALID((const char *)sqlite3_column_text(stmt, 0))) strncpy(storage_id, (const char *)sqlite3_column_text(stmt, 0), MEDIA_CONTENT_UUID_SIZE); } else { media_content_error("There's no media!!"); diff --git a/src/media_filter.c b/src/media_filter.c index 3b87209..667302d 100755 --- a/src/media_filter.c +++ b/src/media_filter.c @@ -18,8 +18,7 @@ #include #include -static const char *media_token[] = -{ +static const char *media_token[] = { " ", "\"", "'", @@ -34,11 +33,10 @@ static const char *media_token[] = }; -typedef struct _token_t -{ +typedef struct _token_t { int type; char *str; -}token_t; +} token_t; #define MAX_LEFT_VALUE 512 @@ -64,15 +62,13 @@ static bool __is_pinyin_needed(void) /*Check CSC first*/ bool pinyin_support = FALSE; media_svc_check_pinyin_support(&pinyin_support); - if(pinyin_support) - { + if (pinyin_support) { /*Check Language Setting*/ lang = vconf_get_str(VCONFKEY_LANGSET); media_content_retvm_if(lang == NULL, ret, "Fail to get string of language set"); - if((strncmp(china, lang, strlen(china)) == 0) || - (strncmp(hongkong, lang, strlen(hongkong)) == 0)) - { + if ((strncmp(china, lang, strlen(china)) == 0) || + (strncmp(hongkong, lang, strlen(hongkong)) == 0)) { ret = TRUE; } @@ -84,7 +80,7 @@ static bool __is_pinyin_needed(void) static char *__get_order_str(media_content_order_e order_enum) { - switch(order_enum) { + switch (order_enum) { case MEDIA_CONTENT_ORDER_ASC: return (char *)"ASC"; case MEDIA_CONTENT_ORDER_DESC: @@ -96,13 +92,13 @@ static char *__get_order_str(media_content_order_e order_enum) static char *__get_collate_str(media_content_collation_e collate_type) { - switch(collate_type) { + switch (collate_type) { case MEDIA_CONTENT_COLLATE_NOCASE: return (char *)"NOCASE"; case MEDIA_CONTENT_COLLATE_RTRIM: return (char *)"RTRIM"; case MEDIA_CONTENT_COLLATE_LOCALIZED: - if(__is_pinyin_needed()) + if (__is_pinyin_needed()) return (char *)"NOCASE"; else return (char *)"localized"; @@ -122,19 +118,14 @@ static char *__media_filter_replace_attr(attribute_h attr, char *name) char *generated_value = NULL; attribute_s *_attr = (attribute_s *)attr; - if(!g_hash_table_lookup_extended(_attr->attr_map, - name, - (gpointer)&key_temp, (gpointer)&generated_value)) - { + if (!g_hash_table_lookup_extended(_attr->attr_map, name, (gpointer)&key_temp, (gpointer)&generated_value)) { //can't find the value //media_content_error("NOT_FOUND_VALUE(%s)", name); return NULL; } - if(STRING_VALID(generated_value)) - { + if (STRING_VALID(generated_value)) return strdup(generated_value); - } media_content_error("__media_filter_replace_attr fail"); @@ -146,8 +137,7 @@ static int __tokenize_operator(token_t *token, const char *str, int op_type) int ret = 0; const char *tmp = str; - if(token != NULL && STRING_VALID(tmp)) - { + if (token != NULL && STRING_VALID(tmp)) { token->type = op_type; int token_size = strlen(media_token[op_type]); media_content_retvm_if(token_size == 0, -1, "Invalid token_size. op_type[%d]", op_type); @@ -158,9 +148,7 @@ static int __tokenize_operator(token_t *token, const char *str, int op_type) strncpy(token->str, tmp, token_size); //media_content_debug("type : [%d] str : [%s]", token->type, token->str); ret = token_size; - } - else - { + } else { ret = -1; } @@ -172,17 +160,14 @@ static int __tokenize_string(token_t *token, const char *str, int size) int ret = size; const char *tmp = str; - if(token != NULL && STRING_VALID(tmp) && size > 0) - { + if (token != NULL && STRING_VALID(tmp) && size > 0) { token->str = (char*)calloc(size+1, sizeof(char)); media_content_retvm_if(token->str == NULL, -1, "OUT_OF_MEMORY"); token->type = UNKNOWN_TYPE; strncpy(token->str, tmp, size); //media_content_debug("type : [%d] str : [%s]", token->type, token->str); - } - else - { + } else { ret = -1; } @@ -199,13 +184,10 @@ static int __tokenize_attribute(GList **token_list, const char *str) const char *tmp = str; const char *dst_ptr = str + strlen(str); - for (idx = 0; (*(tmp+idx)) && (tmp < dst_ptr); idx++) - { + for (idx = 0; (*(tmp+idx)) && (tmp < dst_ptr); idx++) { //media_content_debug("[%d] '%c'", idx, tmp[idx]); - if(tmp[idx] == ' ') //" " - { - if(idx == 0) // ignore the space. - { + if (tmp[idx] == ' ') { //" " + if (idx == 0) { // ignore the space. tmp++; idx = -1; continue; @@ -215,8 +197,7 @@ static int __tokenize_attribute(GList **token_list, const char *str) token->type = UNKNOWN_TYPE; token->str = (char*)calloc(idx+1, sizeof(char)); - if(token->str == NULL) - { + if (token->str == NULL) { SAFE_FREE(token); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return -1; @@ -226,39 +207,30 @@ static int __tokenize_attribute(GList **token_list, const char *str) *token_list = g_list_append(*token_list, token); tmp = tmp +idx + strlen(media_token[0]); idx = -1; - } - else if(tmp[idx] == ',') // " , " - { - if(idx != 0) - { + } else if (tmp[idx] == ',') { // " , " + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,3); + int size = __tokenize_operator(token, tmp, 3); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; @@ -266,25 +238,20 @@ static int __tokenize_attribute(GList **token_list, const char *str) } } - if(*tmp) //remained string - { + if (*tmp) { //remained string token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; @@ -304,13 +271,10 @@ static int __tokenize(GList **token_list, const char *str) const char *tmp = str; const char *dst_ptr = str + strlen(str); - for (idx = 0; (*(tmp+idx)) && (tmp < dst_ptr); idx++) - { + for (idx = 0; (*(tmp+idx)) && (tmp < dst_ptr); idx++) { //media_content_debug("[%d] '%c'", idx, tmp[idx]); - if(tmp[idx] == media_token[0][0]) //" " - { - if(idx == 0) // ignore the space. - { + if (tmp[idx] == media_token[0][0]) { //" " + if (idx == 0) { // ignore the space. tmp++; idx = -1; continue; @@ -320,9 +284,8 @@ static int __tokenize(GList **token_list, const char *str) media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); token->type = UNKNOWN_TYPE; - token->str = (char*)calloc(idx+1, sizeof(char)); - if(token->str == NULL) - { + token->str = (char *)calloc(idx+1, sizeof(char)); + if (token->str == NULL) { SAFE_FREE(token); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return -1; @@ -332,26 +295,20 @@ static int __tokenize(GList **token_list, const char *str) *token_list = g_list_append(*token_list, token); tmp = tmp +idx + strlen(media_token[0]); idx = -1; - } - else if(tmp[idx] == media_token[1][0]) // " \" " - { + } else if (tmp[idx] == media_token[1][0]) { // " \" " int j; bool flag = false; - for(j = idx+1; tmp[j]; j++) //find next quotation - { - if(tmp[j] == media_token[1][0] && tmp[j+1] == media_token[1][0]) - { + for (j = idx+1; tmp[j]; j++) { //find next quotation + if (tmp[j] == media_token[1][0] && tmp[j+1] == media_token[1][0]) { j += 1; continue; } - if(tmp[j] == media_token[1][0]) - { + if (tmp[j] == media_token[1][0]) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); token->str = (char*) calloc(j+1+1, sizeof(char)); - if(token->str == NULL) - { + if (token->str == NULL) { SAFE_FREE(token); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return -1; @@ -367,45 +324,37 @@ static int __tokenize(GList **token_list, const char *str) } } - if(!flag && *tmp != '\0' && tmp[j]=='\0') - { + if (!flag && *tmp != '\0' && tmp[j] == '\0') { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); - token->str = (char*) calloc(j+1,sizeof(char)); - if(token->str == NULL) - { + token->str = (char *) calloc(j+1, sizeof(char)); + if (token->str == NULL) { SAFE_FREE(token); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return -1; } token->type = UNKNOWN_TYPE; - strncpy(token->str, tmp,j); + strncpy(token->str, tmp, j); //media_content_debug("type : [%d] str : [%s]", token->type, token->str); *token_list = g_list_append(*token_list, token); tmp = tmp +strlen(token->str); idx = -1; } - } - else if(tmp[idx] == media_token[2][0]) // " \' " - { + } else if (tmp[idx] == media_token[2][0]) { // " \' " int j; bool flag = false; - for(j = idx+1; tmp[j]; j++) - { - if(tmp[j] == media_token[2][0] && tmp[j+1] == media_token[2][0]) - { + for (j = idx+1; tmp[j]; j++) { + if (tmp[j] == media_token[2][0] && tmp[j+1] == media_token[2][0]) { j += 1; continue; } - if(tmp[j] == media_token[2][0]) - { + if (tmp[j] == media_token[2][0]) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); - token->str = (char*) calloc(j+1+1, sizeof(char)); - if(token->str == NULL) - { + token->str = (char *) calloc(j+1+1, sizeof(char)); + if (token->str == NULL) { SAFE_FREE(token); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return -1; @@ -421,300 +370,229 @@ static int __tokenize(GList **token_list, const char *str) } } - if(!flag && *tmp != '\0' && tmp[j]=='\0') - { + if (!flag && *tmp != '\0' && tmp[j] == '\0') { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); - token->str = (char*) calloc(j+1,sizeof(char)); - if(token->str == NULL) - { + token->str = (char*) calloc(j+1, sizeof(char)); + if (token->str == NULL) { SAFE_FREE(token); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return -1; } token->type = UNKNOWN_TYPE; - strncpy(token->str, tmp,j); + strncpy(token->str, tmp, j); //media_content_debug("type : [%d] str : [%s]", token->type, token->str); *token_list = g_list_append(*token_list, token); tmp = tmp + strlen(token->str); idx = -1; } - } - else if(tmp[idx] == media_token[3][0]) //"(" - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[3][0]) { //"(" + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,3); + int size = __tokenize_operator(token, tmp, 3); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[4][0]) //")" - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[4][0]) { //")" + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,4); + int size = __tokenize_operator(token, tmp, 4); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[5][0]) //"=" - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[5][0]) { //"=" + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,5); + int size = __tokenize_operator(token, tmp, 5); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[6][0] && tmp[idx+1] == media_token[6][1]) //"<=", - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[6][0] && tmp[idx+1] == media_token[6][1]) { //"<=", + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,6); + int size = __tokenize_operator(token, tmp, 6); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[7][0]) //"<", - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[7][0]) { //"<", + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,7); + int size = __tokenize_operator(token, tmp, 7); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[8][0] && tmp[idx+1] == media_token[8][1]) //">=", - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[8][0] && tmp[idx+1] == media_token[8][1]) { //">=", + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,8); + int size = __tokenize_operator(token, tmp, 8); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[9][0]) //">", - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[9][0]) { //">", + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } } token_t *token = (token_t*)calloc(1, sizeof(token_t)); - int size = __tokenize_operator(token, tmp,9); + int size = __tokenize_operator(token, tmp, 9); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - } - else if(tmp[idx] == media_token[10][0] && tmp[idx+1] == media_token[10][1]) //"!=", - { - if(idx != 0) - { + } else if (tmp[idx] == media_token[10][0] && tmp[idx+1] == media_token[10][1]) { //"!=", + if (idx != 0) { token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; - } - else - { + } else { *token_list = g_list_append(*token_list, token); tmp = tmp + idx; } @@ -722,14 +600,11 @@ static int __tokenize(GList **token_list, const char *str) token_t *token = (token_t*)calloc(1, sizeof(token_t)); int size = __tokenize_operator(token, tmp, 10); - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); tmp += size; idx = -1; - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; @@ -737,25 +612,20 @@ static int __tokenize(GList **token_list, const char *str) } } - if(*tmp) //remained string - { + if (*tmp) { //remained string token_t *token = (token_t*)calloc(1, sizeof(token_t)); media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY"); ret = __tokenize_string(token, tmp, idx); - if (ret < 0) - { + if (ret < 0) { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; } - if(token != NULL && STRING_VALID(token->str)) - { + if (token != NULL && STRING_VALID(token->str)) { *token_list = g_list_append(*token_list, token); - } - else - { + } else { SAFE_FREE(token); media_content_error("tokenize error occured"); return -1; @@ -774,7 +644,7 @@ int _media_filter_attribute_create(attribute_h *attr) attribute_s *_attr = (attribute_s*)calloc(1, sizeof(attribute_s)); media_content_retvm_if(_attr == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - _attr->attr_map = g_hash_table_new (g_str_hash, g_str_equal); + _attr->attr_map = g_hash_table_new(g_str_hash, g_str_equal); *attr = (attribute_h)_attr; return ret; @@ -789,23 +659,19 @@ int _media_filter_attribute_add(attribute_h attr, const char *user_attr, const c media_content_retvm_if(_attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr"); - if(STRING_VALID(user_attr) && STRING_VALID(platform_attr)) - { + if (STRING_VALID(user_attr) && STRING_VALID(platform_attr)) { _user = strdup(user_attr); media_content_retvm_if(_user == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _platform = strdup(platform_attr); - if(_platform == NULL) - { + if (_platform == NULL) { SAFE_FREE(_user); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } - g_hash_table_insert (_attr->attr_map, _user, _platform); - } - else - { + g_hash_table_insert(_attr->attr_map, _user, _platform); + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -820,8 +686,7 @@ int _media_filter_attribute_destory(attribute_h attr) media_content_retvm_if(_attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr"); - if(_attr->attr_map != NULL) - { + if (_attr->attr_map != NULL) { g_hash_table_foreach(_attr->attr_map, __filter_attribute_free_value, NULL); g_hash_table_destroy(_attr->attr_map); } @@ -844,21 +709,17 @@ int _media_filter_attribute_generate(attribute_h attr, char *condition, media_co media_content_retvm_if(generated_condition == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid generated_condition"); media_content_retvm_if(attr == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "DB field mapping table doesn't exist. Check db connection"); - if(__tokenize(&token_list, condition) < 0) - { + if (__tokenize(&token_list, condition) < 0) { media_content_error("INVALID_PARAMETER(0x%08x):Invalid the condition", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - for(idx = 0; idx < g_list_length(token_list); idx++) - { + for (idx = 0; idx < g_list_length(token_list); idx++) { token = (token_t*)g_list_nth_data(token_list, idx); - if(token->type == UNKNOWN_TYPE) - { + if (token->type == UNKNOWN_TYPE) { char *replace_str = __media_filter_replace_attr(attr, token->str); - if(STRING_VALID(replace_str)) - { + if (STRING_VALID(replace_str)) { SAFE_FREE(token->str); token->str = replace_str; } @@ -870,14 +731,12 @@ int _media_filter_attribute_generate(attribute_h attr, char *condition, media_co //make the statment size = total_str_size + COLLATE_STR_SIZE + 1; - * generated_condition = (char*)calloc(size, sizeof(char)); + *generated_condition = (char*)calloc(size, sizeof(char)); - for(idx = 0; idx < g_list_length(token_list); idx++) - { + for (idx = 0; idx < g_list_length(token_list); idx++) { token = (token_t*)g_list_nth_data(token_list, idx); - if((token != NULL) && STRING_VALID(token->str)) - { + if ((token != NULL) && STRING_VALID(token->str)) { SAFE_STRLCAT(*generated_condition, token->str, size); SAFE_STRLCAT(*generated_condition, SPACE, size); @@ -886,7 +745,7 @@ int _media_filter_attribute_generate(attribute_h attr, char *condition, media_co } } - if(collate_type == MEDIA_CONTENT_COLLATE_NOCASE || collate_type == MEDIA_CONTENT_COLLATE_RTRIM ||collate_type == MEDIA_CONTENT_COLLATE_LOCALIZED) { + if (collate_type == MEDIA_CONTENT_COLLATE_NOCASE || collate_type == MEDIA_CONTENT_COLLATE_RTRIM || collate_type == MEDIA_CONTENT_COLLATE_LOCALIZED) { SAFE_STRLCAT(*generated_condition, "COLLATE ", size); SAFE_STRLCAT(*generated_condition, __get_collate_str(collate_type), size); SAFE_STRLCAT(*generated_condition, SPACE, size); @@ -898,7 +757,7 @@ int _media_filter_attribute_generate(attribute_h attr, char *condition, media_co //if(*generated_condition != NULL) // res = 1; - if(token_list != NULL) + if (token_list != NULL) g_list_free(token_list); return ret; @@ -921,38 +780,32 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c memset(option_query, 0x00, sizeof(option_query)); /* Order by*/ - if(STRING_VALID(_filter->order_keyword) && ((_filter->order_type == MEDIA_CONTENT_ORDER_ASC) ||(_filter->order_type == MEDIA_CONTENT_ORDER_DESC))) - { + if (STRING_VALID(_filter->order_keyword) && ((_filter->order_type == MEDIA_CONTENT_ORDER_ASC) || (_filter->order_type == MEDIA_CONTENT_ORDER_DESC))) { unsigned int idx = 0; int total_str_size = 0; GList *token_list = NULL; token_t *token; char *attr_str; - if(__tokenize_attribute(&token_list, _filter->order_keyword) < 0) - { + if (__tokenize_attribute(&token_list, _filter->order_keyword) < 0) { media_content_error("INVALID_PARAMETER(0x%08x):Invalid the condition", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - for(idx = 0; idx < g_list_length(token_list); idx++) - { + for (idx = 0; idx < g_list_length(token_list); idx++) { token = (token_t*)g_list_nth_data(token_list, idx); - if(token->type == UNKNOWN_TYPE) - { + if (token->type == UNKNOWN_TYPE) { char *replace_str = __media_filter_replace_attr(attr, token->str); - if(STRING_VALID(replace_str)) - { + if (STRING_VALID(replace_str)) { attr_str = (char*)calloc(strlen(replace_str) + COLLATE_STR_SIZE + 1, sizeof(char)); - if(attr_str == NULL) - { + if (attr_str == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SAFE_FREE(replace_str); continue; } - if(_filter->order_collate_type == MEDIA_CONTENT_COLLATE_NOCASE || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_RTRIM ||_filter->order_collate_type == MEDIA_CONTENT_COLLATE_LOCALIZED) { + if (_filter->order_collate_type == MEDIA_CONTENT_COLLATE_NOCASE || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_RTRIM || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_LOCALIZED) { snprintf(attr_str, strlen(replace_str) + COLLATE_STR_SIZE + 1, "%s COLLATE %s %s", replace_str, __get_collate_str(_filter->order_collate_type), __get_order_str(_filter->order_type)); } else { snprintf(attr_str, strlen(replace_str) + COLLATE_STR_SIZE + 1, "%s %s", replace_str, __get_order_str(_filter->order_type)); @@ -961,9 +814,7 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c SAFE_FREE(token->str); token->str = attr_str; SAFE_FREE(replace_str); - } - else - { + } else { media_content_error("There is no matched db field for %s", token->str); } } @@ -977,12 +828,10 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c size = total_str_size + COLLATE_STR_SIZE + 1; generated_condition = (char*)calloc(size, sizeof(char)); - for(idx = 0; idx < g_list_length(token_list); idx++) - { + for (idx = 0; idx < g_list_length(token_list); idx++) { token = (token_t*)g_list_nth_data(token_list, idx); - if((token != NULL) && STRING_VALID(token->str)) - { + if ((token != NULL) && STRING_VALID(token->str)) { //media_content_debug("[%d] %s", idx, token->str); SAFE_STRLCAT(generated_condition, token->str, size); SAFE_STRLCAT(generated_condition, SPACE, size); @@ -995,7 +844,7 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c snprintf(condition, sizeof(condition), "ORDER BY %s", generated_condition); SAFE_STRLCAT(option_query, condition, sizeof(option_query)); - if(token_list != NULL) + if (token_list != NULL) g_list_free(token_list); SAFE_FREE(generated_condition); @@ -1006,14 +855,10 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c snprintf(condition, sizeof(condition), "LIMIT %d, %d", _filter->offset, _filter->count); SAFE_STRLCAT(option_query, condition, sizeof(option_query)); - if(STRING_VALID(option_query)) - { + if (STRING_VALID(option_query)) *generated_option = strdup(option_query); - } else - { *generated_option = NULL; - } return ret; } @@ -1046,17 +891,14 @@ int media_filter_destroy(filter_h filter) int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if(_filter) - { + if (_filter) { SAFE_FREE(_filter->storage_id); SAFE_FREE(_filter->condition); SAFE_FREE(_filter->order_keyword); SAFE_FREE(_filter); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1069,13 +911,10 @@ int media_filter_set_offset(filter_h filter, int offset, int count) int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if(_filter != NULL) - { + if (_filter != NULL) { _filter->offset = offset; _filter->count = count; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1088,13 +927,10 @@ int media_filter_set_condition(filter_h filter, const char *condition, media_con int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if((_filter != NULL) && STRING_VALID(condition) - && ((collate_type >= MEDIA_CONTENT_COLLATE_DEFAULT) && (collate_type <= MEDIA_CONTENT_COLLATE_LOCALIZED))) - { - if(STRING_VALID(_filter->condition)) - { + if ((_filter != NULL) && STRING_VALID(condition) + && ((collate_type >= MEDIA_CONTENT_COLLATE_DEFAULT) && (collate_type <= MEDIA_CONTENT_COLLATE_LOCALIZED))) { + if (STRING_VALID(_filter->condition)) SAFE_FREE(_filter->condition); - } _filter->condition = strdup(condition); media_content_retvm_if(_filter->condition == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); @@ -1102,9 +938,7 @@ int media_filter_set_condition(filter_h filter, const char *condition, media_con media_content_sec_debug("Condition string : %s", _filter->condition); _filter->condition_collate_type = collate_type; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1117,28 +951,22 @@ int media_filter_set_order(filter_h filter, media_content_order_e order_type, co int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if((_filter != NULL) && STRING_VALID(order_keyword) - && ((order_type == MEDIA_CONTENT_ORDER_ASC) ||(order_type == MEDIA_CONTENT_ORDER_DESC)) - && ((collate_type >= MEDIA_CONTENT_COLLATE_DEFAULT) && (collate_type <= MEDIA_CONTENT_COLLATE_LOCALIZED))) - { + if ((_filter != NULL) && STRING_VALID(order_keyword) + && ((order_type == MEDIA_CONTENT_ORDER_ASC) || (order_type == MEDIA_CONTENT_ORDER_DESC)) + && ((collate_type >= MEDIA_CONTENT_COLLATE_DEFAULT) && (collate_type <= MEDIA_CONTENT_COLLATE_LOCALIZED))) { SAFE_FREE(_filter->order_keyword); - if(STRING_VALID(order_keyword)) - { + if (STRING_VALID(order_keyword)) { _filter->order_keyword = strdup(order_keyword); media_content_retvm_if(_filter->order_keyword == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _filter->order_type = order_type; _filter->order_collate_type = collate_type; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1151,20 +979,15 @@ int media_filter_set_storage(filter_h filter, const char *storage_id) int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if((_filter != NULL) && STRING_VALID(storage_id)) - { - if(STRING_VALID(_filter->storage_id)) - { + if ((_filter != NULL) && STRING_VALID(storage_id)) { + if (STRING_VALID(_filter->storage_id)) SAFE_FREE(_filter->storage_id); - } _filter->storage_id = strdup(storage_id); media_content_retvm_if(_filter->storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); media_content_sec_debug("storage_id : %s", _filter->storage_id); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1177,13 +1000,10 @@ int media_filter_get_offset(filter_h filter, int *offset, int *count) int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if(_filter) - { + if (_filter) { *offset = _filter->offset; *count = _filter->count; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1196,22 +1016,16 @@ int media_filter_get_condition(filter_h filter, char **condition, media_content_ int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if(_filter) - { - if(STRING_VALID(_filter->condition)) - { + if (_filter) { + if (STRING_VALID(_filter->condition)) { *condition = strdup(_filter->condition); media_content_retvm_if(*condition == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *condition = NULL; } *collate_type = _filter->condition_collate_type; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1224,23 +1038,17 @@ int media_filter_get_order(filter_h filter, media_content_order_e* order_type, c int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if(_filter) - { - if(STRING_VALID(_filter->order_keyword)) - { + if (_filter) { + if (STRING_VALID(_filter->order_keyword)) { *order_keyword = strdup(_filter->order_keyword); media_content_retvm_if(*order_keyword == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *order_keyword = NULL; } *order_type = _filter->order_type; *collate_type = _filter->order_collate_type; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1253,20 +1061,14 @@ int media_filter_get_storage(filter_h filter, char **storage_id) int ret = MEDIA_CONTENT_ERROR_NONE; filter_s *_filter = (filter_s*)filter; - if(_filter) - { - if(STRING_VALID(_filter->storage_id)) - { + if (_filter) { + if (STRING_VALID(_filter->storage_id)) { *storage_id = strdup(_filter->storage_id); media_content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *storage_id = NULL; } - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/src/media_folder.c b/src/media_folder.c index f7b4b95..fb66b18 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -24,8 +24,7 @@ int media_folder_get_folder_count_from_db(filter_h filter, int *folder_count) { int ret = MEDIA_CONTENT_ERROR_NONE; - if(!folder_count) - { + if (!folder_count) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -39,8 +38,7 @@ int media_folder_foreach_folder_from_db(filter_h filter, media_folder_cb callbac { int ret = MEDIA_CONTENT_ERROR_NONE; - if(callback == NULL) - { + if (callback == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -54,12 +52,9 @@ int media_folder_get_media_count_from_db(const char *folder_id, filter_h filter, { int ret = MEDIA_CONTENT_ERROR_NONE; - if(STRING_VALID(folder_id) && media_count) - { + if (STRING_VALID(folder_id) && media_count) { ret = _media_db_get_group_item_count(folder_id, filter, MEDIA_GROUP_FOLDER, media_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -71,12 +66,9 @@ int media_folder_foreach_media_from_db(const char *folder_id, filter_h filter, m { int ret = MEDIA_CONTENT_ERROR_NONE; - if((callback != NULL) && STRING_VALID(folder_id)) - { + if ((callback != NULL) && STRING_VALID(folder_id)) { ret = _media_db_get_group_item(folder_id, filter, callback, user_data, MEDIA_GROUP_FOLDER); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -88,8 +80,7 @@ int media_folder_destroy(media_folder_h folder) { int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { + if (_folder) { SAFE_FREE(_folder->path); SAFE_FREE(_folder->name); SAFE_FREE(_folder->folder_id); @@ -97,9 +88,7 @@ int media_folder_destroy(media_folder_h folder) SAFE_FREE(_folder->storage_uuid); SAFE_FREE(_folder); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -111,60 +100,49 @@ int media_folder_clone(media_folder_h *dst, media_folder_h src) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_src = (media_folder_s*)src; - if(_src != NULL) - { + if (_src != NULL) { media_folder_s *_dst = (media_folder_s*)calloc(1, sizeof(media_folder_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - if(STRING_VALID(_src->folder_id)) - { + if (STRING_VALID(_src->folder_id)) { _dst->folder_id = strdup(_src->folder_id); - if(_dst->folder_id == NULL) - { + if (_dst->folder_id == NULL) { SAFE_FREE(_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->parent_folder_id)) - { + if (STRING_VALID(_src->parent_folder_id)) { _dst->parent_folder_id = strdup(_src->parent_folder_id); - if(_dst->parent_folder_id == NULL) - { + if (_dst->parent_folder_id == NULL) { media_folder_destroy((media_folder_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->name)) - { + if (STRING_VALID(_src->name)) { _dst->name = strdup(_src->name); - if(_dst->name == NULL) - { + if (_dst->name == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_folder_destroy((media_folder_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->path)) - { + if (STRING_VALID(_src->path)) { _dst->path = strdup(_src->path); - if(_dst->path == NULL) - { + if (_dst->path == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_folder_destroy((media_folder_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->storage_uuid)) - { + if (STRING_VALID(_src->storage_uuid)) { _dst->storage_uuid = strdup(_src->storage_uuid); - if(_dst->storage_uuid == NULL) - { + if (_dst->storage_uuid == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_folder_destroy((media_folder_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -173,14 +151,12 @@ int media_folder_clone(media_folder_h *dst, media_folder_h src) _dst->storage_type = _src->storage_type; _dst->modified_time = _src->modified_time; - _dst->folder_order= _src->folder_order; + _dst->folder_order = _src->folder_order; *dst = (media_folder_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -193,21 +169,15 @@ int media_folder_get_folder_id(media_folder_h folder, char **folder_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { - if(STRING_VALID(_folder->folder_id)) - { + if (_folder) { + if (STRING_VALID(_folder->folder_id)) { *folder_id = strdup(_folder->folder_id); media_content_retvm_if(*folder_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *folder_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -220,21 +190,15 @@ int media_folder_get_parent_folder_id(media_folder_h folder, char **parent_folde int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { - if(STRING_VALID(_folder->parent_folder_id)) - { + if (_folder) { + if (STRING_VALID(_folder->parent_folder_id)) { *parent_folder_id = strdup(_folder->parent_folder_id); media_content_retvm_if(*parent_folder_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *parent_folder_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -247,22 +211,16 @@ int media_folder_get_path(media_folder_h folder, char **path) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { - if(STRING_VALID(_folder->path)) - { + if (_folder) { + if (STRING_VALID(_folder->path)) { *path = strdup(_folder->path); media_content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *path = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -276,22 +234,16 @@ int media_folder_get_name(media_folder_h folder, char **name) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { - if(STRING_VALID(_folder->name)) - { + if (_folder) { + if (STRING_VALID(_folder->name)) { *name = strdup(_folder->name); media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *name = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -304,13 +256,10 @@ int media_folder_get_modified_time(media_folder_h folder, time_t* time) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { + if (_folder) { *time = _folder->modified_time; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -323,13 +272,10 @@ int media_folder_get_storage_type(media_folder_h folder, media_content_storage_e int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { + if (_folder) { *storage_type = _folder->storage_type; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -342,22 +288,16 @@ int media_folder_get_storage_id(media_folder_h folder, char **storage_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { - if(STRING_VALID(_folder->storage_uuid)) - { + if (_folder) { + if (STRING_VALID(_folder->storage_uuid)) { *storage_id = strdup(_folder->storage_uuid); media_content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *storage_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -370,13 +310,10 @@ int media_folder_get_order(media_folder_h folder, int *order) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder) - { + if (_folder) { *order = _folder->folder_order; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -391,8 +328,7 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde sqlite3_stmt *stmt = NULL; char select_query[DEFAULT_QUERY_SIZE]; - if(!STRING_VALID(folder_id)) - { + if (!STRING_VALID(folder_id)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -406,14 +342,12 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde media_folder_s *_folder = NULL; - while(sqlite3_step(stmt) == SQLITE_ROW) - { - if(_folder) + while (sqlite3_step(stmt) == SQLITE_ROW) { + if (_folder) media_folder_destroy((media_folder_h)_folder); _folder = (media_folder_s*)calloc(1, sizeof(media_folder_s)); - if(_folder == NULL) - { + if (_folder == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -439,8 +373,7 @@ int media_folder_update_to_db(media_folder_h folder) media_folder_s *_folder = (media_folder_s*)folder; char *sql = NULL; - if((_folder == NULL) || (_folder->folder_id == NULL)) - { + if ((_folder == NULL) || (_folder->folder_id == NULL)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -451,8 +384,7 @@ int media_folder_update_to_db(media_folder_h folder) ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); - if(STRING_VALID(_folder->folder_id) && g_src_path) - { + if (STRING_VALID(_folder->folder_id) && g_src_path) { char *name_pinyin = NULL; bool pinyin_support = FALSE; @@ -463,11 +395,11 @@ int media_folder_update_to_db(media_folder_h folder) /*Update Pinyin If Support Pinyin*/ media_svc_check_pinyin_support(&pinyin_support); - if(pinyin_support) + if (pinyin_support) media_svc_get_pinyin(_content_get_db_handle(), _folder->name, &name_pinyin); sql = sqlite3_mprintf("UPDATE %Q SET path='%q', name='%q', modified_time=%d, name_pinyin='%q' WHERE folder_uuid=%Q", - DB_TABLE_FOLDER, _folder->path, _folder->name, _folder->modified_time, name_pinyin, _folder->folder_id); + DB_TABLE_FOLDER, _folder->path, _folder->name, _folder->modified_time, name_pinyin, _folder->folder_id); ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); @@ -507,8 +439,7 @@ int media_folder_set_name(media_folder_h folder, const char *name) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder != NULL && STRING_VALID(name)) - { + if (_folder != NULL && STRING_VALID(name)) { if (STRING_VALID(_folder->path) && STRING_VALID(_folder->name)) { char *folder_path = NULL; char new_folder_path[MAX_QUERY_SIZE] = {0,}; @@ -516,7 +447,7 @@ int media_folder_set_name(media_folder_h folder, const char *name) folder_path = g_path_get_dirname(_folder->path); media_content_sec_debug("Existed Folder Path : %s", _folder->path); - snprintf(new_folder_path, sizeof(new_folder_path), "%s/%s", folder_path, name); + snprintf(new_folder_path, sizeof(new_folder_path), "%s/%s", folder_path, name); media_content_sec_debug("New Path : %s", new_folder_path); ret = _media_util_check_ignore_dir(new_folder_path, &ignore_dir); @@ -538,9 +469,7 @@ int media_folder_set_name(media_folder_h folder, const char *name) _folder->name = strdup(name); media_content_retvm_if(_folder->name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -553,12 +482,9 @@ int media_folder_set_order(media_folder_h folder, int order) int ret = MEDIA_CONTENT_ERROR_NONE; media_folder_s *_folder = (media_folder_s*)folder; - if(_folder != NULL && order >= 0) - { + if (_folder != NULL && order >= 0) { _folder->folder_order = order; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/src/media_group.c b/src/media_group.c index a3f3760..d8ec816 100755 --- a/src/media_group.c +++ b/src/media_group.c @@ -25,11 +25,8 @@ int media_album_get_album_count_from_db(filter_h filter, int *album_count) int ret = MEDIA_CONTENT_ERROR_NONE; if (album_count != NULL) - { ret = _media_db_get_group_count(filter, MEDIA_GROUP_ALBUM, album_count); - } - else - { + else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -41,8 +38,7 @@ int media_album_foreach_album_from_db(filter_h filter, media_album_cb callback, { int ret = MEDIA_CONTENT_ERROR_NONE; - if (callback == NULL) - { + if (callback == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -57,11 +53,8 @@ int media_album_get_media_count_from_db(int album_id, filter_h filter, int *medi int ret = MEDIA_CONTENT_ERROR_NONE; if ((album_id > 0) && (media_count != NULL)) - { ret = _media_db_get_group_item_count_by_id(album_id, filter, MEDIA_GROUP_ALBUM, media_count); - } - else - { + else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -74,11 +67,8 @@ int media_album_foreach_media_from_db(int album_id, filter_h filter, media_info_ int ret = MEDIA_CONTENT_ERROR_NONE; if ((album_id > 0) && (callback != NULL)) - { ret = _media_db_get_group_item_by_id(album_id, filter, callback, user_data, MEDIA_GROUP_ALBUM); - } - else - { + else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -92,8 +82,7 @@ int media_album_get_album_from_db(int album_id, media_album_h *album) sqlite3_stmt *stmt = NULL; char select_query[DEFAULT_QUERY_SIZE]; - if (album_id < 0) - { + if (album_id < 0) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -105,11 +94,9 @@ int media_album_get_album_from_db(int album_id, media_album_h *album) ret = _content_query_prepare(&stmt, select_query, NULL, NULL); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_album_s *_album = (media_album_s*)calloc(1, sizeof(media_album_s)); - if (_album == NULL) - { + if (_album == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -132,17 +119,14 @@ int media_album_destroy(media_album_h album) int ret = MEDIA_CONTENT_ERROR_NONE; media_album_s *_album = (media_album_s*)album; - if (_album) - { + if (_album) { SAFE_FREE(_album->name); SAFE_FREE(_album->artist); SAFE_FREE(_album->album_art_path); SAFE_FREE(_album); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -155,40 +139,33 @@ int media_album_clone(media_album_h *dst, media_album_h src) int ret = MEDIA_CONTENT_ERROR_NONE; media_album_s *_src = (media_album_s*)src; - if (_src != NULL) - { + if (_src != NULL) { media_album_s *_dst = (media_album_s*)calloc(1, sizeof(media_album_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _dst->album_id = _src->album_id; - if(STRING_VALID(_src->name)) - { + if (STRING_VALID(_src->name)) { _dst->name = strdup(_src->name); - if (_dst->name == NULL) - { + if (_dst->name == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_album_destroy((media_album_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->artist)) - { + if (STRING_VALID(_src->artist)) { _dst->artist = strdup(_src->artist); - if (_dst->artist == NULL) - { + if (_dst->artist == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_album_destroy((media_album_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->album_art_path)) - { + if (STRING_VALID(_src->album_art_path)) { _dst->album_art_path = strdup(_src->album_art_path); - if (_dst->album_art_path == NULL) - { + if (_dst->album_art_path == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_album_destroy((media_album_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -198,9 +175,7 @@ int media_album_clone(media_album_h *dst, media_album_h src) *dst = (media_album_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -213,13 +188,10 @@ int media_album_get_album_id(media_album_h album, int *album_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_album_s *_album = (media_album_s*)album; - if (_album && album_id) - { + if (_album && album_id) { *album_id = _album->album_id; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -232,22 +204,16 @@ int media_album_get_name(media_album_h album, char **name) int ret = MEDIA_CONTENT_ERROR_NONE; media_album_s *_album = (media_album_s*)album; - if (_album) - { - if (STRING_VALID(_album->name)) - { + if (_album) { + if (STRING_VALID(_album->name)) { *name = strdup(_album->name); media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *name = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -260,22 +226,16 @@ int media_album_get_artist(media_album_h album, char **artist) int ret = MEDIA_CONTENT_ERROR_NONE; media_album_s *_album = (media_album_s*)album; - if (_album) - { - if (STRING_VALID(_album->artist)) - { + if (_album) { + if (STRING_VALID(_album->artist)) { *artist = strdup(_album->artist); media_content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -288,22 +248,16 @@ int media_album_get_album_art(media_album_h album, char **album_art) int ret = MEDIA_CONTENT_ERROR_NONE; media_album_s *_album = (media_album_s*)album; - if (_album) - { - if(STRING_VALID(_album->album_art_path)) - { + if (_album) { + if (STRING_VALID(_album->album_art_path)) { *album_art = strdup(_album->album_art_path); media_content_retvm_if(*album_art == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *album_art = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -315,13 +269,10 @@ int media_group_get_group_count_from_db(filter_h filter, media_group_e group, in { int ret = MEDIA_CONTENT_ERROR_NONE; - if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX) || (group_count == NULL)) - { + if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX) || (group_count == NULL)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - else - { + } else { ret = _media_db_get_media_group_count(group, filter, group_count); } @@ -332,13 +283,10 @@ int media_group_foreach_group_from_db(filter_h filter, media_group_e group, medi { int ret = MEDIA_CONTENT_ERROR_NONE; - if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) - { + if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - else - { + } else { ret = _media_db_get_media_group(group, filter, callback, user_data); } @@ -349,13 +297,10 @@ int media_group_get_media_count_from_db(const char *group_name, media_group_e gr { int ret = MEDIA_CONTENT_ERROR_NONE; - if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) - { + if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - else - { + } else { ret = _media_db_get_media_group_item_count(group_name, filter, group, media_count); } @@ -366,13 +311,10 @@ int media_group_foreach_media_from_db(const char *group_name, media_group_e grou { int ret = MEDIA_CONTENT_ERROR_NONE; - if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) - { + if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - else - { + } else { ret = _media_db_get_media_group_item(group_name, filter, group, callback, user_data); } diff --git a/src/media_image.c b/src/media_image.c index 2232b81..cf344fc 100755 --- a/src/media_image.c +++ b/src/media_image.c @@ -23,8 +23,7 @@ int image_meta_destroy(image_meta_h image) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image) - { + if (_image) { SAFE_FREE(_image->media_id); SAFE_FREE(_image->date_taken); SAFE_FREE(_image->title); @@ -35,9 +34,7 @@ int image_meta_destroy(image_meta_h image) SAFE_FREE(_image); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -50,82 +47,67 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_src = (image_meta_s*)src; - if(_src != NULL) - { + if (_src != NULL) { image_meta_s *_dst = (image_meta_s*)calloc(1, sizeof(image_meta_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - if(STRING_VALID(_src->media_id)) - { + if (STRING_VALID(_src->media_id)) { _dst->media_id = strdup(_src->media_id); - if(_dst->media_id == NULL) - { + if (_dst->media_id == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->date_taken)) - { + if (STRING_VALID(_src->date_taken)) { _dst->date_taken = strdup(_src->date_taken); - if(_dst->date_taken == NULL) - { + if (_dst->date_taken == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->title)) - { + if (STRING_VALID(_src->title)) { _dst->title = strdup(_src->title); - if(_dst->title == NULL) - { + if (_dst->title == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->weather)) - { + if (STRING_VALID(_src->weather)) { _dst->weather = strdup(_src->weather); - if(_dst->weather == NULL) - { + if (_dst->weather == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->burst_id)) - { + if (STRING_VALID(_src->burst_id)) { _dst->burst_id = strdup(_src->burst_id); - if(_dst->burst_id == NULL) - { + if (_dst->burst_id == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->exposure_time)) - { + if (STRING_VALID(_src->exposure_time)) { _dst->exposure_time = strdup(_src->exposure_time); - if(_dst->exposure_time == NULL) - { + if (_dst->exposure_time == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->model)) - { + if (STRING_VALID(_src->model)) { _dst->model = strdup(_src->model); - if(_dst->model == NULL) - { + if (_dst->model == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); image_meta_destroy((image_meta_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -141,9 +123,7 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src) *dst = (image_meta_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -156,24 +136,18 @@ int image_meta_get_media_id(image_meta_h image, char **media_id) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && media_id) - { - if(STRING_VALID(_image->media_id)) - { + if (_image && media_id) { + if (STRING_VALID(_image->media_id)) { char *new_string = strdup(_image->media_id); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *media_id = new_string; - } - else - { + } else { *media_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -187,13 +161,10 @@ int image_meta_get_width(image_meta_h image, int *width) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && width) - { + if (_image && width) { *width = _image->width; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -205,13 +176,10 @@ int image_meta_get_height(image_meta_h image, int *height) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && height) - { + if (_image && height) { *height = _image->height; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -224,13 +192,10 @@ int image_meta_get_orientation(image_meta_h image, media_content_orientation_e* int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && orientation) - { + if (_image && orientation) { *orientation = _image->orientation; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -243,24 +208,18 @@ int image_meta_get_date_taken(image_meta_h image, char **date_taken) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && date_taken) - { - if(STRING_VALID(_image->date_taken)) - { + if (_image && date_taken) { + if (STRING_VALID(_image->date_taken)) { char *new_string = strdup(_image->date_taken); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *date_taken = new_string; - } - else - { + } else { *date_taken = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -273,21 +232,15 @@ int image_meta_get_burst_id(image_meta_h image, char **burst_id) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && burst_id) - { - if(STRING_VALID(_image->burst_id)) - { + if (_image && burst_id) { + if (STRING_VALID(_image->burst_id)) { *burst_id = strdup(_image->burst_id); media_content_retvm_if(*burst_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *burst_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -300,21 +253,15 @@ int image_meta_get_exposure_time(image_meta_h image, char **exposure_time) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && exposure_time) - { - if(STRING_VALID(_image->exposure_time)) - { + if (_image && exposure_time) { + if (STRING_VALID(_image->exposure_time)) { *exposure_time = strdup(_image->exposure_time); media_content_retvm_if(*exposure_time == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *exposure_time = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -327,13 +274,10 @@ int image_meta_get_fnumber(image_meta_h image, double *fnumber) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && fnumber) - { + if (_image && fnumber) { *fnumber = _image->fnumber; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -346,13 +290,10 @@ int image_meta_get_iso(image_meta_h image, int *iso) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && iso) - { + if (_image && iso) { *iso = _image->iso; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -365,21 +306,15 @@ int image_meta_get_model(image_meta_h image, char **model) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && model) - { - if(STRING_VALID(_image->model)) - { + if (_image && model) { + if (STRING_VALID(_image->model)) { *model = strdup(_image->model); media_content_retvm_if(*model == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *model = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -392,17 +327,14 @@ int image_meta_is_burst_shot(image_meta_h image, bool *is_burst_shot) int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image && is_burst_shot) - { - if(STRING_VALID(_image->burst_id)) + if (_image && is_burst_shot) { + if (STRING_VALID(_image->burst_id)) *is_burst_shot = true; else *is_burst_shot = false; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -415,14 +347,12 @@ int image_meta_set_orientation(image_meta_h image, media_content_orientation_e o int ret = MEDIA_CONTENT_ERROR_NONE; image_meta_s *_image = (image_meta_s*)image; - if(_image == NULL) - { + if (_image == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - if((orientation < MEDIA_CONTENT_ORIENTATION_NOT_AVAILABLE) || (orientation > MEDIA_CONTENT_ORIENTATION_ROT_270)) - { + if ((orientation < MEDIA_CONTENT_ORIENTATION_NOT_AVAILABLE) || (orientation > MEDIA_CONTENT_ORIENTATION_ROT_270)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -438,8 +368,7 @@ int image_meta_update_to_db(image_meta_h image) image_meta_s *_image = (image_meta_s*)image; char *sql = NULL; - if(_image != NULL && STRING_VALID(_image->media_id)) - { + if (_image != NULL && STRING_VALID(_image->media_id)) { char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,}; memset(storage_id, 0x00, sizeof(storage_id)); @@ -449,9 +378,7 @@ int image_meta_update_to_db(image_meta_h image) sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, storage_id, _image->orientation, _image->weather, _image->media_id); ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/src/media_info.c b/src/media_info.c index 808dc50..a3c57de 100755 --- a/src/media_info.c +++ b/src/media_info.c @@ -555,7 +555,7 @@ int media_info_delete_batch_from_db(filter_h filter) ret = _content_query_sql(query_string); if (ret == MEDIA_CONTENT_ERROR_NONE) { - /* Send notification for this + /* Send notification for this In this case, send noti for internal storage and external storage */ media_content_debug("Batch deletion is successfull. Send notification for this"); @@ -2369,7 +2369,7 @@ int media_info_update_to_db(media_info_h media) } if (ret == MEDIA_CONTENT_ERROR_NONE) { - /* Send notification for this update */ + /* Send notification for this update */ media_content_debug("Update is successfull. Send notification for this"); if (_media->file_path && _media->mime_type) media_svc_publish_noti(_content_get_db_handle(), MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_UPDATE, _media->file_path, _media->media_type, _media->media_id, _media->mime_type); diff --git a/src/media_playlist.c b/src/media_playlist.c index e78a6e3..ff14725 100755 --- a/src/media_playlist.c +++ b/src/media_playlist.c @@ -53,11 +53,9 @@ static void __media_playlist_item_release(media_playlist_s *playlist) media_content_debug("list_cnt : [%d]", list_cnt); - for(idx = 0; idx < list_cnt; idx++) - { + for (idx = 0; idx < list_cnt; idx++) { item = (media_playlist_item_s*)g_list_nth_data(playlist->item_list, idx); - if(item != NULL) - { + if (item != NULL) { SAFE_FREE(item->media_id); SAFE_FREE(item->playlist_name); SAFE_FREE(item->thumbnail_path); @@ -89,9 +87,8 @@ static int __media_playlist_insert_playlist_record(const char *playlist_name, in SQLITE3_SAFE_FREE(select_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { - *playlist_id = (int)sqlite3_column_int(stmt,0); + while (sqlite3_step(stmt) == SQLITE_ROW) { + *playlist_id = (int)sqlite3_column_int(stmt, 0); } SQLITE3_FINALIZE(stmt); @@ -115,8 +112,7 @@ static int __media_playlist_insert_item_to_playlist(int playlist_id, const char ret = _content_query_prepare(&stmt, select_query, NULL, NULL); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { play_order = (int)sqlite3_column_int(stmt, 0); } @@ -260,17 +256,16 @@ static int __media_playlist_import_item_from_file(const char* playlist_path, cha file_size = ftell(fp); // Here we can find the size of file fseek(fp, 0 , SEEK_SET); // Return to the beginning of file - if(file_size == 0) { + if (file_size == 0) { media_content_debug("file is empty."); fclose(fp); return MEDIA_CONTENT_ERROR_NONE; } // Allocate the memory and copy file content there - if(file_size > 0) + if (file_size > 0) buf = malloc(file_size + 1); - if(buf == NULL) - { + if (buf == NULL) { media_content_error("Out of Memory"); fclose(fp); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -278,7 +273,7 @@ static int __media_playlist_import_item_from_file(const char* playlist_path, cha tmp_buf = buf; - if(fread(buf, file_size, 1, fp) != 1) { + if (fread(buf, file_size, 1, fp) != 1) { fclose(fp); SAFE_FREE(buf); media_content_stderror("fread fail"); @@ -302,11 +297,11 @@ static int __media_playlist_import_item_from_file(const char* playlist_path, cha snprintf(format, 25, "%%%d[^\n]", MAX_TMP_STR); // This cycle gets lines one by one from buffer till the end of buffer. Empty line ("\n") must be treated specifically - while((sscanf(tmp_buf, format, tmp_str) == 1) || (*tmp_buf == '\n')) { - if(*tmp_buf == '\n') {// Check if there is an empty line, skip '\n' symbol + while ((sscanf(tmp_buf, format, tmp_str) == 1) || (*tmp_buf == '\n')) { + if (*tmp_buf == '\n') {// Check if there is an empty line, skip '\n' symbol tmp_buf += 1; - if(tmp_buf < (buf + file_size)) + if (tmp_buf < (buf + file_size)) continue; // We are still in buffer else break; // Empty line was in the end of buffer @@ -314,8 +309,8 @@ static int __media_playlist_import_item_from_file(const char* playlist_path, cha tmp_str_len = strlen(tmp_str); // Save the length of line - if(tmp_str[0] != '#') { // Check that the line is not a comment - if(!(current_index < (current_max_size - 1))) { // Check if we have completely filled record array + if (tmp_str[0] != '#') { // Check that the line is not a comment + if (!(current_index < (current_max_size - 1))) { // Check if we have completely filled record array // Expand array size and relocate the array (records will be copied into new one) current_max_size += PLAYLIST_ARRAY_EXPAND; char **tmp_ptr = calloc(current_max_size, sizeof(char*)); @@ -359,9 +354,9 @@ static int __media_playlist_import_item_from_file(const char* playlist_path, cha static int __media_playlist_destroy_import_item(char** item_list, int item_count) { - int i; + int i = 0; - for(i = 0; i < item_count; ++i) { + for (i = 0; i < item_count; ++i) { SAFE_FREE(item_list[i]); item_list[i] = NULL; } @@ -385,8 +380,7 @@ int media_playlist_insert_to_db(const char *name, media_playlist_h *playlist) int ret = MEDIA_CONTENT_ERROR_NONE; int playlist_id = 0; - if(!STRING_VALID(name)) - { + if (!STRING_VALID(name)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -396,8 +390,7 @@ int media_playlist_insert_to_db(const char *name, media_playlist_h *playlist) ret = __media_playlist_insert_playlist_record(name, &playlist_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(_playlist); return ret; } @@ -405,8 +398,7 @@ int media_playlist_insert_to_db(const char *name, media_playlist_h *playlist) _playlist->playlist_id = playlist_id; _playlist->name = strdup(name); - if(_playlist->name == NULL) - { + if (_playlist->name == NULL) { SAFE_FREE(_playlist); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -422,8 +414,7 @@ int media_playlist_delete_from_db(int playlist_id) int ret = MEDIA_CONTENT_ERROR_NONE; char *query_str = NULL; - if(playlist_id < 0) - { + if (playlist_id < 0) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -441,12 +432,9 @@ int media_playlist_get_playlist_count_from_db(filter_h filter, int *playlist_cou { int ret = MEDIA_CONTENT_ERROR_NONE; - if(playlist_count != NULL) - { + if (playlist_count != NULL) { ret = _media_db_get_group_count(filter, MEDIA_GROUP_PLAYLIST, playlist_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -458,8 +446,7 @@ int media_playlist_foreach_playlist_from_db(filter_h filter, media_playlist_cb c { int ret = MEDIA_CONTENT_ERROR_NONE; - if(callback == NULL) - { + if (callback == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -473,12 +460,9 @@ int media_playlist_get_media_count_from_db(int playlist_id, filter_h filter, int { int ret = MEDIA_CONTENT_ERROR_NONE; - if((playlist_id > 0) && (media_count != NULL)) - { + if ((playlist_id > 0) && (media_count != NULL)) { ret = _media_db_get_group_item_count_by_id(playlist_id, filter, MEDIA_GROUP_PLAYLIST, media_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -490,12 +474,9 @@ int media_playlist_foreach_media_from_db(int playlist_id, filter_h filter, playl { int ret = MEDIA_CONTENT_ERROR_NONE; - if((playlist_id > 0) && (callback != NULL)) - { + if ((playlist_id > 0) && (callback != NULL)) { ret = _media_db_get_playlist_item(playlist_id, filter, callback, user_data); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -508,16 +489,13 @@ int media_playlist_destroy(media_playlist_h playlist) int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if(_playlist) - { + if (_playlist) { SAFE_FREE(_playlist->name); SAFE_FREE(_playlist->thumbnail_path); SAFE_FREE(_playlist); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -530,18 +508,15 @@ int media_playlist_clone(media_playlist_h *dst, media_playlist_h src) int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_src = (media_playlist_s*)src; - if(_src != NULL) - { + if (_src != NULL) { media_playlist_s *_dst = (media_playlist_s*)calloc(1, sizeof(media_playlist_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _dst->playlist_id = _src->playlist_id; - if(STRING_VALID(_src->name)) - { + if (STRING_VALID(_src->name)) { _dst->name = strdup(_src->name); - if(_dst->name == NULL) - { + if (_dst->name == NULL) { media_playlist_destroy((media_playlist_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -551,9 +526,7 @@ int media_playlist_clone(media_playlist_h *dst, media_playlist_h src) *dst = (media_playlist_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -567,8 +540,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl sqlite3_stmt *stmt = NULL; char select_query[DEFAULT_QUERY_SIZE]; - if(playlist_id > 0) - { + if (playlist_id > 0) { memset(select_query, 0x00, sizeof(select_query)); snprintf(select_query, sizeof(select_query), SELECT_PLAYLIST_FROM_PLAYLIST, playlist_id); @@ -578,14 +550,12 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl media_playlist_s *_playlist = NULL; - while(sqlite3_step(stmt) == SQLITE_ROW) - { - if(_playlist) + while (sqlite3_step(stmt) == SQLITE_ROW) { + if (_playlist) media_playlist_destroy((media_playlist_h)_playlist); _playlist = (media_playlist_s*)calloc(1, sizeof(media_playlist_s)); - if(_playlist == NULL) - { + if (_playlist == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -599,9 +569,7 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl } SQLITE3_FINALIZE(stmt); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -615,12 +583,9 @@ int media_playlist_get_playlist_id(media_playlist_h playlist, int *playlist_id) media_playlist_s *_playlist = (media_playlist_s*)playlist; - if((_playlist != NULL) && (playlist_id != NULL)) - { + if ((_playlist != NULL) && (playlist_id != NULL)) { *playlist_id = _playlist->playlist_id; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -632,22 +597,16 @@ int media_playlist_get_name(media_playlist_h playlist, char **name) { int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if(_playlist) - { - if(STRING_VALID(_playlist->name)) - { + if (_playlist) { + if (STRING_VALID(_playlist->name)) { *name = strdup(_playlist->name); media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *name = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -659,22 +618,16 @@ int media_playlist_get_thumbnail_path(media_playlist_h playlist, char **path) { int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if(_playlist) - { - if(STRING_VALID(_playlist->thumbnail_path)) - { + if (_playlist) { + if (STRING_VALID(_playlist->thumbnail_path)) { *path = strdup(_playlist->thumbnail_path); media_content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *path = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -690,8 +643,7 @@ int media_playlist_get_play_order(media_playlist_h playlist, int playlist_member sqlite3_stmt *stmt = NULL; char select_query[DEFAULT_QUERY_SIZE]; - if((_playlist == NULL) || (playlist_member_id < 0) || (play_order == NULL)) - { + if ((_playlist == NULL) || (playlist_member_id < 0) || (play_order == NULL)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -705,8 +657,7 @@ int media_playlist_get_play_order(media_playlist_h playlist, int playlist_member ret = _content_query_prepare(&stmt, select_query, NULL, NULL); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { *play_order = (int)sqlite3_column_int(stmt, 0); } @@ -720,8 +671,7 @@ int media_playlist_set_name(media_playlist_h playlist, const char *playlist_name int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if(_playlist != NULL && STRING_VALID(playlist_name)) - { + if (_playlist != NULL && STRING_VALID(playlist_name)) { SAFE_FREE(_playlist->name); media_playlist_item_s *item = (media_playlist_item_s*)calloc(1, sizeof(media_playlist_item_s)); @@ -729,16 +679,14 @@ int media_playlist_set_name(media_playlist_h playlist, const char *playlist_name item->playlist_name = strdup(playlist_name); item->function = MEDIA_PLAYLIST_UPDATE_PLAYLIST_NAME; - if(item->playlist_name == NULL) - { + if (item->playlist_name == NULL) { SAFE_FREE(item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } _playlist->name = strdup(playlist_name); - if(_playlist->name == NULL) - { + if (_playlist->name == NULL) { SAFE_FREE(item->playlist_name); SAFE_FREE(item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); @@ -746,9 +694,7 @@ int media_playlist_set_name(media_playlist_h playlist, const char *playlist_name } __media_playlist_item_add(_playlist, item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -761,8 +707,7 @@ int media_playlist_set_thumbnail_path(media_playlist_h playlist, const char *pat int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if(_playlist != NULL && STRING_VALID(path)) - { + if (_playlist != NULL && STRING_VALID(path)) { SAFE_FREE(_playlist->thumbnail_path); media_playlist_item_s *item = (media_playlist_item_s*)calloc(1, sizeof(media_playlist_item_s)); @@ -770,16 +715,14 @@ int media_playlist_set_thumbnail_path(media_playlist_h playlist, const char *pat item->thumbnail_path = strdup(path); item->function = MEDIA_PLAYLIST_UPDATE_THUMBNAIL_PATH; - if(item->thumbnail_path == NULL) - { + if (item->thumbnail_path == NULL) { SAFE_FREE(item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } _playlist->thumbnail_path = strdup(path); - if(_playlist->thumbnail_path == NULL) - { + if (_playlist->thumbnail_path == NULL) { SAFE_FREE(item->thumbnail_path); SAFE_FREE(item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); @@ -787,9 +730,7 @@ int media_playlist_set_thumbnail_path(media_playlist_h playlist, const char *pat } __media_playlist_item_add(_playlist, item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -802,8 +743,7 @@ int media_playlist_set_play_order(media_playlist_h playlist, int playlist_member int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if((_playlist != NULL) && (playlist_member_id > 0) && (play_order >= 0)) - { + if ((_playlist != NULL) && (playlist_member_id > 0) && (play_order >= 0)) { media_playlist_item_s *item = (media_playlist_item_s*)calloc(1, sizeof(media_playlist_item_s)); media_content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); @@ -812,9 +752,7 @@ int media_playlist_set_play_order(media_playlist_h playlist, int playlist_member item->play_order = play_order; __media_playlist_item_add(_playlist, item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -827,25 +765,21 @@ int media_playlist_add_media(media_playlist_h playlist, const char *media_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if(_playlist != NULL && STRING_VALID(media_id)) - { + if (_playlist != NULL && STRING_VALID(media_id)) { media_playlist_item_s *item = (media_playlist_item_s*)calloc(1, sizeof(media_playlist_item_s)); media_content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); item->media_id = strdup(media_id); item->function = MEDIA_PLAYLIST_ADD; - if(item->media_id == NULL) - { + if (item->media_id == NULL) { SAFE_FREE(item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } __media_playlist_item_add(_playlist, item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -859,8 +793,7 @@ int media_playlist_remove_media(media_playlist_h playlist, int playlist_member_i int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_s *_playlist = (media_playlist_s*)playlist; - if((_playlist != NULL) && (playlist_member_id > 0)) - { + if ((_playlist != NULL) && (playlist_member_id > 0)) { media_playlist_item_s *item = (media_playlist_item_s*)calloc(1, sizeof(media_playlist_item_s)); media_content_retvm_if(item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); @@ -868,9 +801,7 @@ int media_playlist_remove_media(media_playlist_h playlist, int playlist_member_i item->function = MEDIA_PLAYLIST_REMOVE; __media_playlist_item_add(_playlist, item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -886,13 +817,12 @@ int media_playlist_update_to_db(media_playlist_h playlist) int length = 0; media_playlist_item_s *_playlist_item = NULL; - if(_playlist == NULL) - { + if (_playlist == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - if(_playlist->item_list != NULL) { + if (_playlist->item_list != NULL) { length = g_list_length(_playlist->item_list); } else { media_content_debug("operation list length is 0"); @@ -901,8 +831,8 @@ int media_playlist_update_to_db(media_playlist_h playlist) for (idx = 0; idx < length; idx++) { _playlist_item = (media_playlist_item_s*)g_list_nth_data(_playlist->item_list, idx); - if(_playlist_item != NULL) { - switch(_playlist_item->function) { + if (_playlist_item != NULL) { + switch (_playlist_item->function) { case MEDIA_PLAYLIST_ADD: { ret = __media_playlist_insert_item_to_playlist(_playlist->playlist_id, _playlist_item->media_id); @@ -933,7 +863,7 @@ int media_playlist_update_to_db(media_playlist_h playlist) } break; - default : + default: break; } } @@ -958,27 +888,23 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name, media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "media_playlist_insert_to_db fail"); ret = __media_playlist_import_item_from_file(path, &import_item_list, &import_item_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { __media_playlist_destroy_import_item(import_item_list, import_item_count); media_content_error("Fail to get playlist from file"); return ret; } - if (import_item_count == 0) - { + if (import_item_count == 0) { media_content_debug("The playlist from file is empty"); } - for (idx=0; idx < import_item_count; idx++) - { + for (idx = 0; idx < import_item_count; idx++) { filter_h filter = NULL; char *media_id = NULL; char *condition = NULL; ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { __media_playlist_destroy_import_item(import_item_list, import_item_count); media_filter_destroy(filter); media_content_error("error media_filter_create"); @@ -986,8 +912,7 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name, } condition = sqlite3_mprintf("path = '%q'", import_item_list[idx]); ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { __media_playlist_destroy_import_item(import_item_list, import_item_count); media_filter_destroy(filter); SQLITE3_SAFE_FREE(condition); @@ -995,8 +920,7 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name, return ret; } ret = _media_db_get_group_item(NULL, filter, __media_playlist_media_info_cb, &media_id, MEDIA_GROUP_NONE); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { __media_playlist_destroy_import_item(import_item_list, import_item_count); media_filter_destroy(filter); SAFE_FREE(media_id); @@ -1005,8 +929,7 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name, return ret; } ret = media_playlist_add_media((media_playlist_h)*playlist, media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { __media_playlist_destroy_import_item(import_item_list, import_item_count); media_filter_destroy(filter); SAFE_FREE(media_id); @@ -1020,8 +943,7 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name, } ret = media_playlist_update_to_db(*playlist); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { __media_playlist_destroy_import_item(import_item_list, import_item_count); media_content_error("Fail to update playlist to db"); return ret; @@ -1046,19 +968,16 @@ int media_playlist_export_to_file(media_playlist_h playlist, const char* path) media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "_media_db_get_playlist_item fail"); ret = __media_playlist_reset_file(path); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { g_list_free_full(item_list, __media_playlist_destroy_export_item); media_content_error("Fail to init playlist file"); return ret; } - for (idx=0; idx < g_list_length(item_list); idx++) - { + for (idx = 0; idx < g_list_length(item_list); idx++) { char *item = g_list_nth_data(item_list, idx); ret = __media_playlist_append_to_file(path, item); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { g_list_free_full(item_list, __media_playlist_destroy_export_item); media_content_error("Fail to export paths into file"); return ret; diff --git a/src/media_storage.c b/src/media_storage.c index 7485d8a..d00d15e 100755 --- a/src/media_storage.c +++ b/src/media_storage.c @@ -46,8 +46,7 @@ int media_storage_insert_to_db(const char *storage_name, const char *storage_pat media_content_retvm_if(storage_uuid == NULL, MEDIA_CONTENT_ERROR_INVALID_OPERATION, "Invalid storage_id"); ret = media_svc_insert_storage(_content_get_db_handle(), storage_uuid, storage_name, storage_path, storage_account, storage_type, tzplatform_getuid(TZ_USER_NAME)); - if (ret != MS_MEDIA_ERR_NONE) - { + if (ret != MS_MEDIA_ERR_NONE) { ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret); SAFE_FREE(storage_uuid); return ret; @@ -72,8 +71,7 @@ int media_storage_delete_from_db(const char *storage_id) { int ret = MEDIA_CONTENT_ERROR_NONE; - if(!STRING_VALID(storage_id)) - { + if (!STRING_VALID(storage_id)) { media_content_error("Invalid Storage ID"); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -89,8 +87,7 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage char select_query[DEFAULT_QUERY_SIZE]; sqlite3_stmt *stmt = NULL; - if(!STRING_VALID(storage_id) || (storage == NULL)) - { + if (!STRING_VALID(storage_id) || (storage == NULL)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -101,12 +98,10 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage ret = _content_query_prepare(&stmt, select_query, NULL, NULL); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { media_storage_s *_storage = (media_storage_s*)calloc(1, sizeof(media_storage_s)); - if(_storage == NULL) - { + if (_storage == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); SQLITE3_FINALIZE(stmt); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -126,12 +121,9 @@ int media_storage_get_storage_count_from_db(filter_h filter, int *storage_count) { int ret = MEDIA_CONTENT_ERROR_NONE; - if(storage_count) - { + if (storage_count) { ret = _media_db_get_group_count(filter, MEDIA_GROUP_STORAGE, storage_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -143,12 +135,9 @@ int media_storage_foreach_storage_from_db(filter_h filter, media_storage_cb call { int ret = MEDIA_CONTENT_ERROR_NONE; - if(callback != NULL) - { + if (callback != NULL) { ret = _media_db_get_storage(filter, callback, user_data); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -160,12 +149,9 @@ int media_storage_get_media_count_from_db(const char *storage_id, filter_h filte { int ret = MEDIA_CONTENT_ERROR_NONE; - if(STRING_VALID(storage_id) && media_count) - { + if (STRING_VALID(storage_id) && media_count) { ret = _media_db_get_group_item_count(storage_id, filter, MEDIA_GROUP_STORAGE, media_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -177,12 +163,9 @@ int media_storage_foreach_media_from_db(const char *storage_id, filter_h filter, { int ret = MEDIA_CONTENT_ERROR_NONE; - if((callback != NULL) && STRING_VALID(storage_id)) - { + if ((callback != NULL) && STRING_VALID(storage_id)) { ret = _media_db_get_group_item(storage_id, filter, callback, user_data, MEDIA_GROUP_STORAGE); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -194,8 +177,7 @@ int media_storage_destroy(media_storage_h storage) { int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_storage = (media_storage_s*)storage; - if(_storage) - { + if (_storage) { SAFE_FREE(_storage->storage_id); SAFE_FREE(_storage->storage_path); SAFE_FREE(_storage->storage_name); @@ -203,9 +185,7 @@ int media_storage_destroy(media_storage_h storage) SAFE_FREE(_storage); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -218,49 +198,40 @@ int media_storage_clone(media_storage_h *dst, media_storage_h src) int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_src = (media_storage_s*)src; - if(_src != NULL) - { + if (_src != NULL) { media_storage_s *_dst = (media_storage_s*)calloc(1, sizeof(media_storage_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - if(STRING_VALID(_src->storage_id)) - { + if (STRING_VALID(_src->storage_id)) { _dst->storage_id = strdup(_src->storage_id); - if(_dst->storage_id == NULL) - { + if (_dst->storage_id == NULL) { media_storage_destroy((media_storage_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->storage_name)) - { + if (STRING_VALID(_src->storage_name)) { _dst->storage_name = strdup(_src->storage_name); - if(_dst->storage_name == NULL) - { + if (_dst->storage_name == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_storage_destroy((media_storage_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->storage_path)) - { + if (STRING_VALID(_src->storage_path)) { _dst->storage_path = strdup(_src->storage_path); - if(_dst->storage_path == NULL) - { + if (_dst->storage_path == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_storage_destroy((media_storage_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->storage_account)) - { + if (STRING_VALID(_src->storage_account)) { _dst->storage_account = strdup(_src->storage_account); - if(_dst->storage_account == NULL) - { + if (_dst->storage_account == NULL) { media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); media_storage_destroy((media_storage_h)_dst); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -272,9 +243,7 @@ int media_storage_clone(media_storage_h *dst, media_storage_h src) *dst = (media_storage_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -287,22 +256,16 @@ int media_storage_get_id(media_storage_h storage, char **storage_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_storage = (media_storage_s*)storage; - if(_storage && storage_id) - { - if(STRING_VALID(_storage->storage_id)) - { + if (_storage && storage_id) { + if (STRING_VALID(_storage->storage_id)) { *storage_id = strdup(_storage->storage_id); media_content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *storage_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -315,22 +278,16 @@ int media_storage_get_name(media_storage_h storage, char **storage_name) int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_storage = (media_storage_s*)storage; - if(_storage && storage_name) - { - if(STRING_VALID(_storage->storage_name)) - { + if (_storage && storage_name) { + if (STRING_VALID(_storage->storage_name)) { *storage_name = strdup(_storage->storage_name); media_content_retvm_if(*storage_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *storage_name = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -343,22 +300,16 @@ int media_storage_get_path(media_storage_h storage, char **storage_path) int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_storage = (media_storage_s*)storage; - if(_storage && storage_path) - { - if(STRING_VALID(_storage->storage_path)) - { + if (_storage && storage_path) { + if (STRING_VALID(_storage->storage_path)) { *storage_path = strdup(_storage->storage_path); media_content_retvm_if(*storage_path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *storage_path = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -371,22 +322,16 @@ int media_storage_get_storage_account(media_storage_h storage, char **storage_ac int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_storage = (media_storage_s*)storage; - if(_storage && storage_account) - { - if(STRING_VALID(_storage->storage_account)) - { + if (_storage && storage_account) { + if (STRING_VALID(_storage->storage_account)) { *storage_account = strdup(_storage->storage_account); media_content_retvm_if(*storage_account == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *storage_account = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -399,13 +344,10 @@ int media_storage_get_type(media_storage_h storage, media_content_storage_e *sto int ret = MEDIA_CONTENT_ERROR_NONE; media_storage_s *_storage = (media_storage_s*)storage; - if(_storage && storage_type) - { + if (_storage && storage_type) { *storage_type = _storage->storage_type; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -418,8 +360,7 @@ int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_s int ret = MEDIA_CONTENT_ERROR_NONE; media_svc_scan_status_type_e status = MEDIA_STORAGE_SCAN_NONE; - if(STRING_VALID(storage_uuid)) - { + if (STRING_VALID(storage_uuid)) { ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status); if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_scan_status failed"); @@ -427,9 +368,7 @@ int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_s } else { *scan_status = status; } - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/src/media_tag.c b/src/media_tag.c index a1ab9d8..b500db0 100755 --- a/src/media_tag.c +++ b/src/media_tag.c @@ -39,11 +39,9 @@ static void __media_tag_item_release(media_tag_s *tag_s) media_content_debug("list_cnt : [%d]", list_cnt); - for(idx = 0; idx < list_cnt; idx++) - { + for (idx = 0; idx < list_cnt; idx++) { item = (media_tag_item_s*)g_list_nth_data(tag_s->item_list, idx); - if(item != NULL) - { + if (item != NULL) { SAFE_FREE(item->media_id); SAFE_FREE(item->tag_name); SAFE_FREE(item); @@ -111,11 +109,10 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag) SQLITE3_SAFE_FREE(select_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - while(sqlite3_step(stmt) == SQLITE_ROW) - { + while (sqlite3_step(stmt) == SQLITE_ROW) { SAFE_FREE(tag_name); - id = (int)sqlite3_column_int(stmt,0); + id = (int)sqlite3_column_int(stmt, 0); tag_name = g_strdup((const char *)sqlite3_column_text(stmt, 1)); } @@ -132,8 +129,7 @@ int media_tag_insert_to_db(const char *tag_name, media_tag_h *tag) int ret = MEDIA_CONTENT_ERROR_NONE; char *query_str = NULL; - if(!STRING_VALID(tag_name)) - { + if (!STRING_VALID(tag_name)) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -142,8 +138,7 @@ int media_tag_insert_to_db(const char *tag_name, media_tag_h *tag) ret = _content_query_sql(query_str); SQLITE3_SAFE_FREE(query_str); - if(ret == MEDIA_CONTENT_ERROR_NONE) - { + if (ret == MEDIA_CONTENT_ERROR_NONE) { media_tag_s *_tag = (media_tag_s*)calloc(1, sizeof(media_tag_s)); media_content_retvm_if(_tag == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); @@ -159,8 +154,7 @@ int media_tag_delete_from_db(int tag_id) int ret = MEDIA_CONTENT_ERROR_NONE; char *query_str = NULL; - if(tag_id < 0) - { + if (tag_id < 0) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -178,12 +172,9 @@ int media_tag_get_tag_count_from_db(filter_h filter, int *tag_count) { int ret = MEDIA_CONTENT_ERROR_NONE; - if(tag_count != NULL) - { + if (tag_count != NULL) { ret = _media_db_get_group_count(filter, MEDIA_GROUP_TAG, tag_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -191,12 +182,11 @@ int media_tag_get_tag_count_from_db(filter_h filter, int *tag_count) return ret; } -int media_tag_foreach_tag_from_db (filter_h filter, media_tag_cb callback, void *user_data) +int media_tag_foreach_tag_from_db(filter_h filter, media_tag_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; - if(callback == NULL) - { + if (callback == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -210,12 +200,9 @@ int media_tag_get_media_count_from_db(int tag_id, filter_h filter, int *media_co { int ret = MEDIA_CONTENT_ERROR_NONE; - if((tag_id > 0) && (media_count != NULL)) - { + if ((tag_id > 0) && (media_count != NULL)) { ret = _media_db_get_group_item_count_by_id(tag_id, filter, MEDIA_GROUP_TAG, media_count); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -227,8 +214,7 @@ int media_tag_foreach_media_from_db(int tag_id, filter_h filter, media_info_cb c { int ret = MEDIA_CONTENT_ERROR_NONE; - if(callback == NULL) - { + if (callback == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -242,14 +228,11 @@ int media_tag_destroy(media_tag_h tag) { int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_s *_tag = (media_tag_s*)tag; - if(_tag) - { + if (_tag) { SAFE_FREE(_tag->name); SAFE_FREE(_tag); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -262,18 +245,15 @@ int media_tag_clone(media_tag_h *dst, media_tag_h src) media_tag_s *_src = (media_tag_s*)src; media_tag_s *_dst = NULL; - if((_src != NULL)) - { + if ((_src != NULL)) { _dst = (media_tag_s*)calloc(1, sizeof(media_tag_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _dst->tag_id = _src->tag_id; - if(STRING_VALID(_src->name)) - { + if (STRING_VALID(_src->name)) { _dst->name = strdup(_src->name); - if(_dst->name == NULL) - { + if (_dst->name == NULL) { SAFE_FREE(_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -281,9 +261,7 @@ int media_tag_clone(media_tag_h *dst, media_tag_h src) } *dst = (media_tag_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -296,13 +274,10 @@ int media_tag_get_tag_id(media_tag_h tag, int *tag_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_s *_tag = (media_tag_s*)tag; - if((_tag != NULL) && (tag_id != NULL)) - { + if ((_tag != NULL) && (tag_id != NULL)) { *tag_id = _tag->tag_id; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -314,22 +289,16 @@ int media_tag_get_name(media_tag_h tag, char **name) { int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_s *_tag = (media_tag_s*)tag; - if(_tag) - { - if(STRING_VALID(_tag->name)) - { + if (_tag) { + if (STRING_VALID(_tag->name)) { *name = strdup(_tag->name); media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - } - else - { + } else { *name = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -343,8 +312,7 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag) sqlite3_stmt *stmt = NULL; char select_query[DEFAULT_QUERY_SIZE]; - if(tag_id <= 0) - { + if (tag_id <= 0) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -358,14 +326,12 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag) media_tag_s *_tag = NULL; - while(sqlite3_step(stmt) == SQLITE_ROW) - { - if(_tag) + while (sqlite3_step(stmt) == SQLITE_ROW) { + if (_tag) media_tag_destroy((media_tag_h)_tag); _tag = (media_tag_s*)calloc(1, sizeof(media_tag_s)); - if(_tag == NULL) - { + if (_tag == NULL) { SQLITE3_FINALIZE(stmt); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -387,25 +353,21 @@ int media_tag_add_media(media_tag_h tag, const char *media_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_s *_tag = (media_tag_s*)tag; - if((_tag != NULL) && STRING_VALID(media_id)) - { + if ((_tag != NULL) && STRING_VALID(media_id)) { media_tag_item_s *_item = (media_tag_item_s*)calloc(1, sizeof(media_tag_item_s)); media_content_retvm_if(_item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _item->media_id = strdup(media_id); _item->function = MEDIA_TAG_ADD; - if(_item->media_id == NULL) - { + if (_item->media_id == NULL) { SAFE_FREE(_item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } __media_tag_item_add(_tag, _item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -418,25 +380,21 @@ int media_tag_remove_media(media_tag_h tag, const char *media_id) int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_s *_tag = (media_tag_s*)tag; - if(_tag != NULL && STRING_VALID(media_id)) - { + if (_tag != NULL && STRING_VALID(media_id)) { media_tag_item_s *_item = (media_tag_item_s*)calloc(1, sizeof(media_tag_item_s)); media_content_retvm_if(_item == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); _item->media_id = strdup(media_id); _item->function = MEDIA_TAG_REMOVE; - if(_item->media_id == NULL) - { + if (_item->media_id == NULL) { SAFE_FREE(_item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } __media_tag_item_add(_tag, _item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -449,8 +407,7 @@ int media_tag_set_name(media_tag_h tag, char *tag_name) int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_s *_tag = (media_tag_s*)tag; - if(_tag != NULL && STRING_VALID(tag_name)) - { + if (_tag != NULL && STRING_VALID(tag_name)) { SAFE_FREE(_tag->name); media_tag_item_s *_item = (media_tag_item_s*)calloc(1, sizeof(media_tag_item_s)); @@ -459,16 +416,14 @@ int media_tag_set_name(media_tag_h tag, char *tag_name) _item->tag_name = strdup(tag_name); _item->function = MEDIA_TAG_UPDATE_TAG_NAME; - if(_item->tag_name == NULL) - { + if (_item->tag_name == NULL) { SAFE_FREE(_item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } _tag->name = strdup(tag_name); - if(_tag->name == NULL) - { + if (_tag->name == NULL) { SAFE_FREE(_item->tag_name); SAFE_FREE(_item); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); @@ -476,9 +431,7 @@ int media_tag_set_name(media_tag_h tag, char *tag_name) } __media_tag_item_add(_tag, _item); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -494,13 +447,12 @@ int media_tag_update_to_db(media_tag_h tag) int length = 0; media_tag_item_s *_tag_item = NULL; - if(_tag == NULL) - { + if (_tag == NULL) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - if(_tag->item_list != NULL) { + if (_tag->item_list != NULL) { length = g_list_length(_tag->item_list); } else { media_content_debug("operation list length is 0"); @@ -509,8 +461,8 @@ int media_tag_update_to_db(media_tag_h tag) for (idx = 0; idx < length; idx++) { _tag_item = (media_tag_item_s*)g_list_nth_data(_tag->item_list, idx); - if(_tag_item != NULL) { - switch(_tag_item->function) { + if (_tag_item != NULL) { + switch (_tag_item->function) { case MEDIA_TAG_ADD: { ret = __media_tag_insert_item_to_tag(_tag->tag_id, _tag_item->media_id); diff --git a/src/media_util_private.c b/src/media_util_private.c index 37cea49..613521d 100755 --- a/src/media_util_private.c +++ b/src/media_util_private.c @@ -29,7 +29,7 @@ int _media_util_check_file_exist(const char *path) /* check the file exits actually */ exist = open(path, O_RDONLY); - if(exist < 0) { + if (exist < 0) { media_content_sec_debug("path [%s]", path); media_content_stderror("open file fail"); if (errno == EACCES || errno == EPERM) { @@ -50,8 +50,7 @@ int _media_util_check_ignore_file(const char *path, bool *ignore) *ignore = FALSE; - if(strstr(path, "/.") != NULL) - { + if (strstr(path, "/.") != NULL) { *ignore = TRUE; media_content_error("hidden path"); media_content_sec_debug("path : %s", path); @@ -73,8 +72,7 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) *ignore = FALSE; /*1. Check Hidden Directory*/ - if(strstr(dir_path, "/.") != NULL) - { + if (strstr(dir_path, "/.") != NULL) { *ignore = TRUE; media_content_error("hidden path"); return MEDIA_CONTENT_ERROR_NONE; @@ -82,8 +80,7 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) /*2. Check Scan Ignore Directory*/ ret = media_svc_get_storage_type(dir_path, &storage_type, tzplatform_getuid(TZ_USER_NAME)); - if(ret != MS_MEDIA_ERR_NONE) - { + if (ret != MS_MEDIA_ERR_NONE) { media_content_error("media_svc_get_storage_type failed : %d", ret); return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } @@ -96,8 +93,7 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) char search_path[4096] = {0, }; strncpy(search_path, dir_path, strlen(dir_path)); - while(STRING_VALID(search_path)) - { + while (STRING_VALID(search_path)) { dp = opendir(search_path); if (dp == NULL) { *ignore = TRUE; @@ -108,20 +104,16 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) media_content_retvm_if(dp == NULL, MEDIA_CONTENT_ERROR_INVALID_OPERATION, "Open Directory fail"); - while (!readdir_r(dp, &entry, &result)) - { + while (!readdir_r(dp, &entry, &result)) { if (result == NULL) break; - if(STRING_VALID(entry.d_name) && (strcmp(entry.d_name, scan_ignore) == 0)) - { + if (STRING_VALID(entry.d_name) && (strcmp(entry.d_name, scan_ignore) == 0)) { media_content_error("Find Ignore path"); media_content_sec_debug("Ignore path[%s]", search_path); find = TRUE; break; - } - else - { + } else { //media_content_sec_debug("entry.d_name[%s]", entry.d_name); continue; } @@ -130,19 +122,16 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) if (dp) closedir(dp); dp = NULL; - if(find) - { + if (find) { *ignore = TRUE; break; - } - else - { + } else { /*If root path, Stop Scanning*/ - if((storage_type == MEDIA_SVC_STORAGE_INTERNAL) && (STRING_VALID(MEDIA_ROOT_PATH_INTERNAL) && strcmp(search_path, MEDIA_ROOT_PATH_INTERNAL) == 0)) { + if ((storage_type == MEDIA_SVC_STORAGE_INTERNAL) && (STRING_VALID(MEDIA_ROOT_PATH_INTERNAL) && strcmp(search_path, MEDIA_ROOT_PATH_INTERNAL) == 0)) { break; - } else if((storage_type == MEDIA_SVC_STORAGE_EXTERNAL) && (STRING_VALID(MEDIA_ROOT_PATH_SDCARD)) && (strcmp(search_path, MEDIA_ROOT_PATH_SDCARD) == 0)) { + } else if ((storage_type == MEDIA_SVC_STORAGE_EXTERNAL) && (STRING_VALID(MEDIA_ROOT_PATH_SDCARD)) && (strcmp(search_path, MEDIA_ROOT_PATH_SDCARD) == 0)) { break; - } else if(storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB) { + } else if (storage_type == MEDIA_SVC_STORAGE_EXTERNAL_USB) { char *parent_folder_path = NULL; bool is_root = FALSE; @@ -157,14 +146,11 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore) } leaf_path = strrchr(search_path, '/'); - if(leaf_path != NULL) - { + if (leaf_path != NULL) { int seek_len = leaf_path -search_path; search_path[seek_len] = '\0'; //media_content_sec_debug("go to other dir [%s]", search_path); - } - else - { + } else { media_content_debug("Fail to find leaf path"); break; } diff --git a/src/media_video.c b/src/media_video.c index da62bf1..29b2d19 100755 --- a/src/media_video.c +++ b/src/media_video.c @@ -23,8 +23,7 @@ int video_meta_destroy(video_meta_h video) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { + if (_video) { SAFE_FREE(_video->media_id); SAFE_FREE(_video->title); SAFE_FREE(_video->album); @@ -39,9 +38,7 @@ int video_meta_destroy(video_meta_h video) SAFE_FREE(_video); ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -54,126 +51,103 @@ int video_meta_clone(video_meta_h *dst, video_meta_h src) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_src = (video_meta_s*)src; - if (_src != NULL) - { + if (_src != NULL) { video_meta_s *_dst = (video_meta_s*)calloc(1, sizeof(video_meta_s)); media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); - if(STRING_VALID(_src->media_id)) - { + if (STRING_VALID(_src->media_id)) { _dst->media_id = strdup(_src->media_id); - if(_dst->media_id == NULL) - { + if (_dst->media_id == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->title)) - { + if (STRING_VALID(_src->title)) { _dst->title = strdup(_src->title); - if(_dst->title == NULL) - { + if (_dst->title == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->album)) - { + if (STRING_VALID(_src->album)) { _dst->album = strdup(_src->album); - if(_dst->album == NULL) - { + if (_dst->album == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->artist)) - { + if (STRING_VALID(_src->artist)) { _dst->artist = strdup(_src->artist); - if(_dst->artist == NULL) - { + if (_dst->artist == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->album_artist)) - { + if (STRING_VALID(_src->album_artist)) { _dst->album_artist = strdup(_src->album_artist); - if(_dst->album_artist == NULL) - { + if (_dst->album_artist == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->genre)) - { + if (STRING_VALID(_src->genre)) { _dst->genre = strdup(_src->genre); - if(_dst->genre == NULL) - { + if (_dst->genre == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->composer)) - { + if (STRING_VALID(_src->composer)) { _dst->composer = strdup(_src->composer); - if(_dst->composer == NULL) - { + if (_dst->composer == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->year)) - { + if (STRING_VALID(_src->year)) { _dst->year = strdup(_src->year); - if(_dst->year == NULL) - { + if (_dst->year == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->recorded_date)) - { + if (STRING_VALID(_src->recorded_date)) { _dst->recorded_date = strdup(_src->recorded_date); - if(_dst->recorded_date == NULL) - { + if (_dst->recorded_date == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->copyright)) - { + if (STRING_VALID(_src->copyright)) { _dst->copyright = strdup(_src->copyright); - if(_dst->copyright == NULL) - { + if (_dst->copyright == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } } - if(STRING_VALID(_src->track_num)) - { + if (STRING_VALID(_src->track_num)) { _dst->track_num = strdup(_src->track_num); - if(_dst->track_num == NULL) - { + if (_dst->track_num == NULL) { video_meta_destroy((video_meta_h)_dst); media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY); return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; @@ -191,9 +165,7 @@ int video_meta_clone(video_meta_h *dst, video_meta_h src) *dst = (video_meta_h)_dst; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -205,24 +177,18 @@ int video_meta_get_media_id(video_meta_h video, char **media_id) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->media_id)) - { + if (_video) { + if (STRING_VALID(_video->media_id)) { char *new_string = strdup(_video->media_id); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *media_id = new_string; - } - else - { + } else { *media_id = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -234,24 +200,18 @@ int video_meta_get_album(video_meta_h video, char **album) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->album)) - { + if (_video) { + if (STRING_VALID(_video->album)) { char *new_string = strdup(_video->album); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *album = new_string; - } - else - { + } else { *album = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -263,24 +223,18 @@ int video_meta_get_artist(video_meta_h video, char **artist) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->artist)) - { + if (_video) { + if (STRING_VALID(_video->artist)) { char *new_string = strdup(_video->artist); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *artist = new_string; - } - else - { + } else { *artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -292,24 +246,18 @@ int video_meta_get_album_artist(video_meta_h video, char **album_artist) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->album_artist)) - { + if (_video) { + if (STRING_VALID(_video->album_artist)) { char *new_string = strdup(_video->album_artist); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *album_artist = new_string; - } - else - { + } else { *album_artist = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -321,24 +269,18 @@ int video_meta_get_genre(video_meta_h video, char **genre) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->genre)) - { + if (_video) { + if (STRING_VALID(_video->genre)) { char *new_string = strdup(_video->genre); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *genre = new_string; - } - else - { + } else { *genre = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -350,24 +292,18 @@ int video_meta_get_composer(video_meta_h video, char **composer) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->composer)) - { + if (_video) { + if (STRING_VALID(_video->composer)) { char *new_string = strdup(_video->composer); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *composer = new_string; - } - else - { + } else { *composer = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -379,24 +315,18 @@ int video_meta_get_year(video_meta_h video, char **year) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->year)) - { + if (_video) { + if (STRING_VALID(_video->year)) { char *new_string = strdup(_video->year); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *year = new_string; - } - else - { + } else { *year = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -408,24 +338,18 @@ int video_meta_get_recorded_date(video_meta_h video, char **recorded_date) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->recorded_date)) - { + if (_video) { + if (STRING_VALID(_video->recorded_date)) { char *new_string = strdup(_video->recorded_date); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *recorded_date = new_string; - } - else - { + } else { *recorded_date = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -437,24 +361,18 @@ int video_meta_get_copyright(video_meta_h video, char **copyright) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->copyright)) - { + if (_video) { + if (STRING_VALID(_video->copyright)) { char *new_string = strdup(_video->copyright); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *copyright = new_string; - } - else - { + } else { *copyright = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -466,24 +384,18 @@ int video_meta_get_track_num(video_meta_h video, char **track_num) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { - if(STRING_VALID(_video->track_num)) - { + if (_video) { + if (STRING_VALID(_video->track_num)) { char *new_string = strdup(_video->track_num); media_content_retvm_if(new_string == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); *track_num = new_string; - } - else - { + } else { *track_num = NULL; } ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -496,13 +408,10 @@ int video_meta_get_bit_rate(video_meta_h video, int *bit_rate) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video && bit_rate) - { + if (_video && bit_rate) { *bit_rate = _video->bitrate; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -515,13 +424,10 @@ int video_meta_get_duration(video_meta_h video, int *duration) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video && duration) - { + if (_video && duration) { *duration = _video->duration; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -534,13 +440,10 @@ int video_meta_get_width(video_meta_h video, int *width) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video && width) - { + if (_video && width) { *width = _video->width; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -552,13 +455,10 @@ int video_meta_get_height(video_meta_h video, int *height) { int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video && height) - { + if (_video && height) { *height = _video->height; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -571,13 +471,10 @@ int video_meta_get_played_count(video_meta_h video, int *played_count) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video && played_count) - { + if (_video && played_count) { *played_count = _video->played_count; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -590,13 +487,10 @@ int video_meta_get_played_time(video_meta_h video, time_t* played_time) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { + if (_video) { *played_time = _video->played_time; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -609,13 +503,10 @@ int video_meta_get_played_position(video_meta_h video, int *played_position) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if (_video) - { + if (_video) { *played_position = _video->played_position; ret = MEDIA_CONTENT_ERROR_NONE; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -628,12 +519,9 @@ int video_meta_set_played_count(video_meta_h video, int played_count) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if ((_video != NULL) && (played_count >= 0)) - { + if ((_video != NULL) && (played_count >= 0)) { _video->played_count = played_count; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -646,12 +534,9 @@ int video_meta_set_played_time(video_meta_h video, time_t played_time) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if ((_video != NULL) && (played_time >= 0)) - { + if ((_video != NULL) && (played_time >= 0)) { _video->played_time = played_time; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -664,12 +549,9 @@ int video_meta_set_played_position(video_meta_h video, int played_position) int ret = MEDIA_CONTENT_ERROR_NONE; video_meta_s *_video = (video_meta_s*)video; - if ((_video != NULL) && (played_position >= 0)) - { + if ((_video != NULL) && (played_position >= 0)) { _video->played_position = played_position; - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -683,8 +565,7 @@ int video_meta_update_to_db(video_meta_h video) video_meta_s *_video = (video_meta_s*)video; char *sql = NULL; - if (_video != NULL && STRING_VALID(_video->media_id)) - { + if (_video != NULL && STRING_VALID(_video->media_id)) { char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; memset(storage_id, 0x00, sizeof(storage_id)); @@ -694,9 +575,7 @@ int video_meta_update_to_db(video_meta_h video) sql = sqlite3_mprintf(UPDATE_AV_META_FROM_MEDIA, storage_id, _video->played_count, _video->played_time, _video->played_position, _video->media_id); ret = _content_query_sql(sql); SQLITE3_SAFE_FREE(sql); - } - else - { + } else { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } diff --git a/test/media-content_test.c b/test/media-content_test.c index 2972507..25e973e 100755 --- a/test/media-content_test.c +++ b/test/media-content_test.c @@ -47,97 +47,97 @@ bool get_audio_meta(audio_meta_h audio) media_content_debug("=== audio meta ==="); ret = audio_meta_get_media_id(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("audio_id : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_album(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("album : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_artist(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("artist : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_album_artist(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("album_artist : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_genre(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("genre : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_composer(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("composer : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_year(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("year : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_recorded_date(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("recorded_date : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_copyright(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("copyright : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_track_num(audio, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("track_num : [%s]", c_value); SAFE_FREE(c_value); ret = audio_meta_get_bit_rate(audio, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("bitrate : [%d]", i_value); ret = audio_meta_get_sample_rate(audio, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("samplerate : [%d]", i_value); ret = audio_meta_get_channel(audio, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("channel : [%d]", i_value); ret = audio_meta_get_duration(audio, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("duration : [%d]", i_value); ret = audio_meta_get_played_count(audio, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("played_count : [%d]", i_value); ret = audio_meta_get_played_time(audio, &t_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("played_time : [%d]", t_value); ret = audio_meta_get_played_position(audio, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("played_position : [%d]", i_value); @@ -154,97 +154,97 @@ bool get_video_meta(video_meta_h video) media_content_debug("=== video meta ==="); ret = video_meta_get_media_id(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("video_id : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_album(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("album : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_artist(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("artist : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_album_artist(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("album_artist : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_genre(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("genre : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_composer(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("omposer : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_year(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("year : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_recorded_date(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("recorded_date : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_copyright(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("copyright : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_track_num(video, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("track_num : [%s]", c_value); SAFE_FREE(c_value); ret = video_meta_get_bit_rate(video, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("bitrate : [%d]", i_value); ret = video_meta_get_duration(video, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("duration : [%d]", i_value); ret = video_meta_get_width(video, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("width : [%d]", i_value); ret = video_meta_get_height(video, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("height : [%d]", i_value); ret = video_meta_get_played_count(video, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("played_count : [%d]", i_value); ret = video_meta_get_played_time(video, &t_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("played_time : [%d]", t_value); ret = video_meta_get_played_position(video, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get meta : [%d]", ret); media_content_debug("played_position : [%d]", i_value); @@ -290,7 +290,7 @@ bool gallery_bookmarks_cb(media_bookmark_h bookmark, void *user_data) int ret = MEDIA_CONTENT_ERROR_NONE; ret = media_bookmark_clone(&new_bm, bookmark); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_clone : [%d]", ret); GList **list = (GList**)user_data; @@ -306,24 +306,23 @@ bool media_item_cb(media_info_h media, void *user_data) media_content_type_e media_type = 0; int ret = MEDIA_CONTENT_ERROR_NONE; - if(media == NULL) - { + if (media == NULL) { media_content_debug("NO Item"); return true; } ret = media_info_get_media_type(media, &media_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("media_type : [%d]", media_type); ret = media_info_get_media_id(media, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("media_id : [%s]", media_id); ret = media_info_get_file_path(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("file_path : [%s]", c_value); SAFE_FREE(c_value); @@ -334,44 +333,37 @@ bool media_item_cb(media_info_h media, void *user_data) bool b_value = false; unsigned long long size = 0; - if(media_type == MEDIA_CONTENT_TYPE_MUSIC) - { + if (media_type == MEDIA_CONTENT_TYPE_MUSIC) { audio_meta_h audio; - if(media_info_get_audio(media, &audio) == MEDIA_CONTENT_ERROR_NONE) - { + if (media_info_get_audio(media, &audio) == MEDIA_CONTENT_ERROR_NONE) { get_audio_meta(audio); ret = audio_meta_destroy(audio); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error audio_meta_destroy : [%d]", ret); - } - else + } else media_content_error("[audio_error]"); - } - else if(media_type == MEDIA_CONTENT_TYPE_IMAGE) - { + } else if (media_type == MEDIA_CONTENT_TYPE_IMAGE) { image_meta_h image; media_content_orientation_e orientation = 0; bool is_burst_shot = false; char *burst_id = NULL; char *weather = NULL; - if(media_info_get_image(media, &image) == MEDIA_CONTENT_ERROR_NONE) - { + if (media_info_get_image(media, &image) == MEDIA_CONTENT_ERROR_NONE) { ret = image_meta_get_orientation(image, &orientation); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_orientation : [%d]", ret); else media_content_debug("[image] orientation : %d", orientation); ret = image_meta_is_burst_shot(image, &is_burst_shot); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_is_burst_shot : [%d]", ret); - if(is_burst_shot) - { + if (is_burst_shot) { ret = image_meta_get_burst_id(image, &burst_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_burst_id : [%d]", ret); else media_content_debug("[image] burst_id : [%s]", burst_id); @@ -380,148 +372,141 @@ bool media_item_cb(media_info_h media, void *user_data) } ret = image_meta_destroy(image); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_destroy : [%d]", ret); - } - else + } else media_content_error("[image_error]"); - } - else if(media_type == MEDIA_CONTENT_TYPE_VIDEO) - { + } else if (media_type == MEDIA_CONTENT_TYPE_VIDEO) { video_meta_h video; - if(media_info_get_video(media, &video) == MEDIA_CONTENT_ERROR_NONE) - { + if (media_info_get_video(media, &video) == MEDIA_CONTENT_ERROR_NONE) { get_video_meta(video); ret = video_meta_destroy(video); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_destroy : [%d]", ret); - } - else + } else media_content_error("[video_error]"); - } - else - { + } else { media_content_debug("Other Content"); } media_content_debug("=== media_info ==="); ret = media_info_get_file_path(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("file_path : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_display_name(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("display_name : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_mime_type(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("mime_type : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_thumbnail_path(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("thumbnail_path : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_description(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("description : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_author(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("author : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_provider(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("provider : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_content_name(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("content_name : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_category(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("category : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_location_tag(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("location_tag : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_age_rating(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("age_rating : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_keyword(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("keyword : [%s]", c_value); SAFE_FREE(c_value); ret = media_info_get_size(media, &size); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("size : [%lld]", size); ret = media_info_get_added_time(media, &t_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("added_time : [%d]", t_value); ret = media_info_get_modified_time(media, &t_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("modified_time : [%d]", t_value); ret = media_info_get_timeline(media, &t_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("timeline : [%d]", t_value); ret = media_info_get_rating(media, &i_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("rating : [%d]", i_value); ret = media_info_get_favorite(media, &b_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("favorite : [%d]", b_value); ret = media_info_is_drm(media, &b_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("is_drm : [%d]", b_value); ret = media_info_set_weather(media, "Sunny"); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to set weather"); return ret; ret = media_info_get_weather(media, &c_value); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error when get info : [%d]", ret); media_content_debug("weather : [%s]", c_value); SAFE_FREE(c_value); @@ -546,27 +531,23 @@ bool folder_list_cb(media_folder_h folder, void *user_data) media_folder_h *_folder = (media_folder_h*)user_data; media_content_debug("==========================="); - if(folder != NULL) - { - if(_folder != NULL) + if (folder != NULL) { + if (_folder != NULL) media_folder_clone(_folder, folder); - if(media_folder_get_folder_id(folder, &folder_id) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_folder_id(folder, &folder_id) != MEDIA_CONTENT_ERROR_NONE) { media_content_error("[ERROR] media_folder_get_folder_id is failed"); return false; } media_content_debug("folder_id = [%s]", folder_id); - if(media_folder_get_parent_folder_id(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_parent_folder_id(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) { media_content_error("[ERROR] media_folder_get_parent_folder_id is failed"); return false; } media_content_debug("parent_folder_id = [%s]", str_val); - if(media_folder_get_path(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_path(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(folder_id); media_content_error("[ERROR] media_folder_get_path is failed"); return false; @@ -574,8 +555,7 @@ bool folder_list_cb(media_folder_h folder, void *user_data) media_content_debug("folder_path = [%s]", str_val); SAFE_FREE(str_val); - if(media_folder_get_name(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_name(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(folder_id); media_content_error("[ERROR] media_folder_get_name is failed"); return false; @@ -583,38 +563,33 @@ bool folder_list_cb(media_folder_h folder, void *user_data) media_content_debug("folder_name = [%s]", str_val); SAFE_FREE(str_val); - if(media_folder_get_storage_type(folder, &storage_type) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_storage_type(folder, &storage_type) != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(folder_id); media_content_error("[ERROR] media_folder_get_storage_type is failed"); return false; } media_content_debug("storage_type = [%d]", storage_type); - if(media_folder_get_storage_id(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_storage_id(folder, &str_val) != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(folder_id); media_content_error("[ERROR] media_folder_get_name is failed"); return false; } media_content_debug("storage_id = [%s]", str_val); - if(media_folder_get_order(folder, &int_val) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_order(folder, &int_val) != MEDIA_CONTENT_ERROR_NONE) { media_content_error("[ERROR] media_folder_get_order is failed"); return false; } media_content_debug("folder_order = [%d]", int_val); #if 1 - if(media_folder_get_media_count_from_db(folder_id, g_filter, &item_count) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_get_media_count_from_db(folder_id, g_filter, &item_count) != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(folder_id); media_content_error("[ERROR] media_folder_get_media_count_from_db is failed"); return false; } - if(media_folder_foreach_media_from_db(folder_id, g_filter, media_item_cb, NULL) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_folder_foreach_media_from_db(folder_id, g_filter, media_item_cb, NULL) != MEDIA_CONTENT_ERROR_NONE) { SAFE_FREE(folder_id); media_content_error("[ERROR] media_folder_foreach_media_from_db is failed"); return false; @@ -622,9 +597,7 @@ bool folder_list_cb(media_folder_h folder, void *user_data) #endif SAFE_FREE(folder_id); ret = true; - } - else - { + } else { ret = false; } @@ -640,30 +613,26 @@ bool test_album_from_db(int album_id) char *artist = NULL; ret = media_album_get_album_from_db(album_id, &album_h); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("error when get album"); return false; } - if(media_album_get_album_id(album_h, &test_album_id) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_album_id(album_h, &test_album_id) != MEDIA_CONTENT_ERROR_NONE) { media_album_destroy(album_h); return false; } media_content_debug("test_album_id : [%d]", test_album_id); - if(media_album_get_name(album_h, &album_name) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_name(album_h, &album_name) != MEDIA_CONTENT_ERROR_NONE) { media_album_destroy(album_h); return false; } media_content_debug("album_name : [%s]", album_name); - if(media_album_get_artist(album_h, &artist) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_artist(album_h, &artist) != MEDIA_CONTENT_ERROR_NONE) { media_album_destroy(album_h); /* fix prevent: Resource Leak */ SAFE_FREE(album_name); @@ -692,8 +661,7 @@ bool playlist_list_cb(media_playlist_h playlist, void *user_data) GList **list = (GList**)user_data; #endif - if(playlist == NULL) - { + if (playlist == NULL) { media_content_debug(" playlist handle is NULL"); return false; } @@ -702,7 +670,7 @@ bool playlist_list_cb(media_playlist_h playlist, void *user_data) media_content_debug("playlist_id : %d", playlist_id); /* 64bit build issue */ #if 0 - if(user_data != NULL) + if (user_data != NULL) *list = g_list_append(*list, (gpointer)playlist_id); #endif media_playlist_get_name(playlist, &playlist_name); @@ -726,20 +694,19 @@ bool tag_list_cb(media_tag_h tag, void *user_data) char *tag_name = NULL; int ret = MEDIA_CONTENT_ERROR_NONE; - if(tag == NULL) - { + if (tag == NULL) { media_content_debug(" tag handle is NULL"); return false; } ret = media_tag_get_tag_id(tag, &tag_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_tag_id : [%d]", ret); else media_content_debug("tag_id : %d", tag_id); ret = media_tag_get_name(tag, &tag_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_name : [%d]", ret); else media_content_debug("tag_name : %s", tag_name); @@ -753,27 +720,26 @@ bool bookmarks_cb(media_bookmark_h bookmark, void *user_data) media_bookmark_h *_bookmark = (media_bookmark_h*)bookmark; int ret = MEDIA_CONTENT_ERROR_NONE; - if(_bookmark != NULL) - { + if (_bookmark != NULL) { char *name = NULL; time_t time = 0; int bookmark_id = 0; ret = media_bookmark_get_bookmark_id(bookmark, &bookmark_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_bookmark_id : [%d]", ret); else media_content_debug("bookmark_id : %d", bookmark_id); ret = media_bookmark_get_thumbnail_path(bookmark, &name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_thumbnail_path : [%d]", ret); else media_content_debug("bookmark thumbnail_path : %s", name); SAFE_FREE(name); ret = media_bookmark_get_marked_time(bookmark, &time); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_marked_time : [%d]", ret); else media_content_debug("bookmark marked_time : %d", time); @@ -796,35 +762,32 @@ bool album_list_cb(media_album_h album, void *user_data) const char *condition = "MEDIA_TYPE=3"; /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to create filter"); return ret; } ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; } ret = media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_TITLE, MEDIA_CONTENT_COLLATE_NOCASE); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set order"); return ret; } - if(album != NULL) - { - if(media_album_get_album_id(album, &album_id) != MEDIA_CONTENT_ERROR_NONE) - { + if (album != NULL) { + if (media_album_get_album_id(album, &album_id) != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return false; } media_content_debug("album_id : [%d]", album_id); - if(media_album_get_name(album, &album_name) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_name(album, &album_name) != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return false; } @@ -832,8 +795,7 @@ bool album_list_cb(media_album_h album, void *user_data) media_content_debug("album_name : [%s]", album_name); SAFE_FREE(album_name); - if(media_album_get_artist(album, &artist) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_artist(album, &artist) != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return false; } @@ -841,8 +803,7 @@ bool album_list_cb(media_album_h album, void *user_data) media_content_debug("artist : [%s]", artist); SAFE_FREE(artist); - if(media_album_get_album_art(album, &album_art) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_album_art(album, &album_art) != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return false; } @@ -850,24 +811,20 @@ bool album_list_cb(media_album_h album, void *user_data) media_content_debug("album_art : [%s]", album_art); SAFE_FREE(album_art); - if(media_album_get_media_count_from_db(album_id, filter, &media_count) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_get_media_count_from_db(album_id, filter, &media_count) != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return false; } media_content_debug("media_count : [%d]", media_count); - if(media_album_foreach_media_from_db(album_id, filter, media_item_cb, NULL) != MEDIA_CONTENT_ERROR_NONE) - { + if (media_album_foreach_media_from_db(album_id, filter, media_item_cb, NULL) != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return false; } test_album_from_db(album_id); - } - else - { + } else { media_content_error("album item not Found!!"); } @@ -883,12 +840,12 @@ bool group_list_cb(const char *group_name, void *user_data) media_content_debug("group item : [%s] [%d]", group_name, *idx); - if(media_group_get_media_count_from_db(group_name, *idx, g_filter, &media_count) != MEDIA_CONTENT_ERROR_NONE) + if (media_group_get_media_count_from_db(group_name, *idx, g_filter, &media_count) != MEDIA_CONTENT_ERROR_NONE) return false; media_content_debug("media_count : [%d]", media_count); - if(media_group_foreach_media_from_db(group_name, *idx, g_filter, media_item_cb, NULL) != MEDIA_CONTENT_ERROR_NONE) + if (media_group_foreach_media_from_db(group_name, *idx, g_filter, media_item_cb, NULL) != MEDIA_CONTENT_ERROR_NONE) return false; return true; @@ -924,10 +881,10 @@ int test_filter_create(void) * Condition string : You can make where statement of sql. * Colation : You can use collation when comparing. * Ex) In case of FILE_NAME='Samsung' as condition string, - * if you want to compare with NOCASE collation, - * call media_filter_set_condition(g_filter, condition, MEDIA_CONTENT_COLLATE_NOCASE); - * if you want to compare in case-sensitive, - * call media_filter_set_condition(g_filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); + * if you want to compare with NOCASE collation, + * call media_filter_set_condition(g_filter, condition, MEDIA_CONTENT_COLLATE_NOCASE); + * if you want to compare in case-sensitive, + * call media_filter_set_condition(g_filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); */ ret = media_filter_set_condition(g_filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); @@ -944,8 +901,8 @@ int test_filter_create(void) //ret = media_filter_set_storage(g_filter, "cfbf3d2c-71c5-4611-bccc-7cbac890146e"); /* Filter for group */ - //const char *g_condition = "TAG_NAME like \"\%my\%\""; - //const char *g_condition = "BOOKMARK_MARKED_TIME > 300"; + //const char *g_condition = "TAG_NAME like \"\%my\%\""; + //const char *g_condition = "BOOKMARK_MARKED_TIME > 300"; ret = media_filter_create(&g_filter_g); @@ -974,10 +931,8 @@ int test_connect_database(void) ret = media_content_connect(); - if(ret == MEDIA_CONTENT_ERROR_NONE) - { + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("connection is success\n\n"); - } else media_content_error("connection is failed\n\n"); @@ -996,7 +951,7 @@ int test_gallery_scenario(void) /* First, Get folder list */ ret = media_folder_foreach_folder_from_db(filter, gallery_folder_list_cb, &folder_list); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_folder_foreach_folder_from_db failed: %d", ret); return -1; } else { @@ -1005,17 +960,17 @@ int test_gallery_scenario(void) char *folder_name = NULL; char *folder_path = NULL; - for(i = 0; i < g_list_length(folder_list); i++) { + for (i = 0; i < g_list_length(folder_list); i++) { folder_handle = (media_folder_h)g_list_nth_data(folder_list, i); ret = media_folder_get_folder_id(folder_handle, &folder_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_folder_get_folder_id failed: %d", ret); ret = media_folder_get_name(folder_handle, &folder_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_folder_get_name failed: %d", ret); ret = media_folder_get_path(folder_handle, &folder_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_folder_get_path failed: %d", ret); media_content_debug("folder_id [%d] : %s", i, folder_id); @@ -1027,7 +982,7 @@ int test_gallery_scenario(void) SAFE_FREE(folder_id); SAFE_FREE(folder_name); SAFE_FREE(folder_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_folder_get_media_count_from_db failed: %d", ret); return -1; } else { @@ -1047,25 +1002,25 @@ int test_gallery_scenario(void) media_content_collation_e collate_type = MEDIA_CONTENT_COLLATE_NOCASE; media_content_order_e order_type = MEDIA_CONTENT_ORDER_DESC; ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to create filter"); return ret; } ret = media_filter_set_condition(filter, "MEDIA_TYPE = 0", collate_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; } ret = media_filter_set_order(filter, order_type, MEDIA_DISPLAY_NAME, collate_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set order"); return ret; } ret = media_info_foreach_media_from_db(filter, gallery_media_item_cb, &all_item_list); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_foreach_media_from_db failed: %d", ret); media_filter_destroy(filter); return -1; @@ -1076,23 +1031,23 @@ int test_gallery_scenario(void) char *media_name = NULL; char *media_path = NULL; - for(i = 0; i < g_list_length(all_item_list); i++) { + for (i = 0; i < g_list_length(all_item_list); i++) { media_handle = (media_info_h)g_list_nth_data(all_item_list, i); ret = media_info_get_media_id(media_handle, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); ret = media_info_get_media_type(media_handle, &media_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_type failed: %d", ret); ret = media_info_get_display_name(media_handle, &media_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_display_name failed: %d", ret); ret = media_info_get_file_path(media_handle, &media_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_file_path failed: %d", ret); - if(media_type == MEDIA_CONTENT_TYPE_IMAGE) { + if (media_type == MEDIA_CONTENT_TYPE_IMAGE) { image_meta_h image_handle; int width = 0, height = 0; media_content_orientation_e orientation = 0; @@ -1100,23 +1055,23 @@ int test_gallery_scenario(void) char *burst_id = NULL; ret = media_info_get_image(media_handle, &image_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_image failed: %d", ret); } else { ret = image_meta_get_width(image_handle, &width); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_width : [%d]", ret); ret = image_meta_get_height(image_handle, &height); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_height : [%d]", ret); ret = image_meta_get_orientation(image_handle, &orientation); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_orientation : [%d]", ret); ret = image_meta_get_date_taken(image_handle, &datetaken); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_date_taken : [%d]", ret); ret = image_meta_get_burst_id(image_handle, &burst_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_burst_id : [%d]", ret); media_content_debug("This is Image"); @@ -1126,33 +1081,33 @@ int test_gallery_scenario(void) SAFE_FREE(datetaken); SAFE_FREE(burst_id); ret = image_meta_destroy(image_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_destroy : [%d]", ret); - } else if(media_type == MEDIA_CONTENT_TYPE_VIDEO) { + } else if (media_type == MEDIA_CONTENT_TYPE_VIDEO) { video_meta_h video_handle; char *title = NULL, *artist = NULL, *album = NULL, *album_artist = NULL; int duration = 0; time_t time_played = 0; ret = media_info_get_video(media_handle, &video_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_video failed: %d", ret); } else { ret = video_meta_get_artist(video_handle, &artist); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_artist : [%d]", ret); ret = video_meta_get_album(video_handle, &album); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_album : [%d]", ret); ret = video_meta_get_album_artist(video_handle, &album_artist); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_album_artist : [%d]", ret); ret = video_meta_get_duration(video_handle, &duration); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_duration : [%d]", ret); ret = video_meta_get_played_time(video_handle, &time_played); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_played_time : [%d]", ret); media_content_debug("This is Video"); @@ -1165,7 +1120,7 @@ int test_gallery_scenario(void) SAFE_FREE(album_artist); ret = video_meta_destroy(video_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_destroy : [%d]", ret); } //media_content_debug("media_id [%d] : %s", i, media_id); @@ -1189,7 +1144,7 @@ int test_gallery_scenario(void) /* Third, Get item list of a folder */ GList *item_list = NULL; - for(i = 0; i < g_list_length(folder_list); i++) { + for (i = 0; i < g_list_length(folder_list); i++) { unsigned int j = 0; char *folder_id = NULL; char *folder_name = NULL; @@ -1202,7 +1157,7 @@ int test_gallery_scenario(void) SAFE_FREE(folder_id); SAFE_FREE(folder_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_folder_foreach_media_from_db failed: %d", ret); return -1; } else { @@ -1212,20 +1167,20 @@ int test_gallery_scenario(void) char *media_path = NULL; media_content_type_e media_type = 0; - for(j = 0; j < g_list_length(item_list); j++) { + for (j = 0; j < g_list_length(item_list); j++) { media_handle = (media_info_h)g_list_nth_data(item_list, j); ret = media_info_get_media_id(media_handle, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); ret = media_info_get_display_name(media_handle, &media_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_display_name failed: %d", ret); ret = media_info_get_file_path(media_handle, &media_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_file_path failed: %d", ret); ret = media_info_get_media_type(media_handle, &media_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_type failed: %d", ret); media_content_debug("[%s] media_id [%d] : %s", folder_name, j, media_id); @@ -1233,27 +1188,27 @@ int test_gallery_scenario(void) media_content_debug("[%s] media_name [%d] : %s", folder_name, j, media_name); media_content_debug("[%s] media_path [%d] : %s", folder_name, j, media_path); - if(media_type == MEDIA_CONTENT_TYPE_IMAGE) { + if (media_type == MEDIA_CONTENT_TYPE_IMAGE) { image_meta_h image_handle; int width = 0, height = 0; media_content_orientation_e orientation = 0; char *datetaken = NULL; ret = media_info_get_image(media_handle, &image_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_image failed: %d", ret); } else { ret = image_meta_get_width(image_handle, &width); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_width : [%d]", ret); ret = image_meta_get_height(image_handle, &height); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_height : [%d]", ret); ret = image_meta_get_orientation(image_handle, &orientation); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_orientation : [%d]", ret); ret = image_meta_get_date_taken(image_handle, &datetaken); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_get_date_taken : [%d]", ret); media_content_debug("This is Image"); @@ -1262,33 +1217,33 @@ int test_gallery_scenario(void) SAFE_FREE(datetaken); ret = image_meta_destroy(image_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error image_meta_destroy : [%d]", ret); - } else if(media_type == MEDIA_CONTENT_TYPE_VIDEO) { + } else if (media_type == MEDIA_CONTENT_TYPE_VIDEO) { video_meta_h video_handle; char *title = NULL, *artist = NULL, *album = NULL, *album_artist = NULL;; int duration = 0; time_t time_played; ret = media_info_get_video(media_handle, &video_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_video failed: %d", ret); } else { ret = video_meta_get_artist(video_handle, &artist); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_artist : [%d]", ret); ret = video_meta_get_album(video_handle, &album); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_album : [%d]", ret); ret = video_meta_get_album_artist(video_handle, &album_artist); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_album_artist : [%d]", ret); ret = video_meta_get_duration(video_handle, &duration); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_duration : [%d]", ret); ret = video_meta_get_played_time(video_handle, &time_played); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_get_played_time : [%d]", ret); media_content_debug("This is Video"); @@ -1301,7 +1256,7 @@ int test_gallery_scenario(void) SAFE_FREE(album_artist); ret = video_meta_destroy(video_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error video_meta_destroy : [%d]", ret); /* Get bookmar list in case of video */ @@ -1309,23 +1264,23 @@ int test_gallery_scenario(void) GList *bm_list = NULL; ret = media_info_foreach_bookmark_from_db(media_id, filter, gallery_bookmarks_cb, &bm_list); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_foreach_bookmark_from_db failed: %d", ret); } else { media_content_debug("media_info_foreach_bookmark_from_db success"); unsigned int k = 0; - for(k = 0; k < g_list_length(bm_list); k++) { + for (k = 0; k < g_list_length(bm_list); k++) { bm_handle = (media_bookmark_h)g_list_nth_data(bm_list, k); time_t marked_time; char *thumb_path = NULL; ret = media_bookmark_get_marked_time(bm_handle, &marked_time); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_marked_time : [%d]", ret); ret = media_bookmark_get_thumbnail_path(bm_handle, &thumb_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_thumbnail_path : [%d]", ret); media_content_debug("Bookmark time : %d\nBookmar thumb: %s", marked_time, thumb_path); @@ -1334,11 +1289,11 @@ int test_gallery_scenario(void) /* Remove bookmark list */ unsigned int l = 0; - if(bm_list) { - for(l = 0; l < g_list_length(bm_list); l++) { + if (bm_list) { + for (l = 0; l < g_list_length(bm_list); l++) { bm_handle = (media_bookmark_h)g_list_nth_data(bm_list, l); ret = media_bookmark_destroy(bm_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_destroy : [%d]", ret); } @@ -1360,9 +1315,9 @@ int test_gallery_scenario(void) GList *tag_list = NULL; GList *media_list_in_tag = NULL; - ret = media_tag_foreach_tag_from_db (filter, gallery_tag_item_cb, &tag_list); + ret = media_tag_foreach_tag_from_db(filter, gallery_tag_item_cb, &tag_list); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_tag_foreach_tag_from_db failed: %d", ret); return -1; } else { @@ -1370,7 +1325,7 @@ int test_gallery_scenario(void) char *tag_name = NULL; int tag_id; - for(i = 0; i < g_list_length(tag_list); i++) { + for (i = 0; i < g_list_length(tag_list); i++) { tag_handle = (media_tag_h)g_list_nth_data(tag_list, i); media_tag_get_tag_id(tag_handle, &tag_id); media_tag_get_name(tag_handle, &tag_name); @@ -1378,7 +1333,7 @@ int test_gallery_scenario(void) media_content_debug("[%d] %s", tag_id, tag_name); ret = media_tag_foreach_media_from_db(tag_id, filter, gallery_media_item_cb, &media_list_in_tag); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_tag_foreach_media_from_db failed: %d", ret); return -1; } else { @@ -1390,19 +1345,19 @@ int test_gallery_scenario(void) char *media_path = NULL; media_content_type_e media_type = 0; - for(j = 0; j < g_list_length(media_list_in_tag); j++) { + for (j = 0; j < g_list_length(media_list_in_tag); j++) { tag_media_handle = (media_info_h)g_list_nth_data(media_list_in_tag, j); ret = media_info_get_media_id(tag_media_handle, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); ret = media_info_get_display_name(tag_media_handle, &media_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_display_name failed: %d", ret); ret = media_info_get_file_path(tag_media_handle, &media_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_file_path failed: %d", ret); ret = media_info_get_media_type(tag_media_handle, &media_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_type failed: %d", ret); media_content_debug("[%s] media_id [%d] : %s", tag_name, j, media_id); @@ -1419,8 +1374,8 @@ int test_gallery_scenario(void) } /* Remove folder list */ - if(folder_list) { - for(i = 0; i < g_list_length(folder_list); i++) { + if (folder_list) { + for (i = 0; i < g_list_length(folder_list); i++) { folder_handle = (media_folder_h)g_list_nth_data(folder_list, i); media_folder_destroy(folder_handle); } @@ -1429,11 +1384,11 @@ int test_gallery_scenario(void) } /* Remove all items list */ - if(all_item_list) { - for(i = 0; i < g_list_length(all_item_list); i++) { + if (all_item_list) { + for (i = 0; i < g_list_length(all_item_list); i++) { media_handle = (media_info_h)g_list_nth_data(all_item_list, i); ret = media_info_destroy(media_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_destroy failed: %d", ret); } @@ -1441,11 +1396,11 @@ int test_gallery_scenario(void) } /* Remove items list */ - if(item_list) { - for(i = 0; i < g_list_length(item_list); i++) { + if (item_list) { + for (i = 0; i < g_list_length(item_list); i++) { media_handle = (media_info_h)g_list_nth_data(item_list, i); ret = media_info_destroy(media_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_destroy failed: %d", ret); } @@ -1453,11 +1408,11 @@ int test_gallery_scenario(void) } /* Remove tag list */ - if(tag_list) { - for(i = 0; i < g_list_length(tag_list); i++) { + if (tag_list) { + for (i = 0; i < g_list_length(tag_list); i++) { tag_handle = (media_tag_h)g_list_nth_data(tag_list, i); ret = media_tag_destroy(tag_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_destroy : [%d]", ret); } @@ -1465,11 +1420,11 @@ int test_gallery_scenario(void) } /* Remove media list in a tag */ - if(media_list_in_tag) { - for(i = 0; i < g_list_length(media_list_in_tag); i++) { + if (media_list_in_tag) { + for (i = 0; i < g_list_length(media_list_in_tag); i++) { media_handle = (media_info_h)g_list_nth_data(media_list_in_tag, i); ret = media_info_destroy(media_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_destroy failed: %d", ret); } @@ -1490,18 +1445,18 @@ int test_get_all_music_files(void) const char *condition = "MEDIA_TYPE=3"; /*0-image, 1-video, 2-sound, 3-music, 4-other*/ ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to create filter"); return ret; } ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_LOCALIZED); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; } ret = media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_TITLE, MEDIA_CONTENT_COLLATE_LOCALIZED); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set order"); return ret; @@ -1509,7 +1464,7 @@ int test_get_all_music_files(void) /*Get Media Count*/ ret = media_info_get_media_count_from_db(filter, &media_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to get media count"); return ret; @@ -1518,7 +1473,7 @@ int test_get_all_music_files(void) media_content_debug("media_count : [%d]", media_count); ret = media_info_foreach_media_from_db(filter, media_item_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to get media"); return ret; @@ -1539,13 +1494,13 @@ int test_media_info_operation(void) test_filter_create(); ret = media_info_get_media_count_from_db(g_filter, &media_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_count_from_db failed: %d", ret); else media_content_debug("media_count : [%d]", media_count); ret = media_info_foreach_media_from_db(g_filter, media_item_cb, NULL); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_foreach_media_from_db is success"); else media_content_error("media_info_foreach_media_from_db is failed"); @@ -1579,13 +1534,13 @@ int test_media_info_operation_2(void) /* Tag */ ret = media_info_get_tag_count_from_db(test_audio_id, g_filter_g, &bookmark_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_tag_count_from_db failed: %d", ret); else media_content_debug("tag_count : [%d]", bookmark_count); ret = media_info_foreach_tag_from_db(test_audio_id, g_filter_g, tag_list_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_foreach_tag_from_db failed: %d", ret); test_filter_destroy(); @@ -1606,15 +1561,14 @@ int test_folder_operation(void) test_filter_create(); ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("[ERROR] media_folder_filter_create is failed"); return ret; } media_filter_set_condition(filter, "(MEDIA_TYPE = 0 or MEDIA_TYPE = 1) and MEDIA_STORAGE_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ - media_filter_set_offset(filter, 0,5); - media_filter_set_order(filter,MEDIA_CONTENT_ORDER_DESC, MEDIA_PATH, MEDIA_CONTENT_COLLATE_NOCASE); + media_filter_set_offset(filter, 0, 5); + media_filter_set_order(filter, MEDIA_CONTENT_ORDER_DESC, MEDIA_PATH, MEDIA_CONTENT_COLLATE_NOCASE); media_filter_set_storage(filter, "cfbf3d2c-71c5-4611-bccc-7cbac890146e"); ret = media_folder_get_folder_count_from_db(filter, &count); @@ -1626,8 +1580,7 @@ int test_folder_operation(void) filter_h m_filter = NULL; ret = media_filter_create(&m_filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { test_filter_destroy(); media_filter_destroy(filter); media_content_error("[ERROR] media_info_filter_create is failed"); @@ -1635,11 +1588,11 @@ int test_folder_operation(void) } media_filter_set_condition(m_filter, "MEDIA_TYPE=1 and MEDIA_STORAGE_TYPE=0", MEDIA_CONTENT_COLLATE_DEFAULT); /*MEDIA_TYPE 0-image, 1-video, 2-sound, 3-music, 4-other*/ - media_filter_set_offset(m_filter, 0,5); - media_filter_set_order(m_filter,MEDIA_CONTENT_ORDER_DESC, MEDIA_PATH, MEDIA_CONTENT_COLLATE_NOCASE); + media_filter_set_offset(m_filter, 0, 5); + media_filter_set_order(m_filter, MEDIA_CONTENT_ORDER_DESC, MEDIA_PATH, MEDIA_CONTENT_COLLATE_NOCASE); ret = media_folder_foreach_media_from_db(folder_id, m_filter, media_item_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("[ERROR] media_folder_foreach_media_from_db is failed, error code : %d", ret); media_filter_destroy(filter); @@ -1661,8 +1614,7 @@ bool folder_update_cb(media_folder_h folder, void *user_data) int folder_order = -1; bool ret = true; - if(folder != NULL) - { + if (folder != NULL) { ret = media_folder_get_folder_id(folder, &folder_id); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); media_content_debug("folder_id = [%s]", folder_id); @@ -1686,9 +1638,7 @@ bool folder_update_cb(media_folder_h folder, void *user_data) media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); ret = true; - } - else - { + } else { ret = false; } @@ -1767,8 +1717,7 @@ int test_playlist_operation(void) media_playlist_insert_to_db(playlist_name_2, &playlist_2); media_playlist_insert_to_db(playlist_name_3, &playlist_3); - if(playlist_1 != NULL) - { + if (playlist_1 != NULL) { /* Add media to Playlist */ media_playlist_add_media(playlist_1, test_audio_id); media_playlist_add_media(playlist_1, test_audio_id); @@ -1782,8 +1731,7 @@ int test_playlist_operation(void) media_playlist_update_to_db(playlist_1); } - if(playlist_2 != NULL) - { + if (playlist_2 != NULL) { media_playlist_add_media(playlist_2, test_audio_id); media_playlist_add_media(playlist_2, test_audio_id); media_playlist_update_to_db(playlist_2); @@ -1810,7 +1758,7 @@ int test_playlist_operation(void) /* Export and import playlist */ media_playlist_export_to_file(playlist_3, "/opt/usr/media/Music/playlist.m3u"); - media_playlist_import_from_file( "/opt/usr/media/Music/playlist.m3u", "playlist_4", &playlist_4); + media_playlist_import_from_file("/opt/usr/media/Music/playlist.m3u", "playlist_4", &playlist_4); /* Filter for media*/ ret = media_filter_create(&m_filter); @@ -1836,11 +1784,11 @@ int test_playlist_operation(void) media_playlist_foreach_media_from_db(playlist_id_1, m_filter, playlist_item_cb, &playlist_member_id_list); media_playlist_foreach_media_from_db(playlist_id_2, m_filter, playlist_item_cb, &playlist_member_id_list_1); - int playlist_member_id_1_1 =0; - int playlist_member_id_1_2 =0; - int playlist_member_id_1_3 =0; - int playlist_member_id_2_1 =0; - int playlist_member_id_2_2 =0; + int playlist_member_id_1_1 = 0; + int playlist_member_id_1_2 = 0; + int playlist_member_id_1_3 = 0; + int playlist_member_id_2_1 = 0; + int playlist_member_id_2_2 = 0; /* 64bit build issue */ #if 0 playlist_member_id_1_1 = (int)g_list_nth_data(playlist_member_id_list, 0); @@ -1876,22 +1824,22 @@ int test_playlist_operation(void) //media_playlist_delete_from_db(playlist_id_1); //media_playlist_delete_from_db(playlist_id_2); - if(playlist_1 != NULL) + if (playlist_1 != NULL) media_playlist_destroy(playlist_1); - if(playlist_2 != NULL) + if (playlist_2 != NULL) media_playlist_destroy(playlist_2); - if(playlist_3 != NULL) + if (playlist_3 != NULL) media_playlist_destroy(playlist_3); - if(playlist_4 != NULL) + if (playlist_4 != NULL) media_playlist_destroy(playlist_4); g_list_free(playlist_id_list); g_list_free(playlist_member_id_list); g_list_free(playlist_member_id_list_1); - if(filter != NULL) + if (filter != NULL) ret = media_filter_destroy(filter); - if(m_filter != NULL) + if (m_filter != NULL) ret = media_filter_destroy(m_filter); return ret; @@ -1925,118 +1873,118 @@ int test_tag_operation(void) /* Create Tag */ ret = media_tag_insert_to_db(tag_name_1, &tag_1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_insert_to_db : [%d]", ret); ret = media_tag_insert_to_db(tag_name_2, &tag_2); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_insert_to_db : [%d]", ret); ret = media_tag_insert_to_db(tag_name_3, &tag_3); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_insert_to_db : [%d]", ret); /* Add media to Tag */ ret = media_tag_add_media(tag_1, test_audio_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_add_media : [%d]", ret); ret = media_tag_add_media(tag_1, test_video_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_add_media : [%d]", ret); ret = media_tag_update_to_db(tag_1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_update_to_db : [%d]", ret); ret = media_tag_add_media(tag_2, test_audio_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_add_media : [%d]", ret); ret = media_tag_update_to_db(tag_2); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_update_to_db : [%d]", ret); /* Get Tag Count*/ ret = media_tag_get_tag_count_from_db(filter, &tag_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_tag_count_from_db : [%d]", ret); else media_content_debug("tag_count [%d]", tag_count); /* Get Tag*/ ret = media_tag_foreach_tag_from_db(filter, tag_list_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_foreach_tag_from_db : [%d]", ret); /* Get Tag id*/ ret = media_tag_get_tag_id(tag_1, &tag_id_1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_tag_id : [%d]", ret); else media_content_debug("tag_id_1 [%d]", tag_id_1); ret = media_tag_get_tag_id(tag_2, &tag_id_2); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_tag_id : [%d]", ret); else media_content_debug("tag_id_2 [%d]", tag_id_2); ret = media_tag_get_tag_id(tag_3, &tag_id_3); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_tag_id : [%d]", ret); else media_content_debug("tag_id_3 [%d]", tag_id_3); /* Get media count */ ret = media_tag_get_media_count_from_db(tag_id_1, NULL, &media_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_media_count_from_db : [%d]", ret); else media_content_debug("tag_1_media_count [%d]", media_count); ret = media_tag_get_media_count_from_db(tag_id_2, NULL, &media_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_get_media_count_from_db : [%d]", ret); else media_content_debug("tag_2_media_count [%d]", media_count); /* Get media of Tag */ ret = media_tag_foreach_media_from_db(tag_id_1, NULL, media_item_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_foreach_media_from_db : [%d]", ret); ret = media_tag_foreach_media_from_db(tag_id_2, NULL, media_item_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_foreach_media_from_db : [%d]", ret); /* Update Tag */ ret = media_tag_add_media(tag_2, test_video_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_add_media : [%d]", ret); ret = media_tag_set_name(tag_2, (char *)"test_tag"); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_set_name : [%d]", ret); ret = media_tag_update_to_db(tag_2); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_update_to_db : [%d]", ret); /* Get Updated Tag*/ ret = media_tag_foreach_tag_from_db(filter, tag_list_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_foreach_tag_from_db : [%d]", ret); /* deletes the tag */ ret = media_tag_delete_from_db(tag_id_1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_delete_from_db : [%d]", ret); ret = media_tag_delete_from_db(tag_id_2); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_delete_from_db : [%d]", ret); ret = media_tag_destroy(tag_1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_destroy : [%d]", ret); ret = media_tag_destroy(tag_2); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_tag_destroy : [%d]", ret); ret = media_filter_destroy(filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_filter_destroy : [%d]", ret); return ret; @@ -2055,35 +2003,35 @@ int test_bookmark_operation(void) const char *g_condition = "BOOKMARK_MARKED_TIME > 300"; ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_filter_create : [%d]", ret); ret = media_filter_set_condition(filter, g_condition, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_filter_set_condition : [%d]", ret); ret = media_filter_set_order(filter, MEDIA_CONTENT_ORDER_DESC, BOOKMARK_MARKED_TIME, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_filter_set_order : [%d]", ret); //insert bookmark to video const char *thumbnail_path1 = tzplatform_mkpath(TZ_USER_CONTENT, "Images and videos/My video clips/teat11.jpg"); ret = media_bookmark_insert_to_db(test_video_id, 400, thumbnail_path1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_insert_to_db : [%d]", ret); ret = media_bookmark_insert_to_db(test_video_id, 600, thumbnail_path1); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_insert_to_db : [%d]", ret); ret = media_bookmark_get_bookmark_count_from_db(filter, &bookmark_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_bookmark_get_bookmark_count_from_db : [%d]", ret); else media_content_debug("bookmark_count = [%d]", bookmark_count); ret = media_filter_destroy(filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_filter_destroy : [%d]", ret); return ret; @@ -2101,25 +2049,25 @@ int test_album_list(void) const char *condition = "MEDIA_TYPE=3"; /*0-image, 1-video, 2-sound, 3-music, 4-other*/ ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to create filter"); return ret; } ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; } ret = media_filter_set_order(filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_ALBUM, MEDIA_CONTENT_COLLATE_NOCASE); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set order"); return ret; } ret = media_album_get_album_count_from_db(filter, &album_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); return ret; } else { @@ -2127,11 +2075,11 @@ int test_album_list(void) } ret = media_album_foreach_album_from_db(filter, album_list_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_album_foreach_album_from_db : [%d]", ret); ret = media_filter_destroy(filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("error media_filter_destroy : [%d]", ret); return ret; @@ -2146,15 +2094,14 @@ int test_group_operation(void) int idx = 0; ret = test_filter_create(); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("[error(0x%08x)", ret); return ret; } - for(idx = 0; idx < MEDIA_CONTENT_GROUP_MAX; idx++) - { + for (idx = 0; idx < MEDIA_CONTENT_GROUP_MAX; idx++) { ret = media_group_get_group_count_from_db(g_filter, idx, &group_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { test_filter_destroy(); media_content_error("media_group_get_group_count_from_db fail. idx=[%d]", ret, idx); return ret; @@ -2178,7 +2125,7 @@ int test_update_operation() /* Get all item list */ ret = media_info_foreach_media_from_db(NULL, gallery_media_item_cb, &all_item_list); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_foreach_media_from_db failed: %d", ret); return -1; } else { @@ -2187,29 +2134,29 @@ int test_update_operation() char *media_path = NULL; media_content_type_e media_type = 0; - for(i = 0; i < g_list_length(all_item_list); i++) { + for (i = 0; i < g_list_length(all_item_list); i++) { media_handle = (media_info_h)g_list_nth_data(all_item_list, i); ret = media_info_get_media_id(media_handle, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); ret = media_info_get_file_path(media_handle, &media_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_file_path failed: %d", ret); ret = media_info_get_media_type(media_handle, &media_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_type failed: %d", ret); media_content_debug("media_id [%d] : %s", i, media_id); media_content_debug("media_type [%d] : %d", i, media_type); media_content_debug("media_path [%d] : %s", i, media_path); #if 0 - if(media_type == MEDIA_CONTENT_TYPE_IMAGE) { + if (media_type == MEDIA_CONTENT_TYPE_IMAGE) { image_meta_h image_handle; media_content_orientation_e orientation; ret = media_info_get_image(media_handle, &image_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_image failed: %d", ret); } else { media_content_debug("media_info_get_image success"); @@ -2219,49 +2166,49 @@ int test_update_operation() image_meta_set_orientation(image_handle, orientation); ret = image_meta_update_to_db(image_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("image_meta_update_to_db failed: %d", ret); } else { media_content_debug("image_meta_update_to_db success"); } } - } else if(media_type == MEDIA_CONTENT_TYPE_VIDEO) { + } else if (media_type == MEDIA_CONTENT_TYPE_VIDEO) { video_meta_h video_handle; ret = media_info_get_video(media_handle, &video_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_video failed: %d", ret); } else { media_content_debug("media_info_get_video success"); //update video meta - video_meta_set_played_count(video_handle,5); - video_meta_set_played_time(video_handle,5); - video_meta_set_played_position(video_handle,5); + video_meta_set_played_count(video_handle, 5); + video_meta_set_played_time(video_handle, 5); + video_meta_set_played_position(video_handle, 5); video_meta_update_to_db(video_handle); ret = video_meta_update_to_db(video_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("video_meta_update_to_db failed: %d", ret); } else { media_content_debug("video_meta_update_to_db success"); } } - } else if(media_type == MEDIA_CONTENT_TYPE_MUSIC) {//update audio meta + } else if (media_type == MEDIA_CONTENT_TYPE_MUSIC) {//update audio meta audio_meta_h audio_handle = NULL; ret = media_info_get_audio(media_handle, &audio_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_get_audio failed: %d", ret); } else { media_content_debug("media_info_get_audio success"); - audio_meta_set_played_count(audio_handle,5); - audio_meta_set_played_time(audio_handle,1000); - audio_meta_set_played_position(audio_handle,180); + audio_meta_set_played_count(audio_handle, 5); + audio_meta_set_played_time(audio_handle, 1000); + audio_meta_set_played_position(audio_handle, 180); ret = audio_meta_update_to_db(audio_handle); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("audio_meta_update_to_db failed: %d", ret); } else { media_content_debug("audio_meta_update_to_db success"); @@ -2291,12 +2238,9 @@ int test_insert(void) ret = media_info_insert_to_db(path, &media_item); - if((ret == MEDIA_CONTENT_ERROR_NONE) && (media_item != NULL)) - { + if ((ret == MEDIA_CONTENT_ERROR_NONE) && (media_item != NULL)) { media_content_debug("Insertion is success"); - } - else - { + } else { media_content_error("Insertion is failed"); ret = media_info_destroy(media_item); return ret; @@ -2305,7 +2249,7 @@ int test_insert(void) char *media_id = NULL; ret = media_info_get_media_id(media_item, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); else media_content_debug("Media ID: %s", media_id); @@ -2313,13 +2257,13 @@ int test_insert(void) SAFE_FREE(media_id); ret = media_info_update_to_db(media_item); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_update_to_db is success"); else media_content_error("media_info_update_to_db is failed"); ret = media_info_destroy(media_item); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_destroy failed: %d", ret); return ret; @@ -2333,17 +2277,17 @@ int test_move(void) media_info_h move_media = NULL; ret = media_info_get_media_from_db(move_media_id, &move_media); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_get_media_from_db success"); else media_content_error("media_info_get_media_from_db failed: %d", ret); media_content_debug("\n============DB Move Test============\n\n"); - if(move_media) { + if (move_media) { ret = media_info_move_to_db(move_media, dst_path); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("Move is success"); else media_content_error("Move is failed"); @@ -2365,21 +2309,20 @@ void thumbnail_completed_cb(media_content_error_e error, const char *path, void media_content_debug("=================[%d][%d]", g_media_cnt, g_cnt); media_content_debug("error_code [%d]", error); media_content_debug("thumbnail_path [%s]", path); - if(user_data != NULL) - { + if (user_data != NULL) { media_info_h media = (media_info_h)user_data; ret = media_info_get_thumbnail_path(media, &thumbnail_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_thumbnail_path failed: %d", ret); else media_content_debug("thumbnail_path get from media[%s]", thumbnail_path); SAFE_FREE(thumbnail_path); ret = media_info_destroy(media); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_destroy failed: %d", ret); } - if(g_cnt == g_media_cnt) + if (g_cnt == g_media_cnt) g_main_loop_quit(g_loop); return; @@ -2391,25 +2334,23 @@ bool thumbnail_create_cb(media_info_h media, void *user_data) media_info_h dst = NULL; int ret = MEDIA_CONTENT_ERROR_NONE; - if(media == NULL) - { + if (media == NULL) { media_content_debug("NO Item"); return true; } ret = media_info_get_media_id(media, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); else media_content_debug("media_id : [%s]", media_id); ret = media_info_clone(&dst, media); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_clone failed: %d", ret); - else - { + else { ret = media_info_create_thumbnail(dst, thumbnail_completed_cb, dst); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_create_thumbnail failed: %d", ret); } @@ -2428,31 +2369,30 @@ bool thumbnail_cancel_cb(media_info_h media, void *user_data) g_cnt++; - if(media == NULL) - { + if (media == NULL) { media_content_debug("NO Item"); return true; } ret = media_info_get_media_id(media, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); else media_content_debug("media_id : [%s]", media_id); ret = media_info_clone(&dst, media); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_clone failed: %d", ret); ret = media_info_cancel_thumbnail(dst); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_cancel_thumbnail failed: %d", ret); ret = media_info_destroy(dst); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_destroy failed: %d", ret); - if(g_cnt == g_media_cnt) + if (g_cnt == g_media_cnt) g_main_loop_quit(g_loop); /* fix prevent: Resource leak */ @@ -2467,7 +2407,7 @@ gboolean create_thumbnail_start(gpointer data) ret = media_info_foreach_media_from_db(g_filter, thumbnail_create_cb, NULL); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_foreach_media_from_db is success"); else media_content_error("media_info_foreach_media_from_db is failed"); @@ -2481,7 +2421,7 @@ gboolean cancel_thumbnail_start(gpointer data) ret = media_info_foreach_media_from_db(g_filter, thumbnail_cancel_cb, NULL); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_foreach_media_from_db is success"); else media_content_error("media_info_foreach_media_from_db is failed"); @@ -2498,7 +2438,7 @@ int test_create_thumbnail(int cancel) test_filter_create(); ret = media_info_get_media_count_from_db(g_filter, &g_media_cnt); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_count_from_db failed: %d", ret); else media_content_debug("media_count : [%d]", g_media_cnt); @@ -2506,15 +2446,15 @@ int test_create_thumbnail(int cancel) g_loop = g_main_loop_new(NULL, FALSE); context = g_main_loop_get_context(g_loop); source = g_idle_source_new(); - g_source_set_callback (source, create_thumbnail_start, NULL, NULL); - g_source_attach (source, context); + g_source_set_callback(source, create_thumbnail_start, NULL, NULL); + g_source_attach(source, context); /* Logic to cancel */ if (cancel) { GSource *cancel_src = NULL; cancel_src = g_idle_source_new(); - g_source_set_callback (cancel_src, cancel_thumbnail_start, NULL, NULL); - g_source_attach (cancel_src, context); + g_source_set_callback(cancel_src, cancel_thumbnail_start, NULL, NULL); + g_source_attach(cancel_src, context); } g_main_loop_run(g_loop); @@ -2532,7 +2472,7 @@ int test_disconnect_database(void) ret = media_content_disconnect(); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("disconnection is success"); else media_content_error("disconnection is failed"); @@ -2549,33 +2489,33 @@ int test_request_update_db(void) //get the content of Over the horizon ret = media_info_get_media_from_db("71b19196-5b38-4ab1-ab34-bfe05c369614", &media); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_from_db failed: %d", ret); ret = media_info_set_content_name(media, "TEST_content_name"); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_set_content_name failed: %d", ret); ret = media_info_set_favorite(media, TRUE); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_set_favorite failed: %d", ret); ret = media_info_update_to_db(media); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_info_update_to_db is success"); else media_content_error("media_info_update_to_db is failed"); - if(media != NULL) + if (media != NULL) media_info_destroy(media); /*get the updated value*/ ret = media_info_get_media_from_db("71b19196-5b38-4ab1-ab34-bfe05c369614", &media); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_from_db failed: %d", ret); ret = media_info_get_content_name(media, &content_name); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_content_name failed: %d", ret); else media_content_debug("content name [%s]", content_name); @@ -2583,7 +2523,7 @@ int test_request_update_db(void) SAFE_FREE(content_name); ret = media_info_get_favorite(media, &favorite); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_favorite failed: %d", ret); else media_content_debug("favorite [%d]", favorite); @@ -2605,50 +2545,34 @@ bool dft_cb(media_info_h media, void *user_data) char *mime_type = NULL; int ret = MEDIA_CONTENT_ERROR_NONE; - if(media == NULL) - { + if (media == NULL) return true; - } ret = media_info_get_media_type(media, &media_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_type failed: %d", ret); ret = media_info_get_size(media, &file_size); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_size failed: %d", ret); ret = media_info_get_mime_type(media, &mime_type); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_mime_type failed: %d", ret); - if(media_type == MEDIA_CONTENT_TYPE_IMAGE) - { + if (media_type == MEDIA_CONTENT_TYPE_IMAGE) g_total_photo_size += file_size; - } - else if(media_type == MEDIA_CONTENT_TYPE_VIDEO) - { + else if (media_type == MEDIA_CONTENT_TYPE_VIDEO) g_total_video_size += file_size; - } - else if(media_type == MEDIA_CONTENT_TYPE_SOUND) - { + else if (media_type == MEDIA_CONTENT_TYPE_SOUND) g_total_voice_memo_size += file_size; - } - else if(media_type == MEDIA_CONTENT_TYPE_MUSIC) - { - if((mime_type != NULL) && (!strcmp("audio/mpeg", mime_type))) - { + else if (media_type == MEDIA_CONTENT_TYPE_MUSIC) { + if ((mime_type != NULL) && (!strcmp("audio/mpeg", mime_type))) g_total_mp3_size += file_size; - } else - { g_total_voice_memo_size += file_size; - } - } - else - { + } else media_content_debug("invalid media_type"); - } - if(mime_type != NULL) + if (mime_type != NULL) free(mime_type); return true; @@ -2787,28 +2711,28 @@ int test_batch_operations() } ret = media_info_insert_batch_to_db((const char **)file_list, 10, insert_batch_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_insert_batch_to_db failed : %d\n", ret); } filter_h filter; char *condition = "MEDIA_PATH LIKE \'"; - strncat (condition, tzplatform_mkpath(TZ_USER_CONTENT, "test/image%%jpg\'"), 17); + strncat(condition, tzplatform_mkpath(TZ_USER_CONTENT, "test/image%%jpg\'"), 17); ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to create filter"); return ret; } ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; } ret = media_info_delete_batch_from_db(filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("media_info_delete_batch_from_db failed : %d\n", ret); return ret; @@ -2839,7 +2763,7 @@ gboolean test_insert_burst_shot_to_db_start(gpointer data) } ret = media_info_insert_burst_shot_to_db((const char **)file_list, 10, insert_burst_shot_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_insert_burst_shot_to_db failed : %d\n", ret); } @@ -2854,8 +2778,8 @@ int test_insert_burst_shot_to_db(void) g_loop = g_main_loop_new(NULL, FALSE); context = g_main_loop_get_context(g_loop); source = g_idle_source_new(); - g_source_set_callback (source, test_insert_burst_shot_to_db_start, NULL, NULL); - g_source_attach (source, context); + g_source_set_callback(source, test_insert_burst_shot_to_db_start, NULL, NULL); + g_source_attach(source, context); g_main_loop_run(g_loop); g_main_loop_unref(g_loop); @@ -2877,7 +2801,7 @@ int test_scan_file() const char *file_path = tzplatform_mkpath(TZ_USER_CONTENT, "test/image1.jpg"); ret = media_content_scan_file(file_path); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to media_content_scan_file : %d", ret); return ret; } @@ -2893,7 +2817,7 @@ gboolean test_scan_dir_start(gpointer data) ret = media_content_scan_folder(dir_path, TRUE, _scan_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to test_scan_dir_start : %d", ret); return ret; } @@ -2909,7 +2833,7 @@ gboolean cancel_scan_dir_start(gpointer data) ret = media_content_cancel_scan_folder(dir_path); - if(ret == MEDIA_CONTENT_ERROR_NONE) + if (ret == MEDIA_CONTENT_ERROR_NONE) media_content_debug("media_content_cancel_scan_folder is success"); else media_content_error("media_content_cancel_scan_folder is failed"); @@ -2925,14 +2849,14 @@ int test_scan_dir(int cancel) g_loop = g_main_loop_new(NULL, FALSE); context = g_main_loop_get_context(g_loop); source = g_idle_source_new(); - g_source_set_callback (source, test_scan_dir_start, NULL, NULL); - g_source_attach (source, context); + g_source_set_callback(source, test_scan_dir_start, NULL, NULL); + g_source_attach(source, context); if (cancel) { GSource *cancel_src = NULL; cancel_src = g_idle_source_new(); - g_source_set_callback (cancel_src, cancel_scan_dir_start, NULL, NULL); - g_source_attach (cancel_src, context); + g_source_set_callback(cancel_src, cancel_scan_dir_start, NULL, NULL); + g_source_attach(cancel_src, context); } g_main_loop_run(g_loop); @@ -3020,24 +2944,24 @@ gboolean _send_noti_operations(gpointer data) /* media_info_delete_batch_from_db */ filter_h filter; char *condition = "MEDIA_PATH LIKE \'"; - strncat (condition, tzplatform_mkpath(TZ_USER_CONTENT, "test/image%%jpg\'"), 17); + strncat(condition, tzplatform_mkpath(TZ_USER_CONTENT, "test/image%%jpg\'"), 17); ret = media_filter_create(&filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("Fail to create filter"); media_info_destroy(media_item); return ret; } ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_info_destroy(media_item); media_content_error("Fail to set condition"); return ret; } ret = media_info_delete_batch_from_db(filter); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_info_destroy(media_item); media_content_error("media_info_delete_batch_from_db failed : %d\n", ret); @@ -3048,7 +2972,7 @@ gboolean _send_noti_operations(gpointer data) /* media_info_update_to_db */ ret = media_info_update_to_db(media_item); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_update_to_db failed : %d\n", ret); media_info_destroy(media_item); return ret; @@ -3068,8 +2992,8 @@ int test_noti() g_loop = g_main_loop_new(NULL, FALSE); context = g_main_loop_get_context(g_loop); source = g_idle_source_new(); - g_source_set_callback (source, _send_noti_operations, NULL, NULL); - g_source_attach (source, context); + g_source_set_callback(source, _send_noti_operations, NULL, NULL); + g_source_attach(source, context); g_main_loop_run(g_loop); g_main_loop_unref(g_loop); @@ -3120,8 +3044,7 @@ int test_create_handle(void) ret = media_info_set_added_time(media, 12345); ret = media_info_insert_to_db_with_data(media); - if(ret != MEDIA_CONTENT_ERROR_NONE) - { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_insert_to_db_with_data failed : %d\n", ret); media_info_destroy(media); return ret; @@ -3268,20 +3191,20 @@ int test_face(void) media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "fail media_filter_create"); ret = media_filter_set_condition(filter, "MEDIA_TYPE = 0", MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; } ret = media_info_foreach_media_from_db(filter, gallery_media_item_cb, &all_item_list); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_content_error("media_info_foreach_media_from_db failed: %d", ret); media_filter_destroy(filter); return ret; } - for(i = 0; i < g_list_length(all_item_list); i++) { + for (i = 0; i < g_list_length(all_item_list); i++) { media_info_h media_handle = NULL; char *media_id = NULL; int face_count = 0; @@ -3289,17 +3212,17 @@ int test_face(void) media_handle = (media_info_h)g_list_nth_data(all_item_list, i); ret = media_info_get_media_id(media_handle, &media_id); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_media_id failed: %d", ret); ret = media_info_get_face_count_from_db(media_id, filter, &face_count); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_get_face_count_from_db failed: %d", ret); media_content_error("media_id [%s] face_count [%d]", media_id, face_count); ret = media_info_foreach_face_from_db(media_id, filter, media_face_test_cb, NULL); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) media_content_error("media_info_foreach_face_from_db failed: %d", ret); media_info_destroy(media_handle); @@ -3337,7 +3260,7 @@ int test_face_add_del(void) media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "fail media_filter_create"); ret = media_filter_set_condition(filter, "MEDIA_FACE_TAG IS NOT NULL", MEDIA_CONTENT_COLLATE_DEFAULT); - if(ret != MEDIA_CONTENT_ERROR_NONE) { + if (ret != MEDIA_CONTENT_ERROR_NONE) { media_filter_destroy(filter); media_content_error("Fail to set condition"); return ret; @@ -3345,7 +3268,7 @@ int test_face_add_del(void) ret = media_info_foreach_face_from_db(media_id, filter, media_face_test_cb, &all_item_list); - if (g_list_length(all_item_list) > 0 ) { + if (g_list_length(all_item_list) > 0) { media_face_h face_handle = NULL; face_handle = (media_face_h)g_list_nth_data(all_item_list, 0); @@ -3375,113 +3298,113 @@ int main(int argc, char *argv[]) media_content_debug("--- content manager test start ---\n\n"); ret = test_connect_database(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; #if 0 ret = test_move(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_gallery_scenario(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_get_all_music_files(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_media_info_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_folder_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_folder_update(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_playlist_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_tag_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_bookmark_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_album_list(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_group_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_update_operation(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_insert(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_move(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_create_thumbnail(TRUE); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_request_update_db(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = DFT_test(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; ret = test_batch_operations(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_insert_burst_shot_to_db(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_scan_file(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_scan_dir(true); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_noti(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_create_handle(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_face(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; ret = test_face_add_del(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return MEDIA_CONTENT_ERROR_NONE; #endif ret = test_disconnect_database(); - if(ret != MEDIA_CONTENT_ERROR_NONE) + if (ret != MEDIA_CONTENT_ERROR_NONE) return ret; media_content_debug("--- content manager test end ---\n"); -- 2.7.4