minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 01:38:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

.btr and .sclr added, cleanup

Browse Source
This commit is contained in:
Kwoth
2024-11-20 17:14:48 +00:00
parent 3178074828
commit 796086538a
119 changed files with 9154 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/NadekoBot/Modules/Music/_common/Impl/MusicPlayer.cs
View File

@@ -260,7 +260,6 @@ public sealed class MusicPlayer : IMusicPlayer
IsStopped = true;
Log.Error("Please install ffmpeg and make sure it's added to your "
+ "PATH environment variable before trying again");
}
catch (OperationCanceledException)
{
@@ -313,7 +312,7 @@ public sealed class MusicPlayer : IMusicPlayer
{
if (track.TrackInfo is SimpleTrackInfo sti)
return sti.StreamUrl;
return await _ytResolverFactory.GetYoutubeResolver().GetStreamUrl(track.TrackInfo.Id);
}
@@ -420,20 +419,20 @@ public sealed class MusicPlayer : IMusicPlayer
break;
await chunk.Select(async data =>
{
var (query, platform) = data;
try
{
await TryEnqueueTrackAsync(query, queuer, false, platform);
errorCount = 0;
}
catch (Exception ex)
{
Log.Warning(ex, "Error resolving {MusicPlatform} Track {TrackQuery}", platform, query);
++errorCount;
}
})
.WhenAll();
{
var (query, platform) = data;
try
{
await TryEnqueueTrackAsync(query, queuer, false, platform);
errorCount = 0;
}
catch (Exception ex)
{
Log.Warning(ex, "Error resolving {MusicPlatform} Track {TrackQuery}", platform, query);
++errorCount;
}
})
.WhenAll();
await Task.Delay(1000);
@@ -542,4 +541,15 @@ public sealed class MusicPlayer : IMusicPlayer
{
_queue.ReorderFairly();
}
public Task<IQueuedTrackInfo?> RemoveLastQueuedTrack()
{
var last = _queue.GetLastQueuedIndex();
if (last is null)
return Task.FromResult<IQueuedTrackInfo?>(null);
return TryRemoveTrackAt(last.Value, out var trackInfo)
? Task.FromResult(trackInfo)
: Task.FromResult<IQueuedTrackInfo?>(null);
}
}