From: Akshat Airan/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics Date: Tue, 12 Mar 2024 10:55:48 +0000 (+0530) Subject: Updated Select Query for fetching Album and Artist X-Git-Tag: accepted/tizen/unified/20240715.155407~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dab682c581894204cb233a0c0ce0fe6d0d7758c4;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git Updated Select Query for fetching Album and Artist list. Change-Id: Ia175f6d79b0e3db144a768ffaaa925c5c18c5833 Signed-off-by: Akshat Airan/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics --- diff --git a/music-player/MediaContent/AlbumContents.cs b/music-player/MediaContent/AlbumContents.cs index 28be47d..d79cab7 100755 --- a/music-player/MediaContent/AlbumContents.cs +++ b/music-player/MediaContent/AlbumContents.cs @@ -10,13 +10,13 @@ namespace MusicPlayer.Media { List albumList = new List(); - SelectArguments albumSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); + SelectArguments albumSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = albumInfo.Select(albumSelectArguments); while (dataReader.Read()) { Album album = dataReader.Current; - SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); + SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); // TODO use countmember instead of select memeber. MediaDataReader albumDataReader = albumInfo.SelectMember(album.Id, audioSelectArguments); if (albumDataReader.Read()) @@ -53,7 +53,7 @@ namespace MusicPlayer.Media public static string GetAlbumArtPath(int albumId) { string path = ""; - SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); + SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = albumInfo.SelectMember(albumId, audioSelectArguments); while (dataReader.Read()) { @@ -70,14 +70,14 @@ namespace MusicPlayer.Media public static List FindMatchingAlbums(string searchText) { List albumList = new List(); - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Name + " LIKE "+ "'%" + searchText + "%' COLLATE NOCASE"; + string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Name + " LIKE "+ "'%" + searchText + "%' COLLATE NOCASE"; SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = albumInfo.Select(albumSelectArguments); while (dataReader.Read()) { Album info = dataReader.Current; - SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); + SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); if (albumDataReader.Read()) { diff --git a/music-player/MediaContent/ArtistContents.cs b/music-player/MediaContent/ArtistContents.cs index 89b7782..601fd47 100755 --- a/music-player/MediaContent/ArtistContents.cs +++ b/music-player/MediaContent/ArtistContents.cs @@ -27,14 +27,14 @@ namespace MusicPlayer.Media public static List GetAlbumListForArtist(string artistName) { List albumList = new List(); - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName + "\""; + string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName + "\""; SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = albumInfo.Select(albumSelectArguments); while (dataReader.Read()) { Album info = dataReader.Current; - SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); + SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); if (albumDataReader.Read()) { @@ -50,14 +50,14 @@ namespace MusicPlayer.Media public static List GetTrackListForArtist(string artistName) { List mediaList = new List(); - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName + "\""; + string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName + "\""; SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = albumInfo.Select(albumSelectArguments); while (dataReader.Read()) { Album info = dataReader.Current; - SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); + SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); while (albumDataReader.Read()) @@ -74,7 +74,7 @@ namespace MusicPlayer.Media public static string GetAlbumArtPathForArtist(string artistName) { - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName + "\""; + string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName + "\""; SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = albumInfo.Select(albumSelectArguments); string albumArtPath = ""; @@ -94,7 +94,7 @@ namespace MusicPlayer.Media public static int GetAlbumCountForArtist(string artistName) { - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName+"\""; + string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName+"\""; int count = 0; SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC); @@ -103,7 +103,7 @@ namespace MusicPlayer.Media while (dataReader.Read()) { Album info = dataReader.Current; - SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); + SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments); if (albumDataReader.Read()) { @@ -117,7 +117,7 @@ namespace MusicPlayer.Media public static int GetMediaCountForArtist(string artistName) { - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + MediaInfoColumns.Artist + "=\"" + artistName+"\""; + string expression = MEDIA_TYPE_QUERY + " AND " + MediaInfoColumns.Artist + "=\"" + artistName+"\""; CountArguments audioCountArguments = CreateCountArgument(expression); int count = 0; try @@ -147,7 +147,7 @@ namespace MusicPlayer.Media public static List FindMatchingArtists(string searchText) { List artistList = new List(); - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + MediaInfoColumns.Artist + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE"; + string expression = MEDIA_TYPE_QUERY + " AND " + MediaInfoColumns.Artist + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE"; SelectArguments artistSelectArguments = CreateSelectArgument(expression, MediaInfoColumns.Artist + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = mediaInfo.SelectGroupBy(MediaInfoColumnKey.Artist, artistSelectArguments); diff --git a/music-player/MediaContent/MediaContents.cs b/music-player/MediaContent/MediaContents.cs index 8f0f363..d14d5c6 100755 --- a/music-player/MediaContent/MediaContents.cs +++ b/music-player/MediaContent/MediaContents.cs @@ -50,7 +50,6 @@ namespace MusicPlayer.Media private static MediaInfoCommand mediaInfo; private static AlbumCommand albumInfo; private static PlaylistCommand playlistInfo; - private const string MEDIA_STORAGE_TYPE_QUERY = " (( MEDIA_STORAGE_TYPE IS NOT 101 ) AND (MEDIA_TYPE = 3)) "; private const string MEDIA_SORT_ORDER_ASC = " COLLATE NOCASE ASC "; private static readonly string MEDIA_TYPE_QUERY = $"{MediaInfoColumns.MediaType}={(int)Media​Type.Music}"; diff --git a/music-player/MediaContent/TrackContents.cs b/music-player/MediaContent/TrackContents.cs index 355ba5c..8d57623 100755 --- a/music-player/MediaContent/TrackContents.cs +++ b/music-player/MediaContent/TrackContents.cs @@ -121,7 +121,7 @@ namespace MusicPlayer.Media public static List FindMatchingTracks(string searchText) { List mediaList = new List(); - string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + MediaInfoColumns.Title + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE"; + string expression = MEDIA_TYPE_QUERY + " AND " + MediaInfoColumns.Title + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE"; SelectArguments argument = CreateSelectArgument(expression, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC); MediaDataReader dataReader = mediaInfo.SelectMedia(argument); diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk index 6e34808..b7047f6 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ