1.2.1 release - Now Playing list is not sent in the same order it is displayed in MusicBee player

Author: dandepeched

plugin/AndroidRemote/Commands/Requests/RequestNowPlayingList.cs

@@ -24,7 +24,7 @@ public void Execute(IEvent eEvent)
             {
                 var offset = data.Get<int>("offset");
                 var limit = data.Get<int>("limit");
-                Plugin.Instance.RequestNowPlayingListPage(eEvent.ClientId, offset, limit);
+                Plugin.Instance.RequestNowPlayingListOrdered(eEvent.ClientId, offset, limit);
             }
         }
     }

plugin/Plugin.cs

@@ -688,6 +688,59 @@ public void RequestRepeatState(StateAction action)
                         _api.Player_GetRepeat()).ToJsonString()));
         }
 
+        public void RequestNowPlayingListOrdered(string clientId, int offset = 0, int limit = 4000)
+        {
+            limit = 100;
+            _api.NowPlayingList_QueryFiles(null);
+
+            var tracks = new List<NowPlaying>();
+            var position = 1;
+            var itemIndex = _api.NowPlayingList_GetCurrentIndex();
+            while (position <= limit)
+            {
+                var trackPath = _api.NowPlayingList_GetListFileUrl(itemIndex);
+
+                if (string.IsNullOrEmpty(trackPath))
+                    break;
+
+                var artist = _api.Library_GetFileTag(trackPath, MetaDataType.Artist);
+                var title = _api.Library_GetFileTag(trackPath, MetaDataType.TrackTitle);
+
+                if (string.IsNullOrEmpty(title))
+                {
+                    var index = trackPath.LastIndexOf('\\');
+                    title = trackPath.Substring(index + 1);
+                }
+
+                var track = new NowPlaying
+                {
+                    Artist = string.IsNullOrEmpty(artist) ? "Unknown Artist" : artist,
+                    Title = title,
+                    Position = itemIndex,
+                    Path = trackPath
+                };
+
+                tracks.Add(track);
+                itemIndex = _api.NowPlayingList_GetNextIndex(position);
+                position++;
+            }
+
+            var total = tracks.Count;
+            var message = new SocketMessage
+            {
+                Context = Constants.NowPlayingList,
+                Data = new Page<NowPlaying>
+                {
+                    Data = tracks,
+                    Offset = offset,
+                    Limit = limit,
+                    Total = total
+                }
+            };
+            var messageEvent = new MessageEvent(EventType.ReplyAvailable, message.ToJsonString(), clientId);
+            EventBus.FireEvent(messageEvent);
+        }
+
         public void RequestNowPlayingListPage(string clientId, int offset = 0, int limit = 4000)
         {
             _api.NowPlayingList_QueryFiles(null);
@@ -919,13 +972,7 @@ public void NowPlayingPlay(string index)
             if (int.TryParse(index, out trackIndex))
             {
                 _api.NowPlayingList_QueryFiles(null);
-                var trackToPlay = string.Empty;
-                var lTrackIndex = 0;
-                while (trackIndex != lTrackIndex)
-                {
-                    trackToPlay = _api.NowPlayingList_QueryGetNextFile();
-                    lTrackIndex++;
-                }
+                var trackToPlay = _api.NowPlayingList_GetListFileUrl(trackIndex);
                 if (!string.IsNullOrEmpty(trackToPlay))
                     result = _api.NowPlayingList_PlayNow(trackToPlay);
             }

plugin/Properties/AssemblyInfo.cs

@@ -36,4 +36,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.2.0")]
+[assembly: AssemblyVersion("1.2.1")]