Compare commits
2 Commits
0381ef74ab
...
abf1906173
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
abf1906173 | ||
|
|
6ae49faf15 |
@@ -74,7 +74,7 @@ public class AudioController : ControllerBase
|
||||
|
||||
[HttpGet("track-info/{trackId}")]
|
||||
[AllowAnonymous]
|
||||
public async Task<ActionResult<ApiResponse<TrackInfoDto>>> GetTrackInfo(string trackId, [FromQuery] string? access_token = null, [FromQuery] string? shared_id = null)
|
||||
public async Task<ActionResult<ApiResponse<YandexTrack>>> GetTrackInfo(string trackId, [FromQuery] string? access_token = null, [FromQuery] string? shared_id = null)
|
||||
{
|
||||
var user = await GetUserFromToken(access_token);
|
||||
if (user == null) user = await GetUserFromSharedPlaylistId(shared_id);
|
||||
@@ -83,10 +83,12 @@ public class AudioController : ControllerBase
|
||||
var track = await _yandexService.GetYTrackAsync(user, trackId);
|
||||
if (track == null) return NotFound();
|
||||
|
||||
return Ok(ApiResponse<TrackInfoDto>.Ok(new TrackInfoDto
|
||||
return Ok(ApiResponse<YandexTrack>.Ok(new YandexTrack
|
||||
{
|
||||
Title = track.Title,
|
||||
CoverUri = track.CoverUri,
|
||||
Artists = track.Artists.Select(t => t.Name).ToList(),
|
||||
DurationMs = track.DurationMs,
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ public class SharedPlaylistController : ControllerBase
|
||||
Description = playlist.Description ?? "",
|
||||
Tracks = playlist.Tracks?.Select(t => new YandexTrack
|
||||
{
|
||||
Id = t.Track?.Id ?? "",
|
||||
TrackId = t.Track?.Id ?? "",
|
||||
Title = t.Track?.Title ?? "",
|
||||
Artists = t.Track?.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
|
||||
DurationMs = (int)(t.Track?.DurationMs ?? 0),
|
||||
|
||||
@@ -26,13 +26,13 @@ public class YandexSearchController : ControllerBase
|
||||
}
|
||||
|
||||
[HttpGet("tracks")]
|
||||
public async Task<ActionResult<ApiResponse<List<YandexTrackSearchResult>>>> SearchTracks(
|
||||
public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchTracks(
|
||||
[FromQuery] string query,
|
||||
[FromQuery] int limit = 20,
|
||||
[FromQuery] string? shared_id = null)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(query))
|
||||
return BadRequest(ApiResponse<List<YandexTrackSearchResult>>.Fail(new ErrorResponse
|
||||
return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
|
||||
{
|
||||
StatusCode = 400,
|
||||
Message = "Поисковый запрос не может быть пустым."
|
||||
@@ -62,13 +62,13 @@ public class YandexSearchController : ControllerBase
|
||||
|
||||
var decryptedToken = _yandexService.DecryptToken(user.YandexAccessToken);
|
||||
if (string.IsNullOrEmpty(decryptedToken))
|
||||
return BadRequest(ApiResponse<List<YandexTrackSearchResult>>.Fail(new ErrorResponse
|
||||
return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
|
||||
{
|
||||
StatusCode = 400,
|
||||
Message = "Токен Яндекс.Музыки не установлен или недействителен."
|
||||
}));
|
||||
|
||||
var results = await _yandexService.SearchTracksAsync(user, query, limit);
|
||||
return Ok(ApiResponse<List<YandexTrackSearchResult>>.Ok(results));
|
||||
return Ok(ApiResponse<List<YandexTrack>>.Ok(results));
|
||||
}
|
||||
}
|
||||
@@ -10,24 +10,24 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
|
||||
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="10.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.6">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.6" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
|
||||
<PackageReference Include="YandexMusic" Version="0.0.6" />
|
||||
<PackageReference Include="YandexMusic" Version="0.0.7" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -55,12 +55,16 @@ public class YandexMusicService
|
||||
{
|
||||
var client = await CreateClientAsync(user);
|
||||
if (client == null) return null;
|
||||
// Получаем треки по ID
|
||||
var tracks = await client.GetTracksAsync(trackIds);
|
||||
if (tracks == null || !tracks.Any()) return null;
|
||||
|
||||
var playlist = await client.GetPlaylistAsync(ownerUid, kind);
|
||||
if (playlist == null) return null;
|
||||
return await playlist.InsertTracksAsync(tracks.ToArray());
|
||||
|
||||
var tracks = await client.GetTracksAsync(trackIds);
|
||||
if (tracks == null || !tracks.Any()) return null;
|
||||
|
||||
var insertedTracks = tracks.Where(t => !playlist.Tracks.Any(p => p.Track.Id == t.Id)).ToArray();
|
||||
|
||||
return await playlist.InsertTracksAsync(insertedTracks);
|
||||
}
|
||||
|
||||
public async Task<YPlaylist?> RemoveTracksAsync(ApplicationUser user, string ownerUid, string kind, IEnumerable<string> trackIds)
|
||||
@@ -103,15 +107,15 @@ public class YandexMusicService
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<List<YandexTrackSearchResult>> SearchTracksAsync(ApplicationUser user, string query, int limit = 20)
|
||||
public async Task<List<YandexTrack>> SearchTracksAsync(ApplicationUser user, string query, int limit = 20)
|
||||
{
|
||||
var client = await CreateClientAsync(user);
|
||||
if (client == null) return new List<YandexTrackSearchResult>();
|
||||
if (client == null) return new List<YandexTrack>();
|
||||
|
||||
var searchResult = await client.SearchAsync(query, YandexMusic.API.Models.Common.YSearchType.Track, page: 0, pageSize: limit);
|
||||
if (searchResult?.Tracks?.Results == null) return new List<YandexTrackSearchResult>();
|
||||
if (searchResult?.Tracks?.Results == null) return new List<YandexTrack>();
|
||||
|
||||
return searchResult.Tracks.Results.Select(t => new YandexTrackSearchResult
|
||||
return searchResult.Tracks.Results.Select(t => new YandexTrack
|
||||
{
|
||||
TrackId = t.Id,
|
||||
Title = t.Title,
|
||||
|
||||
@@ -66,6 +66,7 @@
|
||||
}
|
||||
_shareUrl = ShareUrl;
|
||||
_popoverOpen = true;
|
||||
await CopyLink();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
|
||||
@code {
|
||||
[Parameter] public string CoverUrl { get; set; } = string.Empty;
|
||||
[Parameter] public string TrackTitle { get; set; } = string.Empty;
|
||||
[Parameter] public string TrackId { get; set; } = string.Empty;
|
||||
[Parameter] public int Height { get; set; } = 50;
|
||||
[Parameter] public int Width { get; set; } = 50;
|
||||
[Parameter] public string SharedPlaylistId { get; set; } = string.Empty;
|
||||
[Parameter] public string PlaylistShareToken { get; set; } = string.Empty;
|
||||
|
||||
private bool IsCurrentTrackPlaying => AudioPlayerService.IsPlaying && AudioPlayerService.CurrentTrackId == TrackId;
|
||||
|
||||
@@ -46,7 +47,7 @@
|
||||
|
||||
private async Task OnPlayClick()
|
||||
{
|
||||
var sharedPlaylistId = string.IsNullOrWhiteSpace(SharedPlaylistId) ? null : SharedPlaylistId;
|
||||
var playlistShareToken = string.IsNullOrWhiteSpace(PlaylistShareToken) ? null : PlaylistShareToken;
|
||||
|
||||
if (IsCurrentTrackPlaying)
|
||||
{
|
||||
@@ -54,7 +55,11 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
await AudioPlayerService.LoadAndPlayAsync(TrackId, sharedPlaylistId: SharedPlaylistId);
|
||||
await AudioPlayerService.LoadAndPlayAsync(
|
||||
trackId: TrackId,
|
||||
playlistShareToken: playlistShareToken,
|
||||
title: TrackTitle,
|
||||
coverUrl: CoverUrl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
|
||||
private async Task OnLoadAndPlay(string trackId, string? accessToken, string? sharedPlaylistId)
|
||||
{
|
||||
if (!await CheckAuthAsync()) return;
|
||||
//if (!await CheckAuthAsync()) return;
|
||||
|
||||
var tokens = await TokenStorage.GetTokensAsync();
|
||||
_currentAccessToken = accessToken ?? tokens.token;
|
||||
|
||||
@@ -4,14 +4,12 @@
|
||||
@inject ISnackbar Snackbar
|
||||
|
||||
<MudPaper Class="pa-4" Elevation="0" Style="background-color: rgba(0,0,0,0.05); border-radius: 8px;">
|
||||
<MudText Typo="Typo.h6" GutterBottom>Поиск трека</MudText>
|
||||
|
||||
<div style="display: flex; gap: 8px; margin-bottom: 16px;">
|
||||
<MudTextField @bind-Value="_searchQuery"
|
||||
Label="Название трека или исполнитель"
|
||||
Variant="Variant.Outlined"
|
||||
FullWidth="true"
|
||||
OnKeyDown="@(async (e) => { if (e.Key == "Enter") await SearchTracks(); })"
|
||||
OnKeyUp="@(async (e) => { if (e.Key == "Enter") await SearchTracks(); })"
|
||||
Placeholder="Например: Bohemian Rhapsody" />
|
||||
<MudButton Variant="Variant.Filled"
|
||||
Color="Color.Primary"
|
||||
@@ -37,6 +35,8 @@
|
||||
<div style="width: 40px; height: 40px; flex-shrink: 0;">
|
||||
<TrackCoverWithPlay CoverUrl="@track.CoverUri"
|
||||
TrackId="@track.TrackId"
|
||||
TrackTitle="@track.Title"
|
||||
PlaylistShareToken="@ShareToken"
|
||||
Width="40" Height="40"/>
|
||||
</div>
|
||||
<div style="flex: 1; min-width: 0;">
|
||||
@@ -44,7 +44,7 @@
|
||||
<MudText Typo="Typo.body2" Color="Color.Secondary">@string.Join(", ", track.Artists)</MudText>
|
||||
</div>
|
||||
<div style="flex-shrink: 0;">
|
||||
<MudText Typo="Typo.body2">@FormatDuration(track.DurationMs)</MudText>
|
||||
<MudText Typo="Typo.body2">@track.DurationMs.FormatDuration()</MudText>
|
||||
</div>
|
||||
<div style="flex-shrink: 0;">
|
||||
<MudIconButton Icon="@Icons.Material.Filled.AddCircle"
|
||||
@@ -57,7 +57,7 @@
|
||||
}
|
||||
</div>
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(_searchQuery) && !_isSearching)
|
||||
else if (!_isFirstSearch)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info">Ничего не найдено. Попробуйте изменить запрос.</MudAlert>
|
||||
}
|
||||
@@ -67,15 +67,19 @@
|
||||
[Parameter] public EventCallback<string> OnAddTrack { get; set; }
|
||||
[Parameter] public string ShareToken { get; set; } = string.Empty;
|
||||
|
||||
private string _searchQuery = "";
|
||||
private List<YandexTrackSearchResult> _searchResults = new();
|
||||
private List<YandexTrack> _searchResults = new();
|
||||
private bool _isSearching;
|
||||
private bool _isFirstSearch = true;
|
||||
private HashSet<string> _addingTrackIds = new();
|
||||
private string _searchQuery = string.Empty;
|
||||
|
||||
private async Task SearchTracks()
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(_searchQuery)) return;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(_searchQuery))
|
||||
return;
|
||||
|
||||
_isFirstSearch = false;
|
||||
_isSearching = true;
|
||||
try
|
||||
{
|
||||
@@ -83,7 +87,7 @@
|
||||
if (!string.IsNullOrEmpty(ShareToken))
|
||||
url += $"&shared_id={Uri.EscapeDataString(ShareToken)}";
|
||||
|
||||
var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexTrackSearchResult>>>(url);
|
||||
var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexTrack>>>(url);
|
||||
if (response?.Success == true)
|
||||
_searchResults = response.Data ?? new();
|
||||
else
|
||||
@@ -100,7 +104,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
private async Task AddTrack(YandexTrackSearchResult track)
|
||||
private async Task AddTrack(YandexTrack track)
|
||||
{
|
||||
if (_addingTrackIds.Contains(track.TrackId)) return;
|
||||
_addingTrackIds.Add(track.TrackId);
|
||||
@@ -119,12 +123,4 @@
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private string FormatDuration(long ms)
|
||||
{
|
||||
var seconds = ms / 1000;
|
||||
var mins = seconds / 60;
|
||||
var secs = seconds % 60;
|
||||
return $"{mins}:{secs:D2}";
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,8 @@
|
||||
<MudItem xs="12" sm="10">
|
||||
<MudTextField @bind-Value="_trackLink" Label="Ссылка на трек Яндекс.Музыки"
|
||||
Variant="Variant.Outlined" FullWidth="true"
|
||||
Placeholder="https://music.yandex.ru/album/2488464/track/21696942" />
|
||||
Placeholder="https://music.yandex.ru/album/2488464/track/21696942"
|
||||
OnKeyUp="@(async (e) => { if (e.Key == "Enter") await AddTrackByLink(); })" />
|
||||
</MudItem>
|
||||
<MudItem xs="12" sm="2">
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="AddTrackByLink"
|
||||
@@ -25,9 +26,6 @@
|
||||
</MudButton>
|
||||
</MudItem>
|
||||
</MudGrid>
|
||||
<MudText Typo="Typo.body2" Class="mt-2" Color="Color.Secondary">
|
||||
Поддерживаются ссылки вида: https://music.yandex.ru/album/12345/track/67890
|
||||
</MudText>
|
||||
</MudTabPanel>
|
||||
<MudTabPanel Text="Поиск" Style="padding: 16px;">
|
||||
<AddTrackBySearch OnAddTrack="AddTrackById"
|
||||
|
||||
@@ -80,7 +80,14 @@
|
||||
|
||||
private async Task ToggleFavorite()
|
||||
{
|
||||
if (!_isAuthenticated || Playlist == null) return;
|
||||
if (Playlist == null) return;
|
||||
|
||||
if (!_isAuthenticated)
|
||||
{
|
||||
Snackbar.Add("Добавление в избранное только авторизованным пользователям", Severity.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
_favoriteLoading = true;
|
||||
try
|
||||
{
|
||||
|
||||
@@ -25,7 +25,9 @@
|
||||
@if (CanPlay)
|
||||
{
|
||||
<TrackCoverWithPlay CoverUrl="@context.CoverUri"
|
||||
TrackId="@context.Id"
|
||||
TrackId="@context.TrackId"
|
||||
TrackTitle="@context.Title"
|
||||
PlaylistShareToken="@ShareToken"
|
||||
Width="50" Height="50"/>
|
||||
}
|
||||
else
|
||||
@@ -35,13 +37,13 @@
|
||||
}
|
||||
</MudTd>
|
||||
<MudTd DataLabel="Название">
|
||||
<MudLink Href="@($"https://music.yandex.ru/track/{context.Id}")" Target="_blank" Underline="Underline.Hover">
|
||||
<MudLink Href="@($"https://music.yandex.ru/track/{context.TrackId}")" Target="_blank" Underline="Underline.Hover">
|
||||
@context.Title
|
||||
<MudIcon Icon="@Icons.Material.Filled.OpenInNew" Size="Size.Small" Class="ml-1" />
|
||||
</MudLink>
|
||||
</MudTd>
|
||||
<MudTd DataLabel="Исполнитель">@string.Join(", ", context.Artists)</MudTd>
|
||||
<MudTd DataLabel="Длительность">@FormatDuration(context.DurationMs)</MudTd>
|
||||
<MudTd DataLabel="Длительность">@context.DurationMs.FormatDuration()</MudTd>
|
||||
@if (CanRemove)
|
||||
{
|
||||
<MudTd DataLabel="">
|
||||
@@ -82,7 +84,7 @@
|
||||
{
|
||||
_tracks = response.Data.Tracks.Select((t, idx) => new TrackDisplay
|
||||
{
|
||||
Id = t.Id,
|
||||
TrackId = t.TrackId,
|
||||
Title = t.Title,
|
||||
Artists = t.Artists,
|
||||
DurationMs = t.DurationMs,
|
||||
@@ -117,7 +119,7 @@
|
||||
|
||||
try
|
||||
{
|
||||
var request = new RemoveTracksRequest { TrackIds = new List<string> { track.Id } };
|
||||
var request = new RemoveTracksRequest { TrackIds = new List<string> { track.TrackId } };
|
||||
var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
|
||||
if (response.IsSuccessStatusCode)
|
||||
{
|
||||
@@ -141,14 +143,6 @@
|
||||
await OnPlayTrack.InvokeAsync(trackId);
|
||||
}
|
||||
|
||||
private string FormatDuration(long ms)
|
||||
{
|
||||
var seconds = ms / 1000;
|
||||
var mins = seconds / 60;
|
||||
var secs = seconds % 60;
|
||||
return $"{mins}:{secs:D2}";
|
||||
}
|
||||
|
||||
private class TrackDisplay : YandexTrack
|
||||
{
|
||||
public int Index { get; set; }
|
||||
|
||||
15
PlaylistShared.Pwa/Extensions/LongExtensions.cs
Normal file
15
PlaylistShared.Pwa/Extensions/LongExtensions.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
namespace PlaylistShared.Pwa.Extensions;
|
||||
|
||||
public static class LongExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Преобразует миллисекунды в формат Минуты:Секунды
|
||||
/// </summary>
|
||||
public static string FormatDuration(this long ms)
|
||||
{
|
||||
var seconds = ms / 1000;
|
||||
var mins = seconds / 60;
|
||||
var secs = seconds % 60;
|
||||
return $"{mins}:{secs:D2}";
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,6 @@
|
||||
<MudLayout>
|
||||
<MudAppBar Elevation="1">
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@DrawerToggle" />
|
||||
<MudText Typo="Typo.h6" Class="ml-2">Playlist share</MudText>
|
||||
<MudSpacer />
|
||||
<LoginDisplay />
|
||||
<MudIconButton Icon="@(DarkLightModeButtonIcon)" Color="Color.Inherit" OnClick="@DarkModeToggle" Class="ml-2" />
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<!-- Локальная форма входа -->
|
||||
<MudTextField @bind-Value="_loginModel.Username" Label="Имя пользователя" Variant="Variant.Outlined" FullWidth="true" Class="mb-3" />
|
||||
<MudTextField @bind-Value="_loginModel.Password" Label="Пароль" Variant="Variant.Outlined" FullWidth="true" InputType="InputType.Password" @onkeypress="@(async (e) => { if (e.Key == "Enter") await LocalLogin(); })" />
|
||||
<MudTextField @bind-Value="_loginModel.Password" Label="Пароль" Variant="Variant.Outlined" FullWidth="true" InputType="InputType.Password" OnKeyUp="@(async (e) => { if (e.Key == "Enter") await LocalLogin(); })" />
|
||||
|
||||
<MudButton Variant="Variant.Outlined" Color="Color.Secondary" OnClick="LocalLogin" FullWidth="true" Class="mt-4">
|
||||
Войти (локально)
|
||||
@@ -48,6 +48,12 @@
|
||||
|
||||
private async Task LocalLogin()
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(_loginModel.Username) || string.IsNullOrWhiteSpace(_loginModel.Password))
|
||||
{
|
||||
Snackbar.Add("Пожалуйста, заполните все поля", Severity.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
var response = await Http.PostAsJsonAsync("/api/account/login", _loginModel);
|
||||
if (response.IsSuccessStatusCode)
|
||||
{
|
||||
|
||||
@@ -47,7 +47,7 @@ public class AudioPlayerService : IAudioPlayerService
|
||||
}
|
||||
|
||||
// Внешние команды (вызываются из компонентов)
|
||||
public async Task LoadAndPlayAsync(string trackId, string? accessToken = null, string? sharedPlaylistId = null, string? title = null, string? coverUrl = null)
|
||||
public async Task LoadAndPlayAsync(string trackId, string? accessToken = null, string? playlistShareToken = null, string? title = null, string? coverUrl = null)
|
||||
{
|
||||
// Если accessToken не передан, пытаемся получить его из хранилища
|
||||
if (string.IsNullOrWhiteSpace(accessToken))
|
||||
@@ -57,7 +57,7 @@ public class AudioPlayerService : IAudioPlayerService
|
||||
}
|
||||
|
||||
// Проверяем, есть ли чем авторизоваться
|
||||
if (string.IsNullOrWhiteSpace(accessToken) && string.IsNullOrWhiteSpace(sharedPlaylistId))
|
||||
if (string.IsNullOrWhiteSpace(accessToken) && string.IsNullOrWhiteSpace(playlistShareToken))
|
||||
{
|
||||
_snackbar.Add("Не удалось воспроизвести трек: отсутствует токен авторизации или идентификатор расшаренного плейлиста.", Severity.Error);
|
||||
return;
|
||||
@@ -68,7 +68,7 @@ public class AudioPlayerService : IAudioPlayerService
|
||||
{
|
||||
try
|
||||
{
|
||||
var trackInfo = await GetTrackInfo(trackId, accessToken, sharedPlaylistId);
|
||||
var trackInfo = await GetTrackInfo(trackId, accessToken, playlistShareToken);
|
||||
title = trackInfo?.Title;
|
||||
coverUrl = trackInfo?.CoverUri;
|
||||
}
|
||||
@@ -84,7 +84,7 @@ public class AudioPlayerService : IAudioPlayerService
|
||||
_currentTrackCoverUrl = coverUrl;
|
||||
_isPlaying = true;
|
||||
OnStateChanged?.Invoke();
|
||||
OnLoadAndPlayRequested?.Invoke(trackId, accessToken, sharedPlaylistId);
|
||||
OnLoadAndPlayRequested?.Invoke(trackId, accessToken, playlistShareToken);
|
||||
}
|
||||
|
||||
public async Task PlayAsync()
|
||||
@@ -176,7 +176,7 @@ public class AudioPlayerService : IAudioPlayerService
|
||||
else if (!string.IsNullOrEmpty(sharedPlaylistId))
|
||||
url += $"?shared_id={sharedPlaylistId}";
|
||||
|
||||
var response = await _http.GetFromJsonAsync<ApiResponse<TrackInfoDto>>(url);
|
||||
var response = await _http.GetFromJsonAsync<ApiResponse<YandexTrack>>(url);
|
||||
if (response?.Success == true)
|
||||
{
|
||||
return (response.Data.Title, response.Data.CoverUri);
|
||||
|
||||
@@ -39,7 +39,7 @@ public interface IAudioPlayerService
|
||||
/// <param name="sharedPlaylistId">ID расшаренного плейлиста (для неавторизованного доступа).</param>
|
||||
/// <param name="title">Название трека. (Если не передано, вызывает api для получения)</param>
|
||||
/// <param name="coverUrl">URL обложки трека. (Если не передано, вызывает api для получения)</param>
|
||||
Task LoadAndPlayAsync(string trackId, string? accessToken = null, string? sharedPlaylistId = null, string? title = null, string? coverUrl = null);
|
||||
Task LoadAndPlayAsync(string trackId, string? accessToken = null, string? playlistShareToken = null, string? title = null, string? coverUrl = null);
|
||||
|
||||
/// <summary>Воспроизвести (если трек загружен и на паузе).</summary>
|
||||
Task PlayAsync();
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace PlaylistShared.Shared.DTO;
|
||||
|
||||
public class TrackInfoDto
|
||||
{
|
||||
public string Title { get; set; }
|
||||
public string CoverUri { get; set; }
|
||||
}
|
||||
@@ -1,10 +1,22 @@
|
||||
namespace PlaylistShared.Shared.DTO;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace PlaylistShared.Shared.DTO;
|
||||
|
||||
/// <summary>Результат поиска трека в Яндекс.Музыке.</summary>
|
||||
public class YandexTrack
|
||||
{
|
||||
public string Id { get; set; } = "";
|
||||
public string Title { get; set; } = "";
|
||||
[JsonPropertyName("trackId")]
|
||||
public string TrackId { get; set; } = string.Empty;
|
||||
|
||||
[JsonPropertyName("title")]
|
||||
public string Title { get; set; } = string.Empty;
|
||||
|
||||
[JsonPropertyName("artists")]
|
||||
public List<string> Artists { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("coverUri")]
|
||||
public string CoverUri { get; set; } = string.Empty;
|
||||
|
||||
[JsonPropertyName("durationMs")]
|
||||
public long DurationMs { get; set; }
|
||||
public string CoverUri { get; set; } = "";
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace PlaylistShared.Shared.DTO;
|
||||
|
||||
/// <summary>Результат поиска трека в Яндекс.Музыке.</summary>
|
||||
public class YandexTrackSearchResult
|
||||
{
|
||||
[JsonPropertyName("trackId")]
|
||||
public string TrackId { get; set; } = string.Empty;
|
||||
|
||||
[JsonPropertyName("title")]
|
||||
public string Title { get; set; } = string.Empty;
|
||||
|
||||
[JsonPropertyName("artists")]
|
||||
public List<string> Artists { get; set; } = new();
|
||||
|
||||
[JsonPropertyName("coverUri")]
|
||||
public string CoverUri { get; set; } = string.Empty;
|
||||
|
||||
[JsonPropertyName("durationMs")]
|
||||
public long DurationMs { get; set; }
|
||||
}
|
||||
Reference in New Issue
Block a user