From c02988071e230837d5c60fb9bf98a38c81a9c2e0 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Wed, 27 May 2015 14:02:43 +0200 Subject: [PATCH] [Content] Added logs in methods onEntered and onReturn Change-Id: I998c16bb90362066320f8fa16dddce926bfa9565 Signed-off-by: Piotr Kosko --- src/content/content_filter.cc | 9 ++- src/content/content_instance.cc | 32 ++++++++-- src/content/content_manager.cc | 104 +++++++++++++++++++++++--------- 3 files changed, 108 insertions(+), 37 deletions(-) diff --git a/src/content/content_filter.cc b/src/content/content_filter.cc index 71b89719..dc6135cb 100755 --- a/src/content/content_filter.cc +++ b/src/content/content_filter.cc @@ -45,6 +45,7 @@ std::map const attributeNameMap = { }; std::string escapeValueString(const std::string& data) { + LoggerD("Enter"); std::string out; // If string won't be resized, then it will be faster out.reserve(data.size()); @@ -69,17 +70,21 @@ std::string escapeValueString(const std::string& data) { PlatformResult ContentFilter::MapField(const std::string& name, std::string* result) { + LoggerD("Enter"); auto it = attributeNameMap.find(name); if (it != attributeNameMap.end()) *result = it->second; else + { + LoggerE("INVALID_VALUES_ERR"); return PlatformResult(ErrorCode::INVALID_VALUES_ERR); - + } return PlatformResult(ErrorCode::NO_ERROR); } PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter, std::string* queryToCall) { + LoggerD("Enter"); std::vector > partialqueries; partialqueries.push_back(std::vector()); @@ -107,6 +112,7 @@ PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter, } else if (AttributeMatchFlag::kExists == match_flag) { query += " IS NOT NULL "; } else { + LoggerE("INVALID_VALUES_ERR"); return PlatformResult(ErrorCode::INVALID_VALUES_ERR); } @@ -199,6 +205,7 @@ PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter, }); if (!visitor.Visit(jsFilter)) { + LoggerE("INVALID_VALUES_ERR"); return PlatformResult(ErrorCode::INVALID_VALUES_ERR); } diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc index 114d1929..8756cd67 100755 --- a/src/content/content_instance.cc +++ b/src/content/content_instance.cc @@ -69,6 +69,7 @@ static gboolean CompletedCallback(const std::shared_ptr& user if (user_data->isSuccess) { ReportSuccess(user_data->result, out); } else { + LoggerE("Failed: user_data->isSuccess"); ReportError(out); } @@ -222,19 +223,22 @@ static void changedContentCallback(media_content_error_e error, void ContentInstance::ContentManagerUpdate(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; if (ContentManager::getInstance()->isConnected()) { ret = ContentManager::getInstance()->update(args); if (ret != 0) { + LoggerE("Failed: ContentManager::getInstance()"); ReportError(ContentManager::getInstance()->convertError(ret), &out); } } else { + LoggerE("Failed: DB connection is failed"); ReportError(common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "DB connection is failed."), &out); } } void ContentInstance::ContentManagerUpdatebatch(const picojson::value& args, picojson::object& out) { - LoggerE("entered"); + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -251,6 +255,7 @@ void ContentInstance::ContentManagerUpdatebatch(const picojson::value& args, pic common::TaskQueue::GetInstance().Queue(WorkThread, CompletedCallback, cbData); } void ContentInstance::ContentManagerGetdirectories(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); CHECK_EXIST(args, "callbackId", out) double callbackId = args.get("callbackId").get(); @@ -270,6 +275,7 @@ void ContentInstance::ContentManagerGetdirectories(const picojson::value& args, } void ContentInstance::ContentManagerFind(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); CHECK_EXIST(args, "callbackId", out) double callbackId = args.get("callbackId").get(); @@ -288,6 +294,7 @@ void ContentInstance::ContentManagerFind(const picojson::value& args, picojson:: } void ContentInstance::ContentManagerScanfile(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "contentURI", out) @@ -307,6 +314,7 @@ void ContentInstance::ContentManagerScanfile(const picojson::value& args, picojs void ContentInstance::ContentManagerSetchangelistener(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); CHECK_EXIST(args, "listenerId", out) ReplyCallbackData* cbData = new ReplyCallbackData(); @@ -325,11 +333,14 @@ void ContentInstance::ContentManagerSetchangelistener(const picojson::value& arg } void ContentInstance::ContentManagerUnsetchangelistener(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); if (ContentManager::getInstance()->unSetChangeListener().IsError()) { LoggerD("unsuccesfull deregistering of callback"); } } + void ContentInstance::ContentManagerGetplaylists(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); CHECK_EXIST(args, "callbackId", out) double callbackId = args.get("callbackId").get(); @@ -351,6 +362,7 @@ void ContentInstance::ContentManagerGetplaylists(const picojson::value& args, pi } void ContentInstance::ContentManagerCreateplaylist(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "name", out) @@ -372,6 +384,7 @@ void ContentInstance::ContentManagerCreateplaylist(const picojson::value& args, common::TaskQueue::GetInstance().Queue(WorkThread, CompletedCallback, cbData); } void ContentInstance::ContentManagerRemoveplaylist(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -392,6 +405,7 @@ void ContentInstance::ContentManagerRemoveplaylist(const picojson::value& args, } void ContentInstance::ContentManagerPlaylistAdd(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; if(ContentManager::getInstance()->isConnected()) { std::string playlist_id = args.get("playlistId").get(); @@ -407,7 +421,7 @@ void ContentInstance::ContentManagerPlaylistAdd(const picojson::value& args, pic } void ContentInstance::ContentManagerPlaylistAddbatch(const picojson::value& args, picojson::object& out) { - LoggerE("entered"); + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -426,7 +440,7 @@ void ContentInstance::ContentManagerPlaylistAddbatch(const picojson::value& args void ContentInstance::ContentManagerPlaylistGet(const picojson::value& args, picojson::object& out) { - LoggerE("entered"); + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -444,6 +458,7 @@ void ContentInstance::ContentManagerPlaylistGet(const picojson::value& args, pic } void ContentInstance::ContentManagerPlaylistRemove(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; if(ContentManager::getInstance()->isConnected()) { std::string playlist_id = args.get("playlistId").get(); @@ -459,7 +474,7 @@ void ContentInstance::ContentManagerPlaylistRemove(const picojson::value& args, } void ContentInstance::ContentManagerPlaylistRemovebatch(const picojson::value& args, picojson::object& out) { - LoggerE("entered"); + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -478,7 +493,7 @@ void ContentInstance::ContentManagerPlaylistRemovebatch(const picojson::value& a void ContentInstance::ContentManagerPlaylistSetorder(const picojson::value& args, picojson::object& out) { - LoggerE("entered"); + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -496,7 +511,7 @@ void ContentInstance::ContentManagerPlaylistSetorder(const picojson::value& args } void ContentInstance::ContentManagerPlaylistMove(const picojson::value& args, picojson::object& out) { - LoggerE("entered"); + LoggerD("entered"); double callbackId = args.get("callbackId").get(); auto cbData = std::shared_ptr(new ReplyCallbackData); @@ -515,6 +530,7 @@ void ContentInstance::ContentManagerPlaylistMove(const picojson::value& args, pi void ContentInstance::ContentManagerAudioGetLyrics(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); LOGGER(DEBUG) << "entered"; int ret; @@ -532,6 +548,7 @@ void ContentInstance::ContentManagerAudioGetLyrics(const picojson::value& args, } void ContentInstance::PlaylistGetName(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; CHECK_EXIST(args, "id", out) int id = static_cast(args.get("id").get()); @@ -545,6 +562,7 @@ void ContentInstance::PlaylistGetName(const picojson::value& args, picojson::obj } void ContentInstance::PlaylistSetName(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; CHECK_EXIST(args, "id", out) CHECK_EXIST(args, "name", out) @@ -559,6 +577,7 @@ void ContentInstance::PlaylistSetName(const picojson::value& args, picojson::obj } void ContentInstance::PlaylistGetThumbnailUri(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; CHECK_EXIST(args, "id", out) int id = static_cast(args.get("id").get()); @@ -572,6 +591,7 @@ void ContentInstance::PlaylistGetThumbnailUri(const picojson::value& args, picoj } void ContentInstance::PlaylistSetThumbnailUri(const picojson::value& args, picojson::object& out) { + LoggerD("entered"); int ret; CHECK_EXIST(args, "id", out) CHECK_EXIST(args, "uri", out) diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc index a21345dc..1358330c 100755 --- a/src/content/content_manager.cc +++ b/src/content/content_manager.cc @@ -41,6 +41,7 @@ const std::map orientationMap = { }; static int get_utc_offset() { + LoggerD("Enter"); time_t zero = 24 * 60 * 60L; struct tm* timeptr; int gmtime_hours; @@ -56,6 +57,7 @@ static int get_utc_offset() { } std::string get_date(char* tmpStr) { + LoggerD("Enter"); if (tmpStr) { struct tm* result = (struct tm*) calloc(1, sizeof(struct tm)); if (strptime(tmpStr, "%Y:%m:%d %H:%M:%S", result) == NULL) { @@ -74,6 +76,7 @@ std::string get_date(char* tmpStr) { } void ContentToJson(media_info_h info, picojson::object& o) { + LoggerD("Enter"); int ret; int tmpInt = 0; bool tmpBool = false; @@ -338,7 +341,7 @@ void ContentToJson(media_info_h info, picojson::object& o) { } static int setContent(media_info_h media, const picojson::value& content) { - LOGGER(DEBUG) << "entered"; + LoggerD("Enter"); int ret; std::string name = content.get("name").to_str(); @@ -347,37 +350,39 @@ static int setContent(media_info_h media, const picojson::value& content) { bool is_fav = content.get("isFavorite").get(); if (NULL == media) { + LoggerE("MEDIA_CONTENT_ERROR_DB_FAILED"); return MEDIA_CONTENT_ERROR_DB_FAILED; } media_content_type_e type; ret = media_info_get_media_type(media, &type); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: media_info_get_media_type()"); return ret; } ret = media_info_set_display_name(media, name.c_str()); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Updating name failed."); + LoggerE("Updating name failed."); } ret = media_info_set_description(media, description.c_str()); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Updating description failed."); + LoggerE("Updating description failed."); } ret = media_info_set_rating(media, rating); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Updating rating failed."); + LoggerE("Updating rating failed."); } ret = media_info_set_favorite(media, is_fav); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Updating isFavorite failed."); + LoggerE("Updating isFavorite failed."); } if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Updating favorite failed."); + LoggerE("Updating favorite failed."); } if (type == MEDIA_CONTENT_TYPE_IMAGE) { @@ -391,7 +396,7 @@ static int setContent(media_info_h media, const picojson::value& content) { MEDIA_CONTENT_ERROR_NONE == image_meta_update_to_db(img)) { LoggerD("orientation update was successful"); } else { - LoggerD("orientation update failed"); + LoggerE("orientation update failed"); } } } @@ -402,7 +407,7 @@ static int setContent(media_info_h media, const picojson::value& content) { double longitude = atof(geo.get("longitude").to_str().c_str()); ret = media_info_set_latitude(media, latitude); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Updating geolocation is failed."); + LoggerE("Updating geolocation is failed."); } ret = media_info_set_longitude(media, longitude); if (ret != MEDIA_CONTENT_ERROR_NONE) { @@ -414,7 +419,7 @@ static int setContent(media_info_h media, const picojson::value& content) { } static void FolderToJson(media_folder_h folder, picojson::object* out) { - LOGGER(DEBUG) << "entered"; + LoggerD("Enter"); int ret; char* name = NULL; @@ -447,6 +452,7 @@ static void FolderToJson(media_folder_h folder, picojson::object* out) { } static bool media_foreach_directory_cb(media_folder_h folder, void *user_data) { + LoggerD("Enter"); picojson::array *array = static_cast(user_data); picojson::object json; FolderToJson(folder, &json); @@ -455,6 +461,7 @@ static bool media_foreach_directory_cb(media_folder_h folder, void *user_data) { } static bool media_foreach_content_cb(media_info_h media, void *user_data) { + LoggerD("Enter"); picojson::value::array *contents = static_cast(user_data); picojson::value::object o; ContentToJson(media, o); @@ -464,6 +471,7 @@ static bool media_foreach_content_cb(media_info_h media, void *user_data) { static bool playlist_foreach_cb(media_playlist_h playlist, void *user_data) { + LoggerD("Enter"); picojson::value::array *playlists = static_cast(user_data); picojson::value::object o; if (playlist != NULL) { @@ -504,7 +512,7 @@ static bool playlist_foreach_cb(media_playlist_h playlist, void *user_data) { o["numberOfTracks"] = picojson::value(static_cast(cnt)); } else { - LoggerD("Invalid count for playlist."); + LoggerE("Invalid count for playlist."); } playlists->push_back(picojson::value(o)); @@ -514,6 +522,7 @@ static bool playlist_foreach_cb(media_playlist_h playlist, void *user_data) { static bool playlist_content_member_cb(int playlist_member_id, media_info_h media, void *user_data) { + LoggerD("Enter"); picojson::value::array *contents = static_cast(user_data); picojson::value::object o; char *name = NULL; @@ -527,7 +536,7 @@ static bool playlist_content_member_cb(int playlist_member_id, media_info_h medi ContentManager::ContentManager() { - LoggerE("ContentManager called"); + LoggerD("ContentManager called"); if(media_content_connect() == MEDIA_CONTENT_ERROR_NONE) { m_dbConnected = true; } @@ -536,6 +545,7 @@ ContentManager::ContentManager() { } ContentManager::~ContentManager() { + LoggerD("Enter"); if(m_dbConnected) { if(media_content_disconnect() == MEDIA_CONTENT_ERROR_NONE) { m_dbConnected = false; @@ -544,21 +554,24 @@ ContentManager::~ContentManager() { } ContentManager* ContentManager::getInstance() { + LoggerD("Enter"); static ContentManager instance; return &instance; } bool ContentManager::isConnected() { + LoggerD("Enter"); return m_dbConnected; } void ContentManager::getDirectories(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret; filter_h filter = NULL; ret = media_filter_create(&filter); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LOGGER(ERROR) << "media_filter_create failed"; + LoggerE("Failed: media_filter_create failed"); return; } @@ -572,6 +585,7 @@ void ContentManager::getDirectories(const std::shared_ptr& us picojson::array pico_dirs; ret = media_folder_foreach_folder_from_db(filter, media_foreach_directory_cb, &pico_dirs); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: Getting the directories failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting the directories failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -583,7 +597,7 @@ void ContentManager::getDirectories(const std::shared_ptr& us } void ContentManager::find(const std::shared_ptr& user_data) { - LOGGER(DEBUG) << "entered"; + LoggerD("Enter"); int ret; int count, offset; @@ -609,7 +623,7 @@ void ContentManager::find(const std::shared_ptr& user_data) { ret = media_filter_set_condition(filter, query.c_str(), MEDIA_CONTENT_COLLATE_DEFAULT); if (MEDIA_CONTENT_ERROR_NONE != ret) { - LoggerD("Platform filter setting failed, error %d", ret); + LoggerE("Platform filter setting failed, error %d", ret); } } } @@ -633,7 +647,7 @@ void ContentManager::find(const std::shared_ptr& user_data) { ret = media_filter_set_order(filter, order, sortModeName.c_str(), MEDIA_CONTENT_COLLATE_DEFAULT); if (MEDIA_CONTENT_ERROR_NONE != ret) { - LoggerD("Platform SortMode setting failed, error: %d", ret); + LoggerE("Platform SortMode setting failed, error: %d", ret); } } } @@ -651,7 +665,7 @@ void ContentManager::find(const std::shared_ptr& user_data) { } ret = media_filter_set_offset(filter, offset, count); if (MEDIA_CONTENT_ERROR_NONE != ret) { - LoggerD("A platform error occurs in media_filter_set_offset: %d", ret); + LoggerE("A platform error occurs in media_filter_set_offset: %d", ret); } if (!IsNull(user_data->args.get("directoryId"))) { dirId = user_data->args.get("directoryId").get(); @@ -664,7 +678,7 @@ void ContentManager::find(const std::shared_ptr& user_data) { user_data->isSuccess = true; user_data->result = picojson::value(arrayContent); } else { - LoggerD("The iteration failed in platform: %d", ret); + LoggerE("The iteration failed in platform: %d", ret); PlatformResult err(ErrorCode::UNKNOWN_ERR, "The iteration failed in platform"); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -672,20 +686,25 @@ void ContentManager::find(const std::shared_ptr& user_data) { } int ContentManager::scanFile(std::string& uri) { + LoggerD("Enter"); return media_content_scan_file(uri.c_str()); } PlatformResult ContentManager::setChangeListener(media_content_db_update_cb callback, void *user_data) { + LoggerD("Enter"); int ret = media_content_set_db_updated_cb(callback, user_data); if(ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: registering the listener is failed"); return PlatformResult(ErrorCode::UNKNOWN_ERR, ("registering the listener is failed.")); } return PlatformResult(ErrorCode::NO_ERROR); } PlatformResult ContentManager::unSetChangeListener() { + LoggerD("Enter"); int ret = media_content_unset_db_updated_cb(); if(ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: unregistering the listener is failed"); return PlatformResult(ErrorCode::UNKNOWN_ERR, ("unregistering the listener is failed.")); } return PlatformResult(ErrorCode::NO_ERROR); @@ -693,11 +712,12 @@ PlatformResult ContentManager::unSetChangeListener() { void ContentManager::createPlaylist(std::string name, const std::shared_ptr& user_data) { - + LoggerD("Enter"); media_playlist_h playlist = NULL; int ret = media_playlist_insert_to_db(name.c_str(),&playlist); if(ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: creation of playlist is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "creation of playlist is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -714,6 +734,7 @@ void ContentManager::createPlaylist(std::string name, o["id"] = picojson::value(std::to_string(id)); } else { + LoggerE("Failed: loading of playlist is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "loading of playlist is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -729,21 +750,21 @@ void ContentManager::createPlaylist(std::string name, } } else { - LoggerD("Invalid thumbnail path for playlist."); + LoggerE("Invalid thumbnail path for playlist."); } if( media_playlist_get_name(playlist, &name) == MEDIA_CONTENT_ERROR_NONE) { o["name"] = picojson::value(std::string(name)); free(name); } else { - LoggerD("Invalid name for playlist."); + LoggerE("Invalid name for playlist."); } media_filter_create(&filter); if( media_playlist_get_media_count_from_db(id, filter, &cnt) == MEDIA_CONTENT_ERROR_NONE) { o["numberOfTracks"] = picojson::value(static_cast(cnt)); } else { - LoggerD("Invalid count for playlist."); + LoggerE("Invalid count for playlist."); } } user_data->isSuccess = true; @@ -753,6 +774,7 @@ void ContentManager::createPlaylist(std::string name, void ContentManager::getPlaylists(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret; filter_h filter; media_filter_create(&filter); @@ -761,6 +783,7 @@ void ContentManager::getPlaylists(const std::shared_ptr& user ret = media_playlist_foreach_playlist_from_db(filter, playlist_foreach_cb, static_cast(&playlists)); if(ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: Getting playlist is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -772,8 +795,10 @@ void ContentManager::getPlaylists(const std::shared_ptr& user void ContentManager::removePlaylist(std::string playlistId, const std::shared_ptr& user_data) { + LoggerD("Enter"); int id = std::atoi(playlistId.c_str()); if(id == 0) { + LoggerE("Failed: PlaylistId is wrong"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "PlaylistId is wrong."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -782,6 +807,7 @@ void ContentManager::removePlaylist(std::string playlistId, int ret = media_playlist_delete_from_db(id); if(ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: Removal of playlist is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Removal of playlist is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -789,7 +815,7 @@ void ContentManager::removePlaylist(std::string playlistId, } int ContentManager::update(picojson::value args) { - LOGGER(DEBUG) << "entered"; + LoggerD("Enter"); int ret; picojson::value content = args.get("content"); @@ -807,6 +833,7 @@ int ContentManager::update(picojson::value args) { } int ContentManager::updateBatch(picojson::value args) { + LoggerD("Enter"); int ret = 0; std::vector contents = args.get("contents").get(); @@ -826,6 +853,7 @@ int ContentManager::updateBatch(picojson::value args) { } int ContentManager::playlistAdd(std::string playlist_id, std::string content_id) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_h playlist = NULL; @@ -834,16 +862,16 @@ int ContentManager::playlistAdd(std::string playlist_id, std::string content_id) if (playlist != NULL && ret == MEDIA_CONTENT_ERROR_NONE) { ret = media_playlist_add_media(playlist, content_id.c_str()); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("The content(id:%s) can't add to playlist",content_id.c_str()); + LoggerE("The content(id:%s) can't add to playlist",content_id.c_str()); } ret = media_playlist_update_to_db(playlist); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("The content(id:%s) can't add to playlist",content_id.c_str()); + LoggerE("The content(id:%s) can't add to playlist",content_id.c_str()); } } else { - LoggerD("Playlist(id:%s) is not exist",playlist_id.c_str()); + LoggerE("Playlist(id:%s) is not exist",playlist_id.c_str()); } media_playlist_destroy(playlist); @@ -851,6 +879,7 @@ int ContentManager::playlistAdd(std::string playlist_id, std::string content_id) } int ContentManager::playlistRemove(std::string playlist_id, int member_id) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_h playlist = NULL; @@ -858,16 +887,16 @@ int ContentManager::playlistRemove(std::string playlist_id, int member_id) { if (playlist != NULL && ret == MEDIA_CONTENT_ERROR_NONE) { ret = media_playlist_remove_media(playlist, member_id); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("The content can't remove to playlist"); + LoggerE("The content can't remove to playlist"); } ret = media_playlist_update_to_db(playlist); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("The content can't remove to playlist"); + LoggerE("The content can't remove to playlist"); } } else { - LoggerD("Playlist(id:%s) is not exist",playlist_id.c_str()); + LoggerE("Playlist(id:%s) is not exist",playlist_id.c_str()); } media_playlist_destroy(playlist); @@ -877,6 +906,7 @@ int ContentManager::playlistRemove(std::string playlist_id, int member_id) { void ContentManager::playlistAddbatch(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; std::string playlist_id = user_data->args.get("playlistId").get(); @@ -896,7 +926,7 @@ void ContentManager::playlistAddbatch(const std::shared_ptr& std::string id = content.get("id").to_str(); ret = media_playlist_add_media(playlist, id.c_str()); if (ret != MEDIA_CONTENT_ERROR_NONE) { - LoggerD("Adding Content(id:%s) is failed.", id.c_str()); + LoggerE("Adding Content(id:%s) is failed.", id.c_str()); } } @@ -911,6 +941,7 @@ void ContentManager::playlistAddbatch(const std::shared_ptr& void ContentManager::playlistGet(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_h playlist = NULL; media_content_order_e order = MEDIA_CONTENT_ORDER_ASC; @@ -919,6 +950,7 @@ void ContentManager::playlistGet(const std::shared_ptr& user_ std::string playlist_id = user_data->args.get("playlistId").get(); ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist); if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) { + LoggerE("Failed: Getting playlist is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -928,6 +960,7 @@ void ContentManager::playlistGet(const std::shared_ptr& user_ filter_h filter = NULL; ret = media_filter_create(&filter); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: Creating a filter is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Creating a filter is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -955,6 +988,7 @@ void ContentManager::playlistGet(const std::shared_ptr& user_ user_data->result = picojson::value(arrayContent); } else { + LoggerE("Failed: Creating a filter is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Creating a filter is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -963,6 +997,7 @@ void ContentManager::playlistGet(const std::shared_ptr& user_ void ContentManager::playlistRemovebatch(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_h playlist = NULL; @@ -987,6 +1022,7 @@ void ContentManager::playlistRemovebatch(const std::shared_ptrisSuccess = false; user_data->result = err.ToJSON(); @@ -998,6 +1034,7 @@ void ContentManager::playlistRemovebatch(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_h playlist = NULL; @@ -1016,6 +1053,7 @@ void ContentManager::playlistSetOrder(const std::shared_ptr& ret = media_playlist_get_media_count_from_db(std::stoi(playlist_id), NULL, &cnt); if ( cnt != members.size() ) { + LoggerE("Failed: The items array does not contain all items from the playlist"); PlatformResult err(ErrorCode::INVALID_VALUES_ERR, "The items array does not contain all items from the playlist."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -1032,6 +1070,7 @@ void ContentManager::playlistSetOrder(const std::shared_ptr& ret = media_playlist_update_to_db(playlist); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: Removing the contents is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Removing the contents is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -1042,11 +1081,13 @@ void ContentManager::playlistSetOrder(const std::shared_ptr& } void ContentManager::playlistMove(const std::shared_ptr& user_data) { + LoggerD("Enter"); int ret = MEDIA_CONTENT_ERROR_NONE; media_playlist_h playlist = NULL; std::string playlist_id = user_data->args.get("playlistId").get(); ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist); if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) { + LoggerE("Failed: Getting playlist is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -1057,6 +1098,7 @@ void ContentManager::playlistMove(const std::shared_ptr& user double delta = user_data->args.get("delta").get(); ret = media_playlist_get_play_order(playlist, static_cast(member_id), &old_order); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: The content can't find form playlist"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "The content can't find form playlist."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -1065,6 +1107,7 @@ void ContentManager::playlistMove(const std::shared_ptr& user int new_order = static_cast(old_order) + static_cast(delta); ret = media_playlist_set_play_order(playlist, static_cast(member_id), new_order); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: The content can't update play_order"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "The content can't update play_order."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -1072,6 +1115,7 @@ void ContentManager::playlistMove(const std::shared_ptr& user } ret = media_playlist_update_to_db(playlist); if (ret != MEDIA_CONTENT_ERROR_NONE) { + LoggerE("Failed: Updateing play_order is failed"); PlatformResult err(ErrorCode::UNKNOWN_ERR, "Updateing play_order is failed."); user_data->isSuccess = false; user_data->result = err.ToJSON(); @@ -1082,7 +1126,7 @@ void ContentManager::playlistMove(const std::shared_ptr& user } int ContentManager::getLyrics(const picojson::value& args, picojson::object& result) { - LOGGER(DEBUG) << "entered"; + LoggerD("Enter"); int ret = METADATA_EXTRACTOR_ERROR_NONE; const std::string& contentURI = args.get("contentURI").to_str(); -- 2.34.1