Merge pull request #374 from Fooxboy/68-last-fm

#68 last fm scrobbling

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lastfm"]
+	path = lastfm
+	url = https://github.com/tolbxela/lastfm.git

MusicX.sln

@@ -28,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFMediaToolkit", "FFMediaTo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PsCompiler", "PsCompiler\PsCompiler.csproj", "{449B9F89-C7C2-4C7E-9F2F-28CBB731E7F5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IF.Lastfm.Core", "lastfm\src\IF.Lastfm.Core\IF.Lastfm.Core.csproj", "{57464921-52F3-4172-83E9-0B7D75F9DDDF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -74,6 +76,10 @@ Global
 		{449B9F89-C7C2-4C7E-9F2F-28CBB731E7F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{449B9F89-C7C2-4C7E-9F2F-28CBB731E7F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{449B9F89-C7C2-4C7E-9F2F-28CBB731E7F5}.Release|x64.Build.0 = Release|Any CPU
+		{57464921-52F3-4172-83E9-0B7D75F9DDDF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57464921-52F3-4172-83E9-0B7D75F9DDDF}.Debug|x64.Build.0 = Debug|Any CPU
+		{57464921-52F3-4172-83E9-0B7D75F9DDDF}.Release|x64.ActiveCfg = Release|Any CPU
+		{57464921-52F3-4172-83E9-0B7D75F9DDDF}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MusicX/Models/ConfigModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using IF.Lastfm.Core.Objects;
 using MusicX.Services.Player;
 
 namespace MusicX.Models
@@ -58,5 +59,9 @@ public class ConfigModel
         public bool? SavePlayerState { get; set; }
 
         public PlayerState? LastPlayerState { get; set; }
+
+        public LastUserSession? LastFmSession { get; set; }
+
+        public bool? SendLastFmScrobbles { get; set; }
     }
 }

MusicX/MusicX.csproj

@@ -109,6 +109,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\FFMediaToolkit\FFMediaToolkit.csproj" />
+    <ProjectReference Include="..\lastfm\src\IF.Lastfm.Core\IF.Lastfm.Core.csproj" />
     <ProjectReference Include="..\MusicX.Core\MusicX.Core.csproj" />
   </ItemGroup>
 

MusicX/Services/Player/TrackStats/DiscordTrackStats.cs

@@ -18,7 +18,7 @@ public DiscordTrackStats(DiscordService discordService, ConfigService configServ
         _configService = configService;
     }
 
-    public Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason)
+    public Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason, TimeSpan? position = null)
     {
         if (_configService.Config.ShowRPC == true)
             SetTrack(newTrack);

MusicX/Services/Player/TrackStats/ITrackStatsListener.cs

@@ -7,6 +7,6 @@ namespace MusicX.Services.Player.TrackStats;
 
 public interface ITrackStatsListener
 {
-    Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason);
+    Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason, TimeSpan? position = null);
     Task TrackPlayStateChangedAsync(PlaylistTrack track, TimeSpan position, bool paused);
 }

MusicX/Services/Player/TrackStats/LastFmStats.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using IF.Lastfm.Core.Api;
+using IF.Lastfm.Core.Objects;
+using IF.Lastfm.Core.Scrobblers;
+using MusicX.Models.Enums;
+using MusicX.Shared.Player;
+
+namespace MusicX.Services.Player.TrackStats;
+
+public class LastFmStats : ITrackStatsListener
+{
+    private readonly IScrobbler _scrobbler;
+    private readonly ITrackApi _trackApi;
+    private readonly ConfigService _configService;
+
+    public LastFmStats(IScrobbler scrobbler, ITrackApi trackApi, ConfigService configService)
+    {
+        _scrobbler = scrobbler;
+        _trackApi = trackApi;
+        _configService = configService;
+    }
+
+    public async Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason, TimeSpan? position = null)
+    {
+        if (_configService.Config.LastFmSession is null || _configService.Config.SendLastFmScrobbles is not true)
+            return;
+
+        if (previousTrack is not null && previousTrack.Data.Duration > TimeSpan.FromSeconds(30) && 
+            position.HasValue && (position.Value > TimeSpan.FromMinutes(4) || position.Value > previousTrack.Data.Duration / 2))
+            await _scrobbler.ScrobbleAsync(new Scrobble(previousTrack.MainArtists.First().Name,
+                previousTrack.AlbumId?.Name, previousTrack.Title, DateTimeOffset.Now - position.Value)
+            {
+                Duration = previousTrack.Data.Duration
+            });
+
+        await _trackApi.UpdateNowPlayingAsync(new Scrobble(newTrack.MainArtists.First().Name, newTrack.AlbumId?.Name,
+            newTrack.Title, DateTimeOffset.Now)
+        {
+            Duration = newTrack.Data.Duration
+        });
+    }
+
+    public Task TrackPlayStateChangedAsync(PlaylistTrack track, TimeSpan position, bool paused)
+    {
+        return Task.CompletedTask;
+    }
+}

MusicX/Services/Player/TrackStats/ListenTogetherStats.cs

@@ -15,7 +15,7 @@ public ListenTogetherStats(ListenTogetherService listenTogetherService)
             this._listenTogetherService = listenTogetherService;
         }
 
-        public async Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason)
+        public async Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason, TimeSpan? position = null)
         {
             if (_listenTogetherService.PlayerMode != PlayerMode.Owner) return;
 

MusicX/Services/Player/TrackStats/VkTrackBroadcastStats.cs

@@ -27,7 +27,7 @@ public VkTrackBroadcastStats(VkService vkService, ConfigService configService, L
         _snackbarService = snackbarService;
     }
 
-    public Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason)
+    public Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason, TimeSpan? position = null)
     {
         try
         {

MusicX/Services/Player/TrackStats/VkTrackStats.cs

@@ -17,7 +17,7 @@ public VkTrackStats(VkService vkService)
         _vkService = vkService;
     }
 
-    public async Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason)
+    public async Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack newTrack, ChangeReason reason, TimeSpan? position = null)
     {
         if (newTrack.Data is not VkTrackData newTrackData)
             return;
@@ -55,7 +55,7 @@ public async Task TrackChangedAsync(PlaylistTrack? previousTrack, PlaylistTrack
                 PlaybackStartedAt = "0",
                 TrackCode = previousTrackData.TrackCode,
                 StreamingType = "online",
-                Duration = previousTrackData.Duration.TotalSeconds.ToString(),
+                Duration = (position ?? previousTrackData.Duration).TotalSeconds.ToString(),
                 Repeat = "all",
                 State = "app",
                 Source = newTrackData.ParentBlockId!,

MusicX/ViewModels/Modals/LastFmAuthModalViewModel.cs

@@ -0,0 +1,64 @@
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using AsyncAwaitBestPractices.MVVM;
+using IF.Lastfm.Core.Api;
+using IF.Lastfm.Core.Api.Helpers;
+using MusicX.Services;
+using Wpf.Ui;
+using Wpf.Ui.Controls;
+using Wpf.Ui.Extensions;
+using NavigationService = MusicX.Services.NavigationService;
+
+namespace MusicX.ViewModels.Modals;
+
+public class LastFmAuthModalViewModel : BaseViewModel
+{
+    private readonly ILastAuth _auth;
+    private readonly NavigationService _navigationService;
+    private readonly ISnackbarService _snackbarService;
+    private readonly ConfigService _configService;
+    private string? _token;
+
+    public ICommand ConfirmCommand { get; }
+
+    public LastFmAuthModalViewModel(ILastAuth auth, NavigationService navigationService, ISnackbarService snackbarService, ConfigService configService)
+    {
+        _auth = auth;
+        _navigationService = navigationService;
+        _snackbarService = snackbarService;
+        _configService = configService;
+
+        ConfirmCommand = new AsyncCommand(ConfirmAsync);
+    }
+
+    private async Task ConfirmAsync()
+    {
+        if (_token is null)
+            return;
+
+        var response = await _auth.GetSessionTokenAsync(_token);
+
+        if (!response.Success)
+        {
+            _snackbarService.Show("Ошибка авторизации", $"Сервис вернул: {response.Status}", ControlAppearance.Danger);
+            return;
+        }
+
+        _navigationService.CloseModal();
+
+        _configService.Config.LastFmSession = _auth.UserSession;
+        await _configService.SetConfig(_configService.Config);
+    }
+
+    public async Task OpenAuthPageAsync()
+    {
+        _token = ((LastResponse<string>)await _auth.GetAuthTokenAsync()).Content;
+
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = $"https://last.fm/api/auth/?api_key={_auth.ApiKey}&token={_token}",
+            UseShellExecute = true
+        });
+    }
+}

MusicX/Views/Modals/LastFmAuthModal.xaml

@@ -0,0 +1,35 @@
+<Page x:Class="MusicX.Views.Modals.LastFmAuthModal"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="clr-namespace:MusicX.Views.Modals"
+      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+      xmlns:modals="clr-namespace:MusicX.ViewModels.Modals"
+      mc:Ignorable="d"
+      Title="Last.Fm" Height="300" Width="200"
+      d:DataContext="{d:DesignInstance modals:LastFmAuthModalViewModel}"
+      Loaded="LastFmAuthModal_OnLoaded">
+    <Grid VerticalAlignment="Center">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <ui:Card>
+             <ui:SymbolIcon Symbol="Globe24"
+                            FontSize="48"/>
+             <ui:Card.Footer>
+                 <TextBlock TextWrapping="Wrap" TextAlignment="Center"
+                            FontWeight="SemiBold">Подтвердите вход в аккаунт в браузере</TextBlock>
+             </ui:Card.Footer>
+         </ui:Card>
+
+        <ui:Button Grid.Row="1" HorizontalAlignment="Center" Margin="0,15"
+                   Command="{Binding ConfirmCommand}">
+            <ui:Button.Icon>
+                <ui:SymbolIcon Symbol="Checkmark24" />
+            </ui:Button.Icon>
+            Готово
+        </ui:Button>
+    </Grid>
+</Page>

MusicX/Views/Modals/LastFmAuthModal.xaml.cs

@@ -0,0 +1,19 @@
+using System.Windows;
+using System.Windows.Controls;
+using MusicX.ViewModels.Modals;
+
+namespace MusicX.Views.Modals;
+
+public partial class LastFmAuthModal : Page
+{
+    public LastFmAuthModal()
+    {
+        InitializeComponent();
+    }
+
+    private async void LastFmAuthModal_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        if (DataContext is LastFmAuthModalViewModel viewModel)
+            await viewModel.OpenAuthPageAsync();
+    }
+}

MusicX/Views/SettingsView.xaml

@@ -104,6 +104,14 @@
                             Content="Показывать трек в статусе ВКонтакте"
                             FontSize="15"
                             Unchecked="BroacastVK_Unchecked" />
+                        <wpfui:ToggleSwitch
+                            x:Name="SendLastFm"
+                            Margin="0,5,0,0"
+                            Checked="SendLastFm_OnChanged"
+                            FontSize="15"
+                            Content="Отправлять треки в Last.Fm"
+                            Unchecked="SendLastFm_OnChanged">
+                        </wpfui:ToggleSwitch>
                     </StackPanel>
 
                     <Rectangle Margin="0,10,0,10" Fill="White" HorizontalAlignment="Stretch" Height="1" Opacity="0.2" VerticalAlignment="Center"/>

MusicX/Views/SettingsView.xaml.cs

@@ -14,6 +14,7 @@
 using MusicX.Models;
 using MusicX.Services;
 using MusicX.ViewModels;
+using MusicX.ViewModels.Modals;
 using MusicX.Views.Login;
 using MusicX.Views.Modals;
 using NLog;
@@ -72,6 +73,7 @@ private async void SettingsView_Loaded(object sender, RoutedEventArgs e)
                 MinimizeToTray.IsChecked = config.MinimizeToTray.GetValueOrDefault();
                 GetBetaUpdates.IsChecked = config.GetBetaUpdates.GetValueOrDefault();
                 SavePlayerState.IsChecked = config.SavePlayerState.GetValueOrDefault();
+                SendLastFm.IsChecked = config.SendLastFmScrobbles.GetValueOrDefault();
 
                 UserName.Text = config.UserName;
 
@@ -571,5 +573,16 @@ private async void SavePlayerState_OnCheckChanged(object sender, RoutedEventArgs
 
             await configService.SetConfig(config);
         }
+
+        private async void SendLastFm_OnChanged(object sender, RoutedEventArgs e)
+        {
+            config.SendLastFmScrobbles = SendLastFm.IsChecked;
+
+            await configService.SetConfig(config);
+
+            if (config.LastFmSession is null)
+                StaticService.Container.GetRequiredService<NavigationService>()
+                    .OpenModal<LastFmAuthModal>(StaticService.Container.GetRequiredService<LastFmAuthModalViewModel>());
+        }
     }
 }

MusicX/Views/StartingWindow.xaml.cs

@@ -5,6 +5,8 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
+using IF.Lastfm.Core.Api;
+using IF.Lastfm.Core.Scrobblers;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.Extensions.DependencyInjection;
 using MusicX.Core.Services;
@@ -87,6 +89,7 @@ await Task.Run(async () =>
                 collection.AddSingleton<ITrackStatsListener, VkTrackBroadcastStats>();
                 collection.AddSingleton<ITrackStatsListener, VkTrackStats>();
                 collection.AddSingleton<ITrackStatsListener, ListenTogetherStats>();
+                collection.AddSingleton<ITrackStatsListener, LastFmStats>();
 
                 collection.AddTransient<SectionViewModel>();
                 collection.AddTransient<PlaylistViewModel>();
@@ -102,6 +105,7 @@ await Task.Run(async () =>
                 collection.AddTransient<CaptchaModalViewModel>();
                 collection.AddTransient<AccountsWindowViewModel>();
                 collection.AddTransient<LoginVerificationMethodsModalViewModel>();
+                collection.AddTransient<LastFmAuthModalViewModel>();
 
                 collection.AddSingleton<NavigationService>();
                 collection.AddSingleton<ConfigService>();
@@ -113,6 +117,17 @@ await Task.Run(async () =>
                 collection.AddSingleton<ICustomSectionsService, CustomSectionsService>();
                 collection.AddSingleton<ISnackbarService, MusicXSnackbarService>();
                 collection.AddSingleton<UpdateService>();
+                collection.AddSingleton<ILastAuth>(s =>
+                {
+                    var auth = new LastAuth("ff3b1adf454799a760ad29a0b71bd6b3", "74ef981214417381716f72a46677a802");
+
+                    if (s.GetRequiredService<ConfigService>().Config.LastFmSession is { } session)
+                        auth.LoadSession(session);
+
+                    return auth;
+                });
+                collection.AddSingleton<IScrobbler, MemoryScrobbler>();
+                collection.AddSingleton<ITrackApi, TrackApi>();
 
                 var container = StaticService.Container = collection.BuildServiceProvider();