keb/unison
1
0
Fork 0
Code Releases 7 Activity

Cleaning

Browse Source
This commit is contained in:
Théo Marchal
2022-11-13 15:28:10 +01:00
parent 52b0a6fc85
commit 468ec8be07
3 changed files with 12 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Handlers/ShuffleHandler.cs
View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@ -35,31 +33,20 @@ namespace unison
return;
SongList.Clear();
int song = _mpd.GetStats().Songs;
Debug.WriteLine("before search command / song == " + song);
IEnumerable<IMpdFile> response = await _mpd.SafelySendCommandAsync(new SearchCommand(filter, 0, song + 1));
Debug.WriteLine("got response => " + response.Count());
foreach (IMpdFile file in response)
{
SongList.Add(file.Path);
}
}
public async Task AddToQueueRandom(int SongNumber, CancellationToken token)
{
Debug.WriteLine("Add To Queue Random");
if (token.IsCancellationRequested)
return;
int AddedSongs = 0;
Debug.WriteLine("song to add => " + SongNumber);
var commandList = new CommandList();
int songTotal = _mpd.GetStats().Songs;
@ -75,25 +62,18 @@ namespace unison
}
await _mpd.SafelySendCommandAsync(commandList);
Debug.WriteLine("Add To Queue Random - finished with " + AddedSongs + " songs");
}
public async Task AddToQueueFilter(int SongNumber, CancellationToken token)
{
Debug.WriteLine("Add To Queue Filter - start");
if (token.IsCancellationRequested)
return;
int AddedSongs = 0;
Debug.WriteLine("song to add => " + SongNumber);
// more (or equal) requested songs than available => add everything
if (SongNumber >= SongList.Count)
{
Trace.WriteLine("more requested songs than available => add everything");
var commandList = new CommandList();
foreach (string path in SongList)
{
@ -107,8 +87,6 @@ namespace unison
// we add unique indexes until we reach the requested amount
else
{
Trace.WriteLine("more available songs than requested");
HashSet<int> SongIndex = new();
while (SongIndex.Count < SongNumber)
{
@ -125,8 +103,6 @@ namespace unison
await _mpd.SafelySendCommandAsync(commandList);
}
Debug.WriteLine("Add To Queue Filter - finished");
}
}
}