tueem/TomatenMusic-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change some structure again

Browse Source 
fixed Rewind not restarting song https://cloud.tomatentum.net/apps/deck/#/board/19/card/241

added song queue prepend position https://cloud.tomatentum.net/apps/deck/#/board/19/card/224
This commit is contained in:
Tim Müller 2022-03-28 20:46:48 +02:00
parent d432575da6
commit b23d1aa71c
19 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TomatenMusicCore/Commands/PlayCommandGroup.cs
View File

@ -13,6 +13,7 @@ using TomatenMusic.Music;
using TomatenMusic.Music.Entitites;
using TomatenMusic.Util;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Commands
{
@ -250,7 +251,7 @@ namespace TomatenMusic.Commands
_ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent(player.State == PlayerState.NotPlaying ? "Now Playing:" : "Added to Queue")
.AddEmbed(Common.AsEmbed(track, player.PlayerQueue.LoopType, player.State == PlayerState.NotPlaying ? 0 : player.PlayerQueue.Queue.Count + 1)));
await player.PlayAsync(response.Track);
await player.PlayItemAsync(response.Track);
}
}
catch (Exception ex)
@ -317,7 +318,7 @@ namespace TomatenMusic.Commands
_ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent(player.State == PlayerState.NotPlaying ? "Now Playing:" : "Added to Queue")
.AddEmbed(Common.AsEmbed(track, player.PlayerQueue.LoopType, player.State == PlayerState.NotPlaying ? 0 : player.PlayerQueue.Queue.Count + 1)));
await player.PlayAsync(response.Track);
await player.PlayItemAsync(response.Track);
sw.Stop();
_logger.LogDebug($"Command {ctx.CommandName} took {sw.ElapsedMilliseconds}ms to execute.");

1
TomatenMusicCore/Music/Entitites/FullTrackContext.cs
View File

@ -9,6 +9,7 @@ using Lavalink4NET.Player;
using Microsoft.Extensions.DependencyInjection;
using Lavalink4NET;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music.Entitites
{

1
TomatenMusicCore/Music/Entitites/ILavalinkPlaylist.cs
View File

@ -6,6 +6,7 @@ using TomatenMusic.Util;
using DSharpPlus.Entities;
using Lavalink4NET.Player;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music.Entitites
{

2
TomatenMusicCore/Music/IPlayableItem.cs → TomatenMusicCore/Music/Entitites/IPlayableItem.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using TomatenMusic.Music;
namespace TomatenMusicCore.Music
namespace TomatenMusicCore.Music.Entities
{
public interface IPlayableItem
{

3
TomatenMusicCore/Music/Entitites/SpotifyPlaylist.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music.Entitites
{
@ -43,6 +44,8 @@ namespace TomatenMusic.Music.Entitites
if (!player.PlayerQueue.Queue.Any())
player.PlayerQueue.CurrentPlaylist = this;
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);
TomatenMusicTrack track = reversedTracks.Dequeue();

9
TomatenMusicCore/Music/TomatenMusicTrack.cs → TomatenMusicCore/Music/Entitites/TomatenMusicTrack.cs
View File

@ -7,17 +7,18 @@ using System.Threading.Tasks;
using TomatenMusic.Music;
using TomatenMusic.Prompt.Implementation;
namespace TomatenMusicCore.Music
namespace TomatenMusicCore.Music.Entities
{
public class TomatenMusicTrack : LavalinkTrack, IPlayableItem
{
public override TimeSpan Position { get; }
public TomatenMusicTrack
(LavalinkTrack track)
: base(track.Identifier, track.Author, track.Duration, track.IsLiveStream, track.IsSeekable, track.Source, track.Title, track.TrackIdentifier, track.Provider)
{
Context = track.Context;
Position = track.Position;
}
public string Title => base.Title;
@ -38,10 +39,12 @@ namespace TomatenMusicCore.Music
public async Task PlayNow(GuildPlayer player, TimeSpan? startTime = null, TimeSpan? endTime = null, bool withoutQueuePrepend = false)
{
if (!withoutQueuePrepend)
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(player.PlayerQueue.LastTrack));
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
player.PlayerQueue.LastTrack = this;
await player.PlayAsync(this, startTime, endTime);
}
}
}

4
TomatenMusicCore/Music/TrackList.cs → TomatenMusicCore/Music/Entitites/TrackList.cs
View File

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using TomatenMusic.Music;
namespace TomatenMusicCore.Music
namespace TomatenMusicCore.Music.Entities
{
//
// Summary:
@ -550,6 +550,8 @@ namespace TomatenMusicCore.Music
{
Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(this);
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
TomatenMusicTrack track = reversedTracks.Dequeue();
player.PlayerQueue.LastTrack = track;
await player.PlayAsync(track, startTime, endTime);

4
TomatenMusicCore/Music/Entitites/YoutubePlaylist.cs
View File

@ -7,6 +7,7 @@ using Lavalink4NET.Player;
using Microsoft.Extensions.DependencyInjection;
using TomatenMusic.Services;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music.Entitites
{
@ -56,6 +57,9 @@ namespace TomatenMusic.Music.Entitites
if (!player.PlayerQueue.Queue.Any())
player.PlayerQueue.CurrentPlaylist = this;
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);
TomatenMusicTrack track = reversedTracks.Dequeue();

3
TomatenMusicCore/Music/GuildPlayer.cs
View File

@ -16,6 +16,7 @@ using Lavalink4NET.Rest;
using Microsoft.Extensions.DependencyInjection;
using Lavalink4NET.Decoding;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music
{
@ -87,7 +88,7 @@ namespace TomatenMusic.Music
{
EnsureNotDestroyed();
EnsureConnected();
if (Position.Position.Seconds < 4)
if (Position.Position.Seconds > 5)
{
await ReplayAsync();
return;

1
TomatenMusicCore/Music/MusicActionResponse.cs
View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Text;
using TomatenMusic.Music.Entitites;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music
{

1
TomatenMusicCore/Music/PlayerQueue.cs
View File

@ -10,6 +10,7 @@ using Microsoft.Extensions.Logging;
using Lavalink4NET.Player;
using Microsoft.Extensions.DependencyInjection;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music
{

1
TomatenMusicCore/Prompt/Buttons/AddToQueueButton.cs
View File

@ -10,6 +10,7 @@ using TomatenMusic.Music;
using TomatenMusic.Music.Entitites;
using Microsoft.Extensions.DependencyInjection;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Prompt.Buttons
{

1
TomatenMusicCore/Prompt/Implementation/PlaylistSongSelectorPrompt.cs
View File

@ -13,6 +13,7 @@ using TomatenMusic.Prompt;
using TomatenMusic.Prompt.Model;
using TomatenMusic.Util;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusicCore.Prompt.Implementation
{

1
TomatenMusicCore/Prompt/Implementation/SongActionPrompt.cs
View File

@ -9,6 +9,7 @@ using TomatenMusic.Prompt.Buttons;
using TomatenMusic.Prompt.Model;
using TomatenMusic.Util;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Prompt.Implementation
{

1
TomatenMusicCore/Prompt/Implementation/SongListActionPrompt.cs
View File

@ -12,6 +12,7 @@ using Microsoft.Extensions.Logging;
using TomatenMusic.Prompt.Buttons;
using Lavalink4NET.Player;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Prompt.Implementation
{

1
TomatenMusicCore/Prompt/Implementation/SongSelectorPrompt.cs
View File

@ -13,6 +13,7 @@ using TomatenMusic.Music;
using System.Linq;
using Lavalink4NET.Player;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Prompt.Implementation
{

1
TomatenMusicCore/Services/SpotifyService.cs
View File

@ -13,6 +13,7 @@ using Lavalink4NET;
using Lavalink4NET.Player;
using System.Runtime.Caching;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Services
{

1
TomatenMusicCore/Services/TrackProvider.cs
View File

@ -9,6 +9,7 @@ using System.Web;
using TomatenMusic.Music.Entitites;
using TomatenMusic.Services;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Music
{

1
TomatenMusicCore/Services/YoutubeService.cs
View File

@ -13,6 +13,7 @@ using Lavalink4NET.Player;
using Microsoft.Extensions.DependencyInjection;
using Lavalink4NET;
using TomatenMusicCore.Music;
using TomatenMusicCore.Music.Entities;
namespace TomatenMusic.Services
{