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

- fix spotify playlist playback

Browse Source 
- fix spotify playlist embed failing due to too long description
- fix not removing current playlist after adding another
- exchanged Description and Tracks field in playlist embed
This commit is contained in:
Tim Müller
2022-03-20 15:06:38 +01:00
parent 2b9986a7fa
commit c9c5a4f892
6 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
TomatenMusicCore/Services/SpotifyService.cs
View File

@@ -70,7 +70,7 @@ namespace TomatenMusic.Services
if (track == null) throw new ArgumentException("This Spotify Track was not found on Youtube");
tracks.Add(await FullTrackContext.PopulateAsync(track, sTrack.Uri));
tracks.Add(await FullTrackContext.PopulateAsync(track, sTrack.Uri.Replace("spotify:track:", "")));
}
Uri uri;
Uri.TryCreate(url, UriKind.Absolute, out uri);
@@ -98,7 +98,7 @@ namespace TomatenMusic.Services
if (track == null) throw new ArgumentException("This Spotify Track was not found on Youtube");
tracks.Add(await FullTrackContext.PopulateAsync(track, fullTrack.Uri));
tracks.Add(await FullTrackContext.PopulateAsync(track, fullTrack.Uri.Replace("spotify:track:", "")));
}
}
@@ -115,23 +115,35 @@ namespace TomatenMusic.Services
public async Task<SpotifyPlaylist> PopulateSpotifyPlaylistAsync(SpotifyPlaylist playlist)
{
var list = await this.Playlists.Get(playlist.Identifier);
playlist.Description = list.Description;
playlist.AuthorUri = new Uri(list.Owner.Uri);
string desc = list.Description;
playlist.Description = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
if (playlist.Description.Length < 2)
playlist.Description = "None";
playlist.AuthorUri = new Uri($"https://open.spotify.com/user/{list.Owner.Id}");
playlist.AuthorName = list.Owner.DisplayName;
playlist.Followers = list.Followers.Total;
playlist.Url = new Uri(list.Uri);
playlist.AuthorThumbnail = new Uri(list.Owner.Images.First().Url);
playlist.Url = new Uri($"https://open.spotify.com/playlist/{playlist.Identifier}");
try
{
playlist.AuthorThumbnail = new Uri(list.Owner.Images.First().Url);
}
catch (Exception ex) { }
return playlist;
}
public async Task<SpotifyPlaylist> PopulateSpotifyAlbumAsync(SpotifyPlaylist playlist)
{
var list = await this.Albums.Get(playlist.Identifier);
playlist.Description = list.Label;
playlist.AuthorUri = new Uri(list.Artists.First().Uri);
string desc = list.Label;
playlist.Description = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
playlist.AuthorUri = new Uri($"https://open.spotify.com/user/{list.Artists.First().Uri}");
playlist.AuthorName = list.Artists.First().Name;
playlist.Followers = list.Popularity;
playlist.Url = new Uri(list.Uri);
playlist.Url = new Uri($"https://open.spotify.com/album/{playlist.Identifier}");
return playlist;
}
@@ -147,7 +159,7 @@ namespace TomatenMusic.Services
context.SpotifyAlbum = spotifyTrack.Album;
context.SpotifyArtists = spotifyTrack.Artists;
context.SpotifyPopularity = spotifyTrack.Popularity;
context.SpotifyUri = new Uri(spotifyTrack.Uri);
context.SpotifyUri = new Uri($"https://open.spotify.com/track/{context.SpotifyIdentifier}");
track.Context = context;
return track;

9
TomatenMusicCore/Services/YoutubeService.cs
View File

@@ -39,7 +39,9 @@ namespace TomatenMusic.Services
context.YoutubeAuthorSubs = (ulong) channel.Statistics.SubscriberCount;
context.YoutubeAuthorThumbnail = new Uri(channel.Snippet.Thumbnails.High.Url);
context.YoutubeAuthorUri = new Uri($"https://www.youtube.com/channel/{channel.Id}");
context.YoutubeDescription = video.Snippet.Description;
string desc = video.Snippet.Description;
context.YoutubeDescription = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
if (video.Statistics.LikeCount != null)
context.YoutubeLikes = (ulong) video.Statistics.LikeCount;
context.YoutubeTags = video.Snippet.Tags;
@@ -66,7 +68,10 @@ namespace TomatenMusic.Services
string desc = list.Snippet.Description;
playlist.Description = desc.Substring(0, Math.Min(desc.Length, 4092)) + (desc.Length > 4092 ? "..." : " ");
playlist.Description = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
if (playlist.Description == "")
playlist.Description = "None";
playlist.Thumbnail = new Uri(list.Snippet.Thumbnails.High.Url);
playlist.CreationTime = (DateTime)list.Snippet.PublishedAt;
playlist.YoutubeItem = list;