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 <akshat.airan@samsung.com>

diff --git a/music-player/MediaContent/AlbumContents.cs b/music-player/MediaContent/AlbumContents.cs
index 28be47d08d9e030c9fdb844ac7f654ae5f4e21d2..d79cab70889eef04307bd825736b349842f7b16a 100755 (executable)
--- a/music-player/MediaContent/AlbumContents.cs
+++ b/music-player/MediaContent/AlbumContents.cs
@@ -10,13 +10,13 @@ namespace MusicPlayer.Media
         {\r
             List<Album> albumList = new List<Album>();\r
 \r
-            SelectArguments albumSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
+            SelectArguments albumSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<Album> dataReader = albumInfo.Select(albumSelectArguments);\r
 \r
             while (dataReader.Read())\r
             {\r
                 Album album = dataReader.Current;\r
-                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
+                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 // TODO use countmember instead of select memeber.\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(album.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
@@ -53,7 +53,7 @@ namespace MusicPlayer.Media
         public static string GetAlbumArtPath(int albumId)\r
         {\r
             string path = "";\r
-            SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
+            SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<MediaInfo> dataReader = albumInfo.SelectMember(albumId, audioSelectArguments);\r
             while (dataReader.Read())\r
             {\r
@@ -70,14 +70,14 @@ namespace MusicPlayer.Media
         public static List<Album> FindMatchingAlbums(string searchText)\r
         {\r
             List<Album> albumList = new List<Album>();\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Name + " LIKE "+ "'%" + searchText + "%' COLLATE NOCASE";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Name + " LIKE "+ "'%" + searchText + "%' COLLATE NOCASE";\r
             SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<Album> dataReader = albumInfo.Select(albumSelectArguments);\r
 \r
             while (dataReader.Read())\r
             {\r
                 Album info = dataReader.Current;\r
-                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
+                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
                 {\r

diff --git a/music-player/MediaContent/ArtistContents.cs b/music-player/MediaContent/ArtistContents.cs
index 89b77824c58c9e3cddc955d0fc6595bce3f9b978..601fd475cba6de0cff40e08f4311e7e82b44eb20 100755 (executable)
--- a/music-player/MediaContent/ArtistContents.cs
+++ b/music-player/MediaContent/ArtistContents.cs
@@ -27,14 +27,14 @@ namespace MusicPlayer.Media
         public static List<Album> GetAlbumListForArtist(string artistName)\r
         {\r
             List<Album> albumList = new List<Album>();\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName + "\"";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName + "\"";\r
             SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<Album> dataReader = albumInfo.Select(albumSelectArguments);\r
 \r
             while (dataReader.Read())\r
             {\r
                 Album info = dataReader.Current;\r
-                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
+                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
                 {\r
@@ -50,14 +50,14 @@ namespace MusicPlayer.Media
         public static List<AudioInfo> GetTrackListForArtist(string artistName)\r
         {\r
             List<AudioInfo> mediaList = new List<AudioInfo>();\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName + "\"";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName + "\"";\r
             SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<Album> dataReader = albumInfo.Select(albumSelectArguments);\r
 \r
             while (dataReader.Read())\r
             {\r
                 Album info = dataReader.Current;\r
-                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
+                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
 \r
                 while (albumDataReader.Read())\r
@@ -74,7 +74,7 @@ namespace MusicPlayer.Media
 \r
         public static string GetAlbumArtPathForArtist(string artistName)\r
         {\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName + "\"";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName + "\"";\r
             SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<Album> dataReader = albumInfo.Select(albumSelectArguments);\r
             string albumArtPath = "";\r
@@ -94,7 +94,7 @@ namespace MusicPlayer.Media
 \r
         public static int GetAlbumCountForArtist(string artistName)\r
         {\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + AlbumColumns.Artist + "=\"" + artistName+"\"";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + AlbumColumns.Artist + "=\"" + artistName+"\"";\r
             int count = 0;\r
 \r
             SelectArguments albumSelectArguments = CreateSelectArgument(expression, AlbumColumns.Name + MEDIA_SORT_ORDER_ASC);\r
@@ -103,7 +103,7 @@ namespace MusicPlayer.Media
             while (dataReader.Read())\r
             {\r
                 Album info = dataReader.Current;\r
-                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_STORAGE_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
+                SelectArguments audioSelectArguments = CreateSelectArgument(MEDIA_TYPE_QUERY, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
                 MediaDataReader<MediaInfo> albumDataReader = albumInfo.SelectMember(info.Id, audioSelectArguments);\r
                 if (albumDataReader.Read())\r
                 {\r
@@ -117,7 +117,7 @@ namespace MusicPlayer.Media
 \r
         public static int GetMediaCountForArtist(string artistName)\r
         {\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + MediaInfoColumns.Artist + "=\"" + artistName+"\"";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + MediaInfoColumns.Artist + "=\"" + artistName+"\"";\r
             CountArguments audioCountArguments = CreateCountArgument(expression);\r
             int count = 0;\r
             try\r
@@ -147,7 +147,7 @@ namespace MusicPlayer.Media
         public static List<string> FindMatchingArtists(string searchText)\r
         {\r
             List<string> artistList = new List<string>();\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + MediaInfoColumns.Artist + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + MediaInfoColumns.Artist + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE";\r
             SelectArguments artistSelectArguments = CreateSelectArgument(expression, MediaInfoColumns.Artist + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<string> dataReader = mediaInfo.SelectGroupBy(MediaInfoColumnKey.Artist, artistSelectArguments);\r
 \r

diff --git a/music-player/MediaContent/MediaContents.cs b/music-player/MediaContent/MediaContents.cs
index 8f0f363af01ee97511fd18509307b32b88f74c6d..d14d5c6fd76b34845d684df0bcccf083908afdad 100755 (executable)
--- a/music-player/MediaContent/MediaContents.cs
+++ b/music-player/MediaContent/MediaContents.cs
@@ -50,7 +50,6 @@ namespace MusicPlayer.Media
         private static MediaInfoCommand mediaInfo;\r
         private static AlbumCommand albumInfo;\r
         private static PlaylistCommand playlistInfo;\r
-        private const string MEDIA_STORAGE_TYPE_QUERY = " (( MEDIA_STORAGE_TYPE IS NOT 101 ) AND (MEDIA_TYPE = 3)) ";\r
         private const string MEDIA_SORT_ORDER_ASC = " COLLATE NOCASE ASC ";\r
         private static readonly string MEDIA_TYPE_QUERY = $"{MediaInfoColumns.MediaType}={(int)Media​Type.Music}";\r
 \r

diff --git a/music-player/MediaContent/TrackContents.cs b/music-player/MediaContent/TrackContents.cs
index 355ba5c91e1753bcc129fb5fdd682607d98a3c3c..8d576230537605ee86f8d19112e077c14731b49e 100755 (executable)
--- a/music-player/MediaContent/TrackContents.cs
+++ b/music-player/MediaContent/TrackContents.cs
@@ -121,7 +121,7 @@ namespace MusicPlayer.Media
         public static List<AudioInfo> FindMatchingTracks(string searchText)\r
         {\r
             List<AudioInfo> mediaList = new List<AudioInfo>();\r
-            string expression = MEDIA_STORAGE_TYPE_QUERY + "AND " + MediaInfoColumns.Title + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE";\r
+            string expression = MEDIA_TYPE_QUERY + " AND " + MediaInfoColumns.Title + " LIKE " + "'%" + searchText + "%' COLLATE NOCASE";\r
             SelectArguments argument = CreateSelectArgument(expression, MediaInfoColumns.Title + MEDIA_SORT_ORDER_ASC);\r
             MediaDataReader<MediaInfo> dataReader = mediaInfo.SelectMedia(argument);\r
 \r

diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk
index 6e34808da883a85ecd8fd8ed39acc8f42d294871..b7047f66207dfd5eb5866cd59eb61c9ee99912ef 100755 (executable)
Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ