From 16b28db804915936b8a0c4bcf8cccaa3b7130e05 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 03:15:18 -0400
Subject: [PATCH 01/33] added artist field to Song class

---
 Models/Song.cs           | 11 +++++++++++
 Services/AudioService.cs |  1 +
 2 files changed, 12 insertions(+)

diff --git a/Models/Song.cs b/Models/Song.cs
index 830c335..7922c6c 100644
--- a/Models/Song.cs
+++ b/Models/Song.cs
@@ -35,6 +35,17 @@ public Album Album
             }
         }
 
+        private string _artistName;
+        public string ArtistName
+        {
+            get => _artistName;
+            set
+            {
+                _artistName = value;
+                OnPropertyChanged();
+            }
+        }
+
         private string _filePath;
         public string FilePath
         {
diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index 466572f..bd86c23 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -513,6 +513,7 @@ private Song ExtractSongData(TagLib.File tfile, string path, Album album)
             {
                 Title = tfile.Tag.Title,
                 Album = album,
+                ArtistName = tfile.Tag.FirstPerformer,
                 FilePath = path,
                 Genre = tfile.Tag.FirstGenre,
                 Duration = tfile.Properties.Duration,

From 53848c505d3a6bce029e8a7951be4d0b38429459 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 03:26:55 -0400
Subject: [PATCH 02/33] uses album artist, then song artist as fallback

---
 Services/AudioService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index bd86c23..2f14d33 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -462,8 +462,9 @@ public async Task<Song> AddSongFromFile(string path)
                 {
                     return null;
                 }
+                var artistName = !string.IsNullOrWhiteSpace(tfile.Tag.FirstAlbumArtist) ? tfile.Tag.FirstAlbumArtist.Trim() : tfile.Tag.FirstPerformer.Trim();
 
-                var artist = GetArtistOrCreate(tfile.Tag.FirstPerformer);
+                var artist = GetArtistOrCreate(artistName);
                 var album = GetAlbumOrCreate(artist, tfile.Tag.Album);
 
                 var song = ExtractSongData(tfile, path, album);

From a7641b0a71e126b65fa66a00a0b9e4e8235f4092 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 11:38:05 -0400
Subject: [PATCH 03/33] favorite button in now playing

---
 Pages/NowPlaying.xaml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/Pages/NowPlaying.xaml b/Pages/NowPlaying.xaml
index 98c6d03..ab20199 100644
--- a/Pages/NowPlaying.xaml
+++ b/Pages/NowPlaying.xaml
@@ -17,6 +17,8 @@
         <converters:ShuffleStateToBrushConverter x:Key="ShuffleStateToBrushConverter"/>
         <converters:RepeatStateToBrushConverter x:Key="RepeatStateToBrushConverter"/>
         <converters:RepeatStateToGlyphConverter x:Key="RepeatStateToGlyphConverter"/>
+        <converters:GetFavoritedGlyph x:Key="GetFavoritedGlyph"/>
+        <converters:BoolToAccentBrushConverter x:Key="BoolToAccentBrushConverter"/>
         
         <Style x:Key="PlaybackButtonStyle" TargetType="Button">
             <Setter Property="Width" Value="50"/>
@@ -38,15 +40,31 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Stretch" Spacing="12" MaxWidth="320">
+        <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Stretch" Spacing="12">
             <Frame CornerRadius="4">
                 <Image Source="{x:Bind DisplayedCoverArt, Mode=OneWay, TargetNullValue='/Assets/Placeholder.png'}" MaxWidth="320"/>
             </Frame>
-            <StackPanel Spacing="4">
-                <TextBlock Text="{x:Bind Audio.CurrentSongPlaying.Title, Mode=OneWay, TargetNullValue='Nothing is playing.'}" TextAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWholeWords" FontSize="20" FontWeight="SemiBold"/>
-                <TextBlock Text="{x:Bind Audio.CurrentSongPlaying.Album.Artist.Name, Mode=OneWay, TargetNullValue=''}" TextAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWholeWords" FontSize="16" FontWeight="Normal"/>
-            </StackPanel>
-            <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
+            <RelativePanel HorizontalAlignment="Center">
+                <StackPanel x:Name="SongInfo" Spacing="4" RelativePanel.AlignHorizontalCenterWithPanel="True" MaxWidth="320">
+                    <TextBlock Text="{x:Bind Audio.CurrentSongPlaying.Title, Mode=OneWay, TargetNullValue='Nothing is playing.'}" TextAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWholeWords" FontSize="20" FontWeight="SemiBold"/>
+                    <TextBlock Text="{x:Bind Audio.CurrentSongPlaying.ArtistName, Mode=OneWay, TargetNullValue=''}" TextAlignment="Center" HorizontalAlignment="Center" TextWrapping="WrapWholeWords" FontSize="16" FontWeight="Normal"/>
+                </StackPanel>
+                <Button
+                    Margin="16,0,0,0"
+                    RelativePanel.RightOf="SongInfo"
+                    RelativePanel.AlignVerticalCenterWith="SongInfo"
+                    Width="35"
+                    Height="35"
+                    Style="{StaticResource PlaybackButtonStyle}">
+                    <FontIcon 
+                        Glyph="{x:Bind Audio.CurrentSongPlaying.Favorited, Mode=OneWay, Converter={StaticResource GetFavoritedGlyph}}" 
+                        Foreground="{x:Bind Audio.CurrentSongPlaying.Favorited, Mode=OneWay, Converter={StaticResource BoolToAccentBrushConverter}}"
+                        VerticalAlignment="Center" 
+                        HorizontalAlignment="Center"
+                        FontSize="10"/>
+                </Button>
+            </RelativePanel>
+            <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" MaxWidth="320">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>

From 079783b27864f0247732525eab23f07fe4ea7929 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 12:10:26 -0400
Subject: [PATCH 04/33] favorite button functionality

---
 Musium.csproj            |  1 +
 Pages/NowPlaying.xaml    | 18 +++++++++++-------
 Pages/NowPlaying.xaml.cs |  6 ++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Musium.csproj b/Musium.csproj
index a5d96e9..fa755c7 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -48,6 +48,7 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
diff --git a/Pages/NowPlaying.xaml b/Pages/NowPlaying.xaml
index ab20199..8486094 100644
--- a/Pages/NowPlaying.xaml
+++ b/Pages/NowPlaying.xaml
@@ -19,7 +19,7 @@
         <converters:RepeatStateToGlyphConverter x:Key="RepeatStateToGlyphConverter"/>
         <converters:GetFavoritedGlyph x:Key="GetFavoritedGlyph"/>
         <converters:BoolToAccentBrushConverter x:Key="BoolToAccentBrushConverter"/>
-        
+
         <Style x:Key="PlaybackButtonStyle" TargetType="Button">
             <Setter Property="Width" Value="50"/>
             <Setter Property="Height" Value="50"/>
@@ -41,7 +41,7 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Stretch" Spacing="12">
-            <Frame CornerRadius="4">
+            <Frame CornerRadius="4" HorizontalAlignment="Center">
                 <Image Source="{x:Bind DisplayedCoverArt, Mode=OneWay, TargetNullValue='/Assets/Placeholder.png'}" MaxWidth="320"/>
             </Frame>
             <RelativePanel HorizontalAlignment="Center">
@@ -51,17 +51,21 @@
                 </StackPanel>
                 <Button
                     Margin="16,0,0,0"
+                    Padding="0"
+                    CornerRadius="20"
                     RelativePanel.RightOf="SongInfo"
                     RelativePanel.AlignVerticalCenterWith="SongInfo"
-                    Width="35"
-                    Height="35"
-                    Style="{StaticResource PlaybackButtonStyle}">
+                    Width="40"
+                    Height="40"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Click="FavoriteButton_Click">
                     <FontIcon 
                         Glyph="{x:Bind Audio.CurrentSongPlaying.Favorited, Mode=OneWay, Converter={StaticResource GetFavoritedGlyph}}" 
                         Foreground="{x:Bind Audio.CurrentSongPlaying.Favorited, Mode=OneWay, Converter={StaticResource BoolToAccentBrushConverter}}"
                         VerticalAlignment="Center" 
                         HorizontalAlignment="Center"
-                        FontSize="10"/>
+                        FontSize="20"/>
                 </Button>
             </RelativePanel>
             <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" MaxWidth="320">
@@ -87,7 +91,7 @@
                     Converter={StaticResource DurationConverter},
                     FallbackValue='0:00'}" FontSize="14" FontWeight="Light" TextAlignment="Left" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             </Grid>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="16">
+            <StackPanel Orientation="Horizontal" MaxWidth="320" HorizontalAlignment="Center" HorizontalSpacing="16" VerticalSpacing="16">
                 <Button Style="{StaticResource PlaybackButtonStyle}" Click="ShuffleButton_Click">
                     <SymbolIcon Symbol="Shuffle" Foreground="{x:Bind Audio.CurrentShuffleState, Mode=OneWay, Converter={StaticResource ShuffleStateToBrushConverter}}"/>
                 </Button>
diff --git a/Pages/NowPlaying.xaml.cs b/Pages/NowPlaying.xaml.cs
index ddaa08a..f020572 100644
--- a/Pages/NowPlaying.xaml.cs
+++ b/Pages/NowPlaying.xaml.cs
@@ -178,4 +178,10 @@ private void ProgressSlider_PointerReleased(object sender, PointerRoutedEventArg
         Audio.ScrubTo((int)Math.Ceiling(ProgressSlider.Value));
         Audio.Resume();
     }
+
+    private void FavoriteButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (Audio.CurrentSongPlaying == null) return;
+        Audio.CurrentSongPlaying.Favorited = !Audio.CurrentSongPlaying.Favorited;
+    }
 }

From 78bd7401a5ee6c33d3cee99bd0b1c61a3b9fe44b Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 12:11:05 -0400
Subject: [PATCH 05/33] forgot to undo some changes

---
 Pages/NowPlaying.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pages/NowPlaying.xaml b/Pages/NowPlaying.xaml
index 8486094..0a85a82 100644
--- a/Pages/NowPlaying.xaml
+++ b/Pages/NowPlaying.xaml
@@ -91,7 +91,7 @@
                     Converter={StaticResource DurationConverter},
                     FallbackValue='0:00'}" FontSize="14" FontWeight="Light" TextAlignment="Left" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             </Grid>
-            <StackPanel Orientation="Horizontal" MaxWidth="320" HorizontalAlignment="Center" HorizontalSpacing="16" VerticalSpacing="16">
+            <StackPanel Orientation="Horizontal" MaxWidth="320" HorizontalAlignment="Center" Spacing="16">
                 <Button Style="{StaticResource PlaybackButtonStyle}" Click="ShuffleButton_Click">
                     <SymbolIcon Symbol="Shuffle" Foreground="{x:Bind Audio.CurrentShuffleState, Mode=OneWay, Converter={StaticResource ShuffleStateToBrushConverter}}"/>
                 </Button>

From 5aea44463c1f75736c658ad749bfc50c1a2fe402 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 17:00:57 -0400
Subject: [PATCH 06/33] artist name correctly displayed on queue

---
 Controls/QueueListItemControl.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controls/QueueListItemControl.xaml b/Controls/QueueListItemControl.xaml
index 9a9dac5..909900d 100644
--- a/Controls/QueueListItemControl.xaml
+++ b/Controls/QueueListItemControl.xaml
@@ -29,7 +29,7 @@
             </Grid>
             <StackPanel>
                 <TextBlock Text="{x:Bind Song.Title, Mode=OneWay, TargetNullValue='No Song'}" FontWeight="Medium"/>
-                <TextBlock Text="{x:Bind Song.Album.Artist.Name, Mode=OneWay, TargetNullValue='No Artist'}" FontSize="12" FontWeight="Light"/>
+                <TextBlock Text="{x:Bind Song.ArtistName, Mode=OneWay, TargetNullValue='No Artist'}" FontSize="12" FontWeight="Light"/>
             </StackPanel>
         </StackPanel>
         <Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent" BorderThickness="0" Margin="0,0">

From 06b509ed5e561419829bb4ea9c206842a364790a Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 20:04:43 -0400
Subject: [PATCH 07/33] added lyrics in Song object

---
 Models/Song.cs           | 11 +++++++++++
 Services/AudioService.cs |  1 +
 2 files changed, 12 insertions(+)

diff --git a/Models/Song.cs b/Models/Song.cs
index 7922c6c..7ff345a 100644
--- a/Models/Song.cs
+++ b/Models/Song.cs
@@ -68,6 +68,17 @@ public string? Genre
             }
         }
 
+        private string? _lyrics;
+        public string? Lyrics
+        {
+            get => _lyrics;
+            set
+            {
+                _lyrics = value;
+                OnPropertyChanged();
+            }
+        }
+
         private int? _trackNumber;
         public int? TrackNumber
         {
diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index 2f14d33..c5fdf3c 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -517,6 +517,7 @@ private Song ExtractSongData(TagLib.File tfile, string path, Album album)
                 ArtistName = tfile.Tag.FirstPerformer,
                 FilePath = path,
                 Genre = tfile.Tag.FirstGenre,
+                Lyrics = tfile.Tag.Lyrics,
                 Duration = tfile.Properties.Duration,
                 TrackNumber = (int)tfile.Tag.Track,
                 Lossless = IsLossless(path)

From 8918edfb3bc1a001ee1494178f8a5a4392664e6b Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 22:09:22 -0400
Subject: [PATCH 08/33] selector bar for now playing

---
 Pages/NowPlaying.xaml    | 6 +++++-
 Pages/NowPlaying.xaml.cs | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Pages/NowPlaying.xaml b/Pages/NowPlaying.xaml
index 0a85a82..c0c2f4d 100644
--- a/Pages/NowPlaying.xaml
+++ b/Pages/NowPlaying.xaml
@@ -116,7 +116,11 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <TextBlock Text="Queue" FontSize="20" FontWeight="SemiBold" Grid.Row="0"/>
+            <SelectorBar x:Name="SecondPanelSelectorBar" SelectionChanged="SecondPanelSelectorBar_SelectionChanged">
+                <SelectorBarItem x:Name="SelectorBarItemQueue" Text="Queue" IsSelected="True" />
+                <SelectorBarItem x:Name="SelectorBarItemLyrics" Text="Lyrics" />
+            </SelectorBar>
+
             <Grid
                 CornerRadius="4" 
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" 
diff --git a/Pages/NowPlaying.xaml.cs b/Pages/NowPlaying.xaml.cs
index f020572..47883c0 100644
--- a/Pages/NowPlaying.xaml.cs
+++ b/Pages/NowPlaying.xaml.cs
@@ -184,4 +184,9 @@ private void FavoriteButton_Click(object sender, RoutedEventArgs e)
         if (Audio.CurrentSongPlaying == null) return;
         Audio.CurrentSongPlaying.Favorited = !Audio.CurrentSongPlaying.Favorited;
     }
+
+    private void SecondPanelSelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
+    {
+
+    }
 }

From b777cdb936499f1ccb0d5fb5719bbc0fb748ca1d Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 22:28:34 -0400
Subject: [PATCH 09/33] page switching for queue/lyrics

---
 Musium.csproj            |  4 ++++
 Pages/NowPlaying.xaml    | 25 +++++++------------------
 Pages/NowPlaying.xaml.cs | 30 +++++++++++++++++++++++++-----
 Pages/Queue.xaml         | 27 +++++++++++++++++++++++++++
 Pages/Queue.xaml.cs      | 31 +++++++++++++++++++++++++++++++
 5 files changed, 94 insertions(+), 23 deletions(-)
 create mode 100644 Pages/Queue.xaml
 create mode 100644 Pages/Queue.xaml.cs

diff --git a/Musium.csproj b/Musium.csproj
index fa755c7..98c5258 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -23,6 +23,7 @@
     <None Remove="Controls\TrackItemControl.xaml" />
     <None Remove="Pages\InnerAlbum.xaml" />
     <None Remove="Pages\NowPlaying.xaml" />
+    <None Remove="Pages\Queue.xaml" />
     <None Remove="Styles\GridContentStyles.xaml" />
   </ItemGroup>
 
@@ -63,6 +64,9 @@
     <None Update="Assets\Placeholder.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Pages\Queue.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Pages\Favorites.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Pages/NowPlaying.xaml b/Pages/NowPlaying.xaml
index c0c2f4d..830ec1c 100644
--- a/Pages/NowPlaying.xaml
+++ b/Pages/NowPlaying.xaml
@@ -116,30 +116,19 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <SelectorBar x:Name="SecondPanelSelectorBar" SelectionChanged="SecondPanelSelectorBar_SelectionChanged">
+            <SelectorBar x:Name="SecondPanelSelectorBar"
+                SelectionChanged="SecondPanelSelectorBar_SelectionChanged"
+                Grid.Row="0">
                 <SelectorBarItem x:Name="SelectorBarItemQueue" Text="Queue" IsSelected="True" />
                 <SelectorBarItem x:Name="SelectorBarItemLyrics" Text="Lyrics" />
             </SelectorBar>
-
-            <Grid
+            <Frame x:Name="ContentFrame" 
+                IsNavigationStackEnabled="False" 
+                Grid.Row="1"
                 CornerRadius="4" 
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" 
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                BorderThickness="1"
-                Grid.Row="1">
-                <ListView
-                    ItemsSource="{x:Bind Audio.Queue}"
-                    Padding="8"
-                    IsItemClickEnabled="True"
-                    CanReorderItems="True"
-                    AllowDrop="True">
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="models:Song">
-                            <controls:QueueListItemControl Song="{x:Bind}"/>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </Grid>
+                BorderThickness="1"/>
         </Grid>
     </Grid>
 </Page>
diff --git a/Pages/NowPlaying.xaml.cs b/Pages/NowPlaying.xaml.cs
index 47883c0..d58f8fa 100644
--- a/Pages/NowPlaying.xaml.cs
+++ b/Pages/NowPlaying.xaml.cs
@@ -1,14 +1,15 @@
-using Musium.Controls;
-using Musium.Models;
-using Musium.Services;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.UI.Xaml.Navigation;
+using Musium.Controls;
+using Musium.Models;
+using Musium.Services;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,6 +18,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
 using Windows.Devices.Geolocation;
 using Windows.Devices.Radios;
 using Windows.Foundation;
@@ -24,7 +26,6 @@
 using Windows.Media.Core;
 using Windows.Media.Playback;
 using Windows.Storage.Streams;
-using System.Threading.Tasks;
 
 namespace Musium.Pages;
 
@@ -184,9 +185,28 @@ private void FavoriteButton_Click(object sender, RoutedEventArgs e)
         if (Audio.CurrentSongPlaying == null) return;
         Audio.CurrentSongPlaying.Favorited = !Audio.CurrentSongPlaying.Favorited;
     }
-
+    private int previousSelectedIndex;
     private void SecondPanelSelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
     {
+        SelectorBarItem selectedItem = sender.SelectedItem;
+        int currentSelectedIndex = sender.Items.IndexOf(selectedItem);
+        System.Type pageType;
+
+        switch (currentSelectedIndex)
+        {
+            case 0:
+                pageType = typeof(Queue);
+                break;
+            default:
+                pageType = typeof(Queue);
+                break;
+        }
+
+        var slideNavigationTransitionEffect = currentSelectedIndex - previousSelectedIndex > 0 ? SlideNavigationTransitionEffect.FromRight : SlideNavigationTransitionEffect.FromLeft;
+
+        ContentFrame.Navigate(pageType, null, new SlideNavigationTransitionInfo() { Effect = slideNavigationTransitionEffect });
+
+        previousSelectedIndex = currentSelectedIndex;
 
     }
 }
diff --git a/Pages/Queue.xaml b/Pages/Queue.xaml
new file mode 100644
index 0000000..ced5a20
--- /dev/null
+++ b/Pages/Queue.xaml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="Musium.Pages.Queue"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Musium.Pages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:controls="using:Musium.Controls"
+    xmlns:models="using:Musium.Models"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ListView
+            ItemsSource="{x:Bind Audio.Queue}"
+            Padding="8"
+            IsItemClickEnabled="True"
+            CanReorderItems="True"
+            AllowDrop="True">
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="models:Song">
+                    <controls:QueueListItemControl Song="{x:Bind}"/>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</Page>
diff --git a/Pages/Queue.xaml.cs b/Pages/Queue.xaml.cs
new file mode 100644
index 0000000..fdde3a4
--- /dev/null
+++ b/Pages/Queue.xaml.cs
@@ -0,0 +1,31 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Musium.Services;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Musium.Pages
+{
+    
+    public sealed partial class Queue : Page
+    {
+        public readonly AudioService Audio = AudioService.Instance;
+        public Queue()
+        {
+            InitializeComponent();
+        }
+    }
+}

From c281e1782e3b2869e77135a48537188583eb08e7 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 23:17:59 -0400
Subject: [PATCH 10/33] lyrics implemented

---
 Musium.csproj            |  4 ++++
 Pages/Lyrics.xaml        | 21 +++++++++++++++++++++
 Pages/Lyrics.xaml.cs     | 33 +++++++++++++++++++++++++++++++++
 Pages/NowPlaying.xaml    | 12 ++++++++++--
 Pages/NowPlaying.xaml.cs |  3 +--
 5 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 Pages/Lyrics.xaml
 create mode 100644 Pages/Lyrics.xaml.cs

diff --git a/Musium.csproj b/Musium.csproj
index 98c5258..1302d38 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -22,6 +22,7 @@
     <None Remove="Controls\TitlebarControls.xaml" />
     <None Remove="Controls\TrackItemControl.xaml" />
     <None Remove="Pages\InnerAlbum.xaml" />
+    <None Remove="Pages\Lyrics.xaml" />
     <None Remove="Pages\NowPlaying.xaml" />
     <None Remove="Pages\Queue.xaml" />
     <None Remove="Styles\GridContentStyles.xaml" />
@@ -64,6 +65,9 @@
     <None Update="Assets\Placeholder.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Pages\Lyrics.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Pages\Queue.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
new file mode 100644
index 0000000..0d4563c
--- /dev/null
+++ b/Pages/Lyrics.xaml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="Musium.Pages.Lyrics"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Musium.Pages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollView HorizontalScrollMode="Disabled">
+        <TextBlock 
+            HorizontalAlignment="Center" 
+            VerticalAlignment="Top" 
+            Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, TargetNullValue='Lyrics are unavailble for this track.'}"
+            TextAlignment="Center"
+            TextWrapping="WrapWholeWords"
+            FontSize="18"
+            Margin="32"/>
+    </ScrollView>
+</Page>
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
new file mode 100644
index 0000000..4f3c597
--- /dev/null
+++ b/Pages/Lyrics.xaml.cs
@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Musium.Services;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Musium.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class Lyrics : Page
+    {
+        public readonly AudioService Audio = AudioService.Instance;
+        public Lyrics()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Pages/NowPlaying.xaml b/Pages/NowPlaying.xaml
index 830ec1c..6b8d5a4 100644
--- a/Pages/NowPlaying.xaml
+++ b/Pages/NowPlaying.xaml
@@ -119,8 +119,16 @@
             <SelectorBar x:Name="SecondPanelSelectorBar"
                 SelectionChanged="SecondPanelSelectorBar_SelectionChanged"
                 Grid.Row="0">
-                <SelectorBarItem x:Name="SelectorBarItemQueue" Text="Queue" IsSelected="True" />
-                <SelectorBarItem x:Name="SelectorBarItemLyrics" Text="Lyrics" />
+                <SelectorBarItem x:Name="SelectorBarItemQueue" Text="Queue" IsSelected="True">
+                    <SelectorBarItem.Icon>
+                        <FontIcon Glyph="&#xEA42;" />
+                    </SelectorBarItem.Icon>
+                </SelectorBarItem>
+                <SelectorBarItem x:Name="SelectorBarItemLyrics" Text="Lyrics">
+                    <SelectorBarItem.Icon>
+                        <FontIcon Glyph="&#xED1E;" />
+                    </SelectorBarItem.Icon>
+                </SelectorBarItem>
             </SelectorBar>
             <Frame x:Name="ContentFrame" 
                 IsNavigationStackEnabled="False" 
diff --git a/Pages/NowPlaying.xaml.cs b/Pages/NowPlaying.xaml.cs
index d58f8fa..1f21ae6 100644
--- a/Pages/NowPlaying.xaml.cs
+++ b/Pages/NowPlaying.xaml.cs
@@ -37,7 +37,6 @@ void OnPropertyChanged([CallerMemberName] string? name = null)
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
     }
     public AudioService Audio { get; } = AudioService.Instance;
-    private bool _mouseDown;
 
     public float CurrentTimeStamp { get; set; }
     private BitmapImage? _displayedCoverArt;
@@ -198,7 +197,7 @@ private void SecondPanelSelectorBar_SelectionChanged(SelectorBar sender, Selecto
                 pageType = typeof(Queue);
                 break;
             default:
-                pageType = typeof(Queue);
+                pageType = typeof(Lyrics);
                 break;
         }
 

From 791ec27fc5df1927d95eaff4679a1fb78ae958bd Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Thu, 2 Oct 2025 23:18:07 -0400
Subject: [PATCH 11/33] major typo correction

---
 Pages/Lyrics.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index 0d4563c..07c22c0 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -12,7 +12,7 @@
         <TextBlock 
             HorizontalAlignment="Center" 
             VerticalAlignment="Top" 
-            Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, TargetNullValue='Lyrics are unavailble for this track.'}"
+            Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, TargetNullValue='Lyrics are unavailable for this track.'}"
             TextAlignment="Center"
             TextWrapping="WrapWholeWords"
             FontSize="18"

From 8faa59f17a9e4074e879fd49588efbb07f1b4f05 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 00:44:08 -0400
Subject: [PATCH 12/33] basic info displaying

---
 Services/AudioService.cs | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index c5fdf3c..5fd3015 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -87,6 +87,7 @@ public void CycleRepeat()
         private AudioService()
         {
             _mediaPlayer = new MediaPlayer();
+
             _mediaPlayer.PlaybackSession.PositionChanged += OnPlaybackSessionChanged;
             _mediaPlayer.CurrentStateChanged += OnCurrentStateChanged;
             _mediaPlayer.MediaEnded += OnMediaEnded;
@@ -350,7 +351,7 @@ public Song? CurrentSongPlaying
             private set
             {
                 _currentSongPlaying = value;
-                OnPropertyChanged();
+                OnPropertyChanged();                
             }
         }
 
@@ -391,6 +392,13 @@ public void Resume()
         public void SetMediaPlayer(MediaPlayerElement element)
         {
             element.SetMediaPlayer(_mediaPlayer);
+
+            var smtc = _mediaPlayer.SystemMediaTransportControls;
+            smtc.IsEnabled = true;
+            smtc.IsPlayEnabled = true;
+            smtc.IsPauseEnabled = true;
+            smtc.IsPreviousEnabled = true;
+            smtc.IsNextEnabled = true;
         }
 
         private async Task<MediaSource> CreateMediaSourceFromMemoryAsync(string filePath)
@@ -410,7 +418,27 @@ private async Task<MediaSource> CreateMediaSourceFromMemoryAsync(string filePath
         public async void PlaySong(Song song)
         {
             var source = await CreateMediaSourceFromMemoryAsync(song.FilePath);
-            _mediaPlayer.Source = source;
+            var playbackItem = new MediaPlaybackItem(source);
+
+            var props = playbackItem.GetDisplayProperties();
+            props.Type = Windows.Media.MediaPlaybackType.Music;
+            props.MusicProperties.Title = song.Title;
+            props.MusicProperties.Artist = song.ArtistName;
+            using (var memoryStream = new MemoryStream(song.Album.CoverArtData ?? []))
+            {
+                var randomAccessStream = new InMemoryRandomAccessStream();
+
+                await RandomAccessStream.CopyAsync(
+                    memoryStream.AsInputStream(),
+                    randomAccessStream.GetOutputStreamAt(0) 
+                );
+
+                randomAccessStream.Seek(0);
+                props.Thumbnail = RandomAccessStreamReference.CreateFromStream(randomAccessStream);
+            }
+            playbackItem.ApplyDisplayProperties(props);
+
+            _mediaPlayer.Source = playbackItem;
             _mediaPlayer.Play();
 
             CurrentSongPlaying = song;

From b92b1ff408090ca6ffc76cc93420d62680b21931 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 01:17:35 -0400
Subject: [PATCH 13/33] display/control works, need to do playback bar

---
 Services/AudioService.cs | 82 +++++++++++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 14 deletions(-)

diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index 5fd3015..50a4936 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -17,6 +17,7 @@
 using TagLib.Riff;
 using Windows.Devices.Radios;
 using Windows.Graphics.Imaging;
+using Windows.Media;
 using Windows.Media.Core;
 using Windows.Media.Playback;
 using Windows.Storage;
@@ -42,6 +43,7 @@ public class AudioService : INotifyPropertyChanged
 
         private MediaPlayer _mediaPlayer;
         public event EventHandler<TimeSpan> PositionChanged;
+        private SystemMediaTransportControls _systemMediaTransportControls;
 
         private readonly Random _rng = new Random();
 
@@ -223,13 +225,39 @@ public void SetDispatcherQueue(DispatcherQueue newdq)
         private void OnPlaybackSessionChanged(MediaPlaybackSession sender, object args)
         {
             PositionChanged?.Invoke(this, sender.Position);
+            var timelineProperties = new SystemMediaTransportControlsTimelineProperties();
+
+            timelineProperties.StartTime = TimeSpan.FromSeconds(0);
+            timelineProperties.MinSeekTime = TimeSpan.FromSeconds(0);
+            timelineProperties.Position = sender.Position;
+            timelineProperties.MaxSeekTime = sender.NaturalDuration;
+            timelineProperties.EndTime = sender.NaturalDuration;
+
+            _systemMediaTransportControls.UpdateTimelineProperties(timelineProperties);
         }
         private void OnCurrentStateChanged(MediaPlayer sender, object args)
         {
             dispatcherQueue.TryEnqueue(() =>
             {
                 CurrentState = sender.CurrentState;
-            });   
+            });
+            switch (sender.CurrentState)
+            {
+                case MediaPlayerState.Playing:
+                    _systemMediaTransportControls.PlaybackStatus = MediaPlaybackStatus.Playing;
+                    break;
+                case MediaPlayerState.Paused:
+                    _systemMediaTransportControls.PlaybackStatus = MediaPlaybackStatus.Paused;
+                    break;
+                case MediaPlayerState.Stopped:
+                    _systemMediaTransportControls.PlaybackStatus = MediaPlaybackStatus.Stopped;
+                    break;
+                case MediaPlayerState.Closed:
+                    _systemMediaTransportControls.PlaybackStatus = MediaPlaybackStatus.Closed;
+                    break;
+                default:
+                    break;
+            }
         }
         private void OnMediaEnded(MediaPlayer sender, object args)
         {
@@ -388,17 +416,43 @@ public void Resume()
         {
             _mediaPlayer?.Play();
         }
-
+        private MediaPlayerElement _element;
         public void SetMediaPlayer(MediaPlayerElement element)
         {
+            _element = element;
             element.SetMediaPlayer(_mediaPlayer);
 
-            var smtc = _mediaPlayer.SystemMediaTransportControls;
-            smtc.IsEnabled = true;
-            smtc.IsPlayEnabled = true;
-            smtc.IsPauseEnabled = true;
-            smtc.IsPreviousEnabled = true;
-            smtc.IsNextEnabled = true;
+            _systemMediaTransportControls = _mediaPlayer.SystemMediaTransportControls;
+            _mediaPlayer.CommandManager.IsEnabled = false;
+            _systemMediaTransportControls.IsPlayEnabled = true;
+            _systemMediaTransportControls.IsPauseEnabled = true;
+            _systemMediaTransportControls.IsPreviousEnabled = true;
+            _systemMediaTransportControls.IsNextEnabled = true;
+            _systemMediaTransportControls.IsFastForwardEnabled = true;
+            _systemMediaTransportControls.IsEnabled = true;
+
+            _systemMediaTransportControls.ButtonPressed += smtc_ButtonPressed;
+        }
+        private void smtc_ButtonPressed(SystemMediaTransportControls sender, SystemMediaTransportControlsButtonPressedEventArgs args)
+        {
+            switch (args.Button)
+            {
+                case SystemMediaTransportControlsButton.Next:
+                    NextSong();
+                    break;
+
+                case SystemMediaTransportControlsButton.Previous:
+                    PreviousSong();
+                    break;
+
+                case SystemMediaTransportControlsButton.Play:
+                    Resume();
+                    break;
+
+                case SystemMediaTransportControlsButton.Pause:
+                    Pause();
+                    break;
+            }
         }
 
         private async Task<MediaSource> CreateMediaSourceFromMemoryAsync(string filePath)
@@ -420,10 +474,10 @@ public async void PlaySong(Song song)
             var source = await CreateMediaSourceFromMemoryAsync(song.FilePath);
             var playbackItem = new MediaPlaybackItem(source);
 
-            var props = playbackItem.GetDisplayProperties();
-            props.Type = Windows.Media.MediaPlaybackType.Music;
-            props.MusicProperties.Title = song.Title;
-            props.MusicProperties.Artist = song.ArtistName;
+            SystemMediaTransportControlsDisplayUpdater updater = _systemMediaTransportControls.DisplayUpdater;
+            updater.Type = MediaPlaybackType.Music;
+            updater.MusicProperties.Title = song.Title;
+            updater.MusicProperties.Artist = song.ArtistName;
             using (var memoryStream = new MemoryStream(song.Album.CoverArtData ?? []))
             {
                 var randomAccessStream = new InMemoryRandomAccessStream();
@@ -434,9 +488,9 @@ await RandomAccessStream.CopyAsync(
                 );
 
                 randomAccessStream.Seek(0);
-                props.Thumbnail = RandomAccessStreamReference.CreateFromStream(randomAccessStream);
+                updater.Thumbnail = RandomAccessStreamReference.CreateFromStream(randomAccessStream);
             }
-            playbackItem.ApplyDisplayProperties(props);
+            updater.Update();
 
             _mediaPlayer.Source = playbackItem;
             _mediaPlayer.Play();

From 23748576467021001a6d63ba23182830150486c0 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 01:47:14 -0400
Subject: [PATCH 14/33] dunno why but if i don't update the timeline (despite
 it not being visible it causes it to break and stop updating the rest of it,
 so i'll leave it in for now

---
 Services/AudioService.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index 50a4936..0c71244 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -221,20 +221,23 @@ public void SetDispatcherQueue(DispatcherQueue newdq)
             dispatcherQueue = newdq;
         }
         
-
-        private void OnPlaybackSessionChanged(MediaPlaybackSession sender, object args)
+        private void UpdateSystemTimeline()
         {
-            PositionChanged?.Invoke(this, sender.Position);
             var timelineProperties = new SystemMediaTransportControlsTimelineProperties();
 
             timelineProperties.StartTime = TimeSpan.FromSeconds(0);
             timelineProperties.MinSeekTime = TimeSpan.FromSeconds(0);
-            timelineProperties.Position = sender.Position;
-            timelineProperties.MaxSeekTime = sender.NaturalDuration;
-            timelineProperties.EndTime = sender.NaturalDuration;
+            timelineProperties.Position = _mediaPlayer.PlaybackSession.Position;
+            timelineProperties.MaxSeekTime = _mediaPlayer.PlaybackSession.NaturalDuration;
+            timelineProperties.EndTime = _mediaPlayer.PlaybackSession.NaturalDuration;
 
             _systemMediaTransportControls.UpdateTimelineProperties(timelineProperties);
         }
+        private void OnPlaybackSessionChanged(MediaPlaybackSession sender, object args)
+        {
+            PositionChanged?.Invoke(this, sender.Position);
+            UpdateSystemTimeline();
+        }
         private void OnCurrentStateChanged(MediaPlayer sender, object args)
         {
             dispatcherQueue.TryEnqueue(() =>
@@ -258,6 +261,7 @@ private void OnCurrentStateChanged(MediaPlayer sender, object args)
                 default:
                     break;
             }
+            UpdateSystemTimeline();
         }
         private void OnMediaEnded(MediaPlayer sender, object args)
         {
@@ -428,9 +432,11 @@ public void SetMediaPlayer(MediaPlayerElement element)
             _systemMediaTransportControls.IsPauseEnabled = true;
             _systemMediaTransportControls.IsPreviousEnabled = true;
             _systemMediaTransportControls.IsNextEnabled = true;
+            _systemMediaTransportControls.IsRewindEnabled = true;
             _systemMediaTransportControls.IsFastForwardEnabled = true;
             _systemMediaTransportControls.IsEnabled = true;
 
+
             _systemMediaTransportControls.ButtonPressed += smtc_ButtonPressed;
         }
         private void smtc_ButtonPressed(SystemMediaTransportControls sender, SystemMediaTransportControlsButtonPressedEventArgs args)

From 9350d3e39b4b3eddd74ff975021819f57cf622d1 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 13:09:46 -0400
Subject: [PATCH 15/33] fixed spamming rescan

---
 Services/AudioService.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index 0c71244..e745241 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -654,12 +654,16 @@ private bool IsLossless(string path)
             return losslessAudioExtensions.Contains(extension);
         }
 
+        private bool _currentlyScanning = false;
         public async void SetLibrary(string targetDirectory)
         {
+            if (_currentlyScanning) return;
+            _currentlyScanning = true;
             Database.Clear();
             await Task.Run(async () =>
             {
                 await ScanDirectoryIntoLibrary(targetDirectory);
+                _currentlyScanning = false;
             });
         }
 

From f6d97f78e8251bbde099ebeaf371023bad01023a Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 16:34:25 -0400
Subject: [PATCH 16/33] empty lyrics on itunes tracks now display correctly

---
 .../StringFilledToVisibilityConverter.cs      | 36 +++++++++++++++++++
 Pages/Lyrics.xaml                             | 33 ++++++++++++-----
 2 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 Converters/StringFilledToVisibilityConverter.cs

diff --git a/Converters/StringFilledToVisibilityConverter.cs b/Converters/StringFilledToVisibilityConverter.cs
new file mode 100644
index 0000000..4e0463b
--- /dev/null
+++ b/Converters/StringFilledToVisibilityConverter.cs
@@ -0,0 +1,36 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Diagnostics;
+
+namespace Musium.Converters
+{
+    public class StringFilledToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string s)
+            {
+                bool isFilled = !string.IsNullOrEmpty(s) || !string.IsNullOrWhiteSpace(s);
+                
+                if (parameter is string param && param.Equals("Inverse", StringComparison.OrdinalIgnoreCase))
+                {
+                    isFilled = !isFilled;
+                }
+                if (isFilled) Debug.WriteLine(s + " - should be lyrics before");
+
+                return isFilled ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            if (parameter is string par && par.Equals("Inverse", StringComparison.OrdinalIgnoreCase)) return Visibility.Visible;
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return value is Visibility visibility && visibility == Visibility.Visible;
+        }
+    }
+}
+
+    
\ No newline at end of file
diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index 07c22c0..4f96c13 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -6,16 +6,31 @@
     xmlns:local="using:Musium.Pages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:converters="using:Musium.Converters"
     mc:Ignorable="d">
-
+    <Page.Resources>
+        <converters:StringFilledToVisibilityConverter x:Key="StringFilledToVisibilityConverter"/>
+    </Page.Resources>
     <ScrollView HorizontalScrollMode="Disabled">
-        <TextBlock 
-            HorizontalAlignment="Center" 
-            VerticalAlignment="Top" 
-            Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, TargetNullValue='Lyrics are unavailable for this track.'}"
-            TextAlignment="Center"
-            TextWrapping="WrapWholeWords"
-            FontSize="18"
-            Margin="32"/>
+        <StackPanel>
+            <TextBlock 
+                HorizontalAlignment="Center" 
+                VerticalAlignment="Top" 
+                Text="Lyrics are unavailable for this track."
+                TextAlignment="Center"
+                TextWrapping="WrapWholeWords"
+                FontSize="18"
+                Margin="32"
+                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, ConverterParameter='Inverse', Converter={StaticResource StringFilledToVisibilityConverter}}"/>
+            <TextBlock 
+                HorizontalAlignment="Center" 
+                VerticalAlignment="Top" 
+                Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, TargetNullValue='This should not be visible.'}"
+                TextAlignment="Center"
+                TextWrapping="WrapWholeWords"
+                FontSize="18"
+                Margin="32"
+                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource StringFilledToVisibilityConverter}}"/>
+        </StackPanel>
     </ScrollView>
 </Page>

From ba27f3d5ffaf915f1222433a0ab463b79a6e8f5b Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 16:44:36 -0400
Subject: [PATCH 17/33] add lyrics button

---
 Pages/Lyrics.xaml    | 30 +++++++++++++++++++-----------
 Pages/Lyrics.xaml.cs |  5 +++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index 4f96c13..07b4864 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -12,16 +12,25 @@
         <converters:StringFilledToVisibilityConverter x:Key="StringFilledToVisibilityConverter"/>
     </Page.Resources>
     <ScrollView HorizontalScrollMode="Disabled">
-        <StackPanel>
-            <TextBlock 
-                HorizontalAlignment="Center" 
-                VerticalAlignment="Top" 
-                Text="Lyrics are unavailable for this track."
-                TextAlignment="Center"
-                TextWrapping="WrapWholeWords"
-                FontSize="18"
-                Margin="32"
-                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, ConverterParameter='Inverse', Converter={StaticResource StringFilledToVisibilityConverter}}"/>
+        <StackPanel Margin="32">
+            <StackPanel
+                HorizontalAlignment="Center"
+                Spacing="12"
+                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, ConverterParameter='Inverse', Converter={StaticResource StringFilledToVisibilityConverter}}">
+                <TextBlock 
+                    HorizontalAlignment="Center" 
+                    VerticalAlignment="Top" 
+                    Text="Lyrics are unavailable for this track."
+                    TextAlignment="Center"
+                    TextWrapping="WrapWholeWords"
+                    FontSize="18"/>
+                <Button HorizontalAlignment="Center" Padding="8" Click="AddLyricsButton_Click">
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
+                        <SymbolIcon Symbol="Add" VerticalAlignment="Center"/>
+                        <TextBlock Text="Add lyrics" FontSize="16"/>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
             <TextBlock 
                 HorizontalAlignment="Center" 
                 VerticalAlignment="Top" 
@@ -29,7 +38,6 @@
                 TextAlignment="Center"
                 TextWrapping="WrapWholeWords"
                 FontSize="18"
-                Margin="32"
                 Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource StringFilledToVisibilityConverter}}"/>
         </StackPanel>
     </ScrollView>
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index 4f3c597..331ff00 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -29,5 +29,10 @@ public Lyrics()
         {
             InitializeComponent();
         }
+
+        private void AddLyricsButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }

From 66e6c94919c2acd78e0e980d21d76e8c3c19f04c Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 17:08:56 -0400
Subject: [PATCH 18/33] lyrics apply to file function

---
 Models/Song.cs                |  6 ++++++
 Musium.csproj                 |  4 ++++
 Pages/Lyrics.xaml.cs          | 25 ++++++++++++++++++++++++-
 Popups/AddLyricsPopup.xaml    | 15 +++++++++++++++
 Popups/AddLyricsPopup.xaml.cs | 31 +++++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 Popups/AddLyricsPopup.xaml
 create mode 100644 Popups/AddLyricsPopup.xaml.cs

diff --git a/Models/Song.cs b/Models/Song.cs
index 7ff345a..e1bbdef 100644
--- a/Models/Song.cs
+++ b/Models/Song.cs
@@ -78,6 +78,12 @@ public string? Lyrics
                 OnPropertyChanged();
             }
         }
+        public void ApplyLyricsToFile()
+        {
+            using var file = TagLib.File.Create(FilePath);
+            file.Tag.Lyrics = Lyrics;
+            file.Save();
+        }
 
         private int? _trackNumber;
         public int? TrackNumber
diff --git a/Musium.csproj b/Musium.csproj
index 1302d38..fc5958d 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -25,6 +25,7 @@
     <None Remove="Pages\Lyrics.xaml" />
     <None Remove="Pages\NowPlaying.xaml" />
     <None Remove="Pages\Queue.xaml" />
+    <None Remove="Popups\AddLyricsPopup.xaml" />
     <None Remove="Styles\GridContentStyles.xaml" />
   </ItemGroup>
 
@@ -65,6 +66,9 @@
     <None Update="Assets\Placeholder.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Popups\AddLyricsPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Pages\Lyrics.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index 331ff00..a1ab7f1 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -6,6 +6,7 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using Musium.Services;
+using Musium.Popups;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -30,9 +31,31 @@ public Lyrics()
             InitializeComponent();
         }
 
-        private void AddLyricsButton_Click(object sender, RoutedEventArgs e)
+        private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
         {
+            ContentDialog dialog = new ContentDialog();
 
+            dialog.XamlRoot = XamlRoot;
+            dialog.Title = "Add lyrics";
+            dialog.PrimaryButtonText = "Online";
+            dialog.SecondaryButtonText = "Clipboard";
+            dialog.CloseButtonText = "Cancel";
+            dialog.DefaultButton = ContentDialogButton.Primary;
+            dialog.Content = new AddLyricsPopup();
+
+            var result = await dialog.ShowAsync();
+
+            switch (result)
+            {
+                case ContentDialogResult.None:
+                    break;
+                case ContentDialogResult.Primary:
+                    break;
+                case ContentDialogResult.Secondary:
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }
diff --git a/Popups/AddLyricsPopup.xaml b/Popups/AddLyricsPopup.xaml
new file mode 100644
index 0000000..ada7ad8
--- /dev/null
+++ b/Popups/AddLyricsPopup.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="Musium.Popups.AddLyricsPopup"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Musium.Popups"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+        <TextBlock Text="Choose your source for retrieving lyrics." TextWrapping="Wrap" />
+        <CheckBox Content="Only for this session"/>
+    </StackPanel>
+</Page>
diff --git a/Popups/AddLyricsPopup.xaml.cs b/Popups/AddLyricsPopup.xaml.cs
new file mode 100644
index 0000000..34fc9c9
--- /dev/null
+++ b/Popups/AddLyricsPopup.xaml.cs
@@ -0,0 +1,31 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Musium.Popups
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class AddLyricsPopup : Page
+    {
+        public AddLyricsPopup()
+        {
+            InitializeComponent();
+        }
+    }
+}

From 06d4db1c93bba55585ebfa5c8906e0bcf008d8d9 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 17:16:58 -0400
Subject: [PATCH 19/33] adding songs to file via clipboard works

---
 Pages/Lyrics.xaml.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index a1ab7f1..d35fdb6 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -5,13 +5,14 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
-using Musium.Services;
 using Musium.Popups;
+using Musium.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
@@ -52,6 +53,15 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                 case ContentDialogResult.Primary:
                     break;
                 case ContentDialogResult.Secondary:
+                    var package = Clipboard.GetContent();
+                    if (package.Contains(StandardDataFormats.Text))
+                    {
+                        if (Audio.CurrentSongPlaying == null) return;
+                        var text = await package.GetTextAsync();
+                        Audio.CurrentSongPlaying.Lyrics = text;
+                        Audio.CurrentSongPlaying.ApplyLyricsToFile();
+                    }
+
                     break;
                 default:
                     break;

From fbdf601b61c9ca3ee34847f391d5aecfb81f23bb Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 17:43:58 -0400
Subject: [PATCH 20/33] session option

---
 Pages/Lyrics.xaml.cs          | 11 +++++++----
 Popups/AddLyricsPopup.xaml    |  2 +-
 Popups/AddLyricsPopup.xaml.cs | 11 +++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index d35fdb6..42ae326 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -50,18 +50,21 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
             {
                 case ContentDialogResult.None:
                     break;
-                case ContentDialogResult.Primary:
+                case ContentDialogResult.Primary: // online
+
                     break;
-                case ContentDialogResult.Secondary:
+                case ContentDialogResult.Secondary: // clipboard
                     var package = Clipboard.GetContent();
                     if (package.Contains(StandardDataFormats.Text))
                     {
                         if (Audio.CurrentSongPlaying == null) return;
                         var text = await package.GetTextAsync();
                         Audio.CurrentSongPlaying.Lyrics = text;
-                        Audio.CurrentSongPlaying.ApplyLyricsToFile();
+                        if (dialog.Content is AddLyricsPopup popup)
+                        {
+                            if (!popup.SessionChecked) Audio.CurrentSongPlaying.ApplyLyricsToFile();
+                        }
                     }
-
                     break;
                 default:
                     break;
diff --git a/Popups/AddLyricsPopup.xaml b/Popups/AddLyricsPopup.xaml
index ada7ad8..8e08ea1 100644
--- a/Popups/AddLyricsPopup.xaml
+++ b/Popups/AddLyricsPopup.xaml
@@ -10,6 +10,6 @@
 
     <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <TextBlock Text="Choose your source for retrieving lyrics." TextWrapping="Wrap" />
-        <CheckBox Content="Only for this session"/>
+        <CheckBox x:Name="SessionCheckbox" Content="Only for this session" Checked="SessionCheckbox_Checked" Unchecked="SessionCheckbox_Unchecked"/>
     </StackPanel>
 </Page>
diff --git a/Popups/AddLyricsPopup.xaml.cs b/Popups/AddLyricsPopup.xaml.cs
index 34fc9c9..b45c2f6 100644
--- a/Popups/AddLyricsPopup.xaml.cs
+++ b/Popups/AddLyricsPopup.xaml.cs
@@ -23,9 +23,20 @@ namespace Musium.Popups
     /// </summary>
     public sealed partial class AddLyricsPopup : Page
     {
+        public bool SessionChecked = false;
         public AddLyricsPopup()
         {
             InitializeComponent();
         }
+
+        private void SessionCheckbox_Checked(object sender, RoutedEventArgs e)
+        {
+            SessionChecked = true;
+        }
+
+        private void SessionCheckbox_Unchecked(object sender, RoutedEventArgs e)
+        {
+            SessionChecked = false;
+        }
     }
 }

From a8a4adb76c1ffe0b1a74a8453fcf3b3f49639158 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 18:46:36 -0400
Subject: [PATCH 21/33] online lyric grabbing is beautiful

---
 App.xaml.cs                                   |  6 +-
 .../StringFilledToVisibilityConverter.cs      |  1 -
 Musium.csproj                                 |  4 ++
 Pages/Lyrics.xaml.cs                          | 67 +++++++++++++++++--
 Popups/ConfirmLyricsPopup.xaml                | 14 ++++
 Popups/ConfirmLyricsPopup.xaml.cs             | 36 ++++++++++
 Services/AudioService.cs                      | 10 +++
 7 files changed, 130 insertions(+), 8 deletions(-)
 create mode 100644 Popups/ConfirmLyricsPopup.xaml
 create mode 100644 Popups/ConfirmLyricsPopup.xaml.cs

diff --git a/App.xaml.cs b/App.xaml.cs
index cb665e3..7b40857 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -21,13 +21,14 @@
 using Windows.Media.Playback;
 using Windows.Storage;
 using System.Threading.Tasks;
+using System.Net.Http;
 
 namespace Musium
 {
     public partial class App : Application
     {
         public static Window MainWindow { get; private set; }
-
+        public static HttpClient LyricHttpClient { get; private set; }
         public App()
         {
             InitializeComponent();
@@ -37,6 +38,9 @@ protected override async void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventA
             MainWindow = new MainWindow();
             MainWindow.Activate();
 
+            LyricHttpClient = new HttpClient();
+            LyricHttpClient.BaseAddress = new Uri("https://lrclib.net/api/");
+
             var Audio = AudioService.Instance;
             await Task.Run(async () =>
             {
diff --git a/Converters/StringFilledToVisibilityConverter.cs b/Converters/StringFilledToVisibilityConverter.cs
index 4e0463b..2ae22c7 100644
--- a/Converters/StringFilledToVisibilityConverter.cs
+++ b/Converters/StringFilledToVisibilityConverter.cs
@@ -17,7 +17,6 @@ public object Convert(object value, Type targetType, object parameter, string la
                 {
                     isFilled = !isFilled;
                 }
-                if (isFilled) Debug.WriteLine(s + " - should be lyrics before");
 
                 return isFilled ? Visibility.Visible : Visibility.Collapsed;
             }
diff --git a/Musium.csproj b/Musium.csproj
index fc5958d..7b8cd72 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -26,6 +26,7 @@
     <None Remove="Pages\NowPlaying.xaml" />
     <None Remove="Pages\Queue.xaml" />
     <None Remove="Popups\AddLyricsPopup.xaml" />
+    <None Remove="Popups\ConfirmLyricsPopup.xaml" />
     <None Remove="Styles\GridContentStyles.xaml" />
   </ItemGroup>
 
@@ -66,6 +67,9 @@
     <None Update="Assets\Placeholder.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Popups\ConfirmLyricsPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Popups\AddLyricsPopup.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index 42ae326..1243219 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -5,25 +5,24 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using Musium.Models;
 using Musium.Popups;
 using Musium.Services;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Json;
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace Musium.Pages
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class Lyrics : Page
     {
         public readonly AudioService Audio = AudioService.Instance;
@@ -51,6 +50,62 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                 case ContentDialogResult.None:
                     break;
                 case ContentDialogResult.Primary: // online
+                    Song currentSong = Audio.CurrentSongPlaying;
+                    var artist = WebUtility.UrlEncode(currentSong.ArtistName);
+                    var track = WebUtility.UrlEncode(currentSong.Title);
+                    var album = WebUtility.UrlEncode(currentSong.Album.Title);
+                    var duration = currentSong.Duration.TotalSeconds;
+
+                    var requestUrl = $"get?artist_name={artist}&track_name={track}&album_name={album}&duration={duration}";
+
+                    var response = await App.LyricHttpClient.GetFromJsonAsync<LyricResult?>(requestUrl);
+
+
+                    if (response?.plainLyrics is string lyrics)
+                    {
+                        ContentDialog confirmDialog = new ContentDialog();
+
+                        confirmDialog.XamlRoot = XamlRoot;
+                        confirmDialog.Title = "Are these correct?";
+                        confirmDialog.PrimaryButtonText = "Yes, use these";
+                        confirmDialog.CloseButtonText = "No";
+                        confirmDialog.DefaultButton = ContentDialogButton.Primary;
+                        confirmDialog.Content = new ConfirmLyricsPopup();
+                        ConfirmLyricsPopup content = (ConfirmLyricsPopup)confirmDialog.Content;
+                        content.SetContent(lyrics);
+
+                        var confirmResult = await confirmDialog.ShowAsync();
+                        switch (confirmResult)
+                        {
+                            case ContentDialogResult.None:
+                                break;
+                            case ContentDialogResult.Primary:
+                                if (Audio.CurrentSongPlaying == null) return;
+                                if (dialog.Content is AddLyricsPopup popup)
+                                {
+                                    Audio.CurrentSongPlaying.Lyrics = lyrics;
+                                    if (!popup.SessionChecked) Audio.CurrentSongPlaying.ApplyLyricsToFile();
+                                }
+                                break;
+                            case ContentDialogResult.Secondary:
+                                break;
+                            default:
+                                break;
+                        }
+                    } else
+                    {
+                        ContentDialog confirmDialog = new ContentDialog();
+
+                        confirmDialog.XamlRoot = XamlRoot;
+                        confirmDialog.Title = response?.code == 404 ? "Lyrics unavailable" : "No connection";
+                        confirmDialog.CloseButtonText = "No";
+                        confirmDialog.DefaultButton = ContentDialogButton.Close;
+                        confirmDialog.Content = new ConfirmLyricsPopup();
+                        ConfirmLyricsPopup content = (ConfirmLyricsPopup)confirmDialog.Content;
+                        if (response?.code == 404) content.SetContent("Couldn't find the song on the server.");
+
+                        await confirmDialog.ShowAsync();
+                    }
 
                     break;
                 case ContentDialogResult.Secondary: // clipboard
diff --git a/Popups/ConfirmLyricsPopup.xaml b/Popups/ConfirmLyricsPopup.xaml
new file mode 100644
index 0000000..9b79352
--- /dev/null
+++ b/Popups/ConfirmLyricsPopup.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="Musium.Popups.ConfirmLyricsPopup"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Musium.Popups"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollView VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MaxHeight="400">
+        <TextBlock x:Name="LyricText" Text="Couldn't connect to the lyric server. :(" TextWrapping="Wrap" />
+    </ScrollView>
+</Page>
diff --git a/Popups/ConfirmLyricsPopup.xaml.cs b/Popups/ConfirmLyricsPopup.xaml.cs
new file mode 100644
index 0000000..47576bf
--- /dev/null
+++ b/Popups/ConfirmLyricsPopup.xaml.cs
@@ -0,0 +1,36 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Musium.Popups
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ConfirmLyricsPopup : Page
+    {
+        public ConfirmLyricsPopup()
+        {
+            InitializeComponent();
+        }
+        public void SetContent(string? value)
+        {
+            if (value is string == false) return;
+            LyricText.Text = value;
+        }
+    }
+}
diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index e745241..c77800e 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -36,6 +36,16 @@ public enum ShuffleState
         Off,
         Shuffle
     }
+    public record class LyricResult(
+        int? code = null,
+        int? id = null,
+        string? trackName = null,
+        string? artistName = null,
+        string? albumName = null,
+        float? duration = null,
+        bool? instrumental = null,
+        string? plainLyrics = null,
+        string? syncedLyrics = null);
     public class AudioService : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;

From be3de8d51773e773ce31958b36179f178c78d313 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 19:10:19 -0400
Subject: [PATCH 22/33] error handling for lyrics

---
 Pages/Lyrics.xaml.cs | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index 1243219..04cbcc4 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -58,8 +58,17 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
 
                     var requestUrl = $"get?artist_name={artist}&track_name={track}&album_name={album}&duration={duration}";
 
-                    var response = await App.LyricHttpClient.GetFromJsonAsync<LyricResult?>(requestUrl);
-
+                    LyricResult? response = null;
+                    HttpStatusCode? code = null;
+                    try
+                    {
+                        response = await App.LyricHttpClient.GetFromJsonAsync<LyricResult?>(requestUrl);
+                    }
+                    catch (HttpRequestException ex)
+                    {
+                        Console.WriteLine($"api request for lyrics failed: {ex.StatusCode}");
+                        code = ex.StatusCode;
+                    }
 
                     if (response?.plainLyrics is string lyrics)
                     {
@@ -97,12 +106,21 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                         ContentDialog confirmDialog = new ContentDialog();
 
                         confirmDialog.XamlRoot = XamlRoot;
-                        confirmDialog.Title = response?.code == 404 ? "Lyrics unavailable" : "No connection";
-                        confirmDialog.CloseButtonText = "No";
+                        confirmDialog.Title = code switch
+                        {
+                            HttpStatusCode.NotFound => "Lyrics unavailable",
+
+                            HttpStatusCode.RequestTimeout => "No connection",
+                            HttpStatusCode.ServiceUnavailable => "No connection",
+                            HttpStatusCode.GatewayTimeout => "No connection",
+
+                            _ => "Lyrics unavailable"
+                        };
+                        confirmDialog.CloseButtonText = ":(";
                         confirmDialog.DefaultButton = ContentDialogButton.Close;
                         confirmDialog.Content = new ConfirmLyricsPopup();
                         ConfirmLyricsPopup content = (ConfirmLyricsPopup)confirmDialog.Content;
-                        if (response?.code == 404) content.SetContent("Couldn't find the song on the server.");
+                        if (code == HttpStatusCode.NotFound) content.SetContent("Couldn't find the song on the server.");
 
                         await confirmDialog.ShowAsync();
                     }

From 40eb7fc06e65cf3fb6c3f508375492bc11ada86c Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 19:12:36 -0400
Subject: [PATCH 23/33] changed error message display slighly

---
 Pages/Lyrics.xaml.cs           | 1 -
 Popups/ConfirmLyricsPopup.xaml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index 04cbcc4..d38c8ee 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -120,7 +120,6 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                         confirmDialog.DefaultButton = ContentDialogButton.Close;
                         confirmDialog.Content = new ConfirmLyricsPopup();
                         ConfirmLyricsPopup content = (ConfirmLyricsPopup)confirmDialog.Content;
-                        if (code == HttpStatusCode.NotFound) content.SetContent("Couldn't find the song on the server.");
 
                         await confirmDialog.ShowAsync();
                     }
diff --git a/Popups/ConfirmLyricsPopup.xaml b/Popups/ConfirmLyricsPopup.xaml
index 9b79352..39ff2e1 100644
--- a/Popups/ConfirmLyricsPopup.xaml
+++ b/Popups/ConfirmLyricsPopup.xaml
@@ -9,6 +9,6 @@
     mc:Ignorable="d">
 
     <ScrollView VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MaxHeight="400">
-        <TextBlock x:Name="LyricText" Text="Couldn't connect to the lyric server. :(" TextWrapping="Wrap" />
+        <TextBlock x:Name="LyricText" Text="Couldn't get the song from the server. :p" TextWrapping="Wrap" />
     </ScrollView>
 </Page>

From 0ac9287424b172768c9ab234cc6ab8bcf283cdd1 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 19:36:15 -0400
Subject: [PATCH 24/33] .lrc file support

---
 Pages/NowPlaying.xaml.cs |  1 +
 Services/AudioService.cs | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Pages/NowPlaying.xaml.cs b/Pages/NowPlaying.xaml.cs
index 1f21ae6..dac6d0a 100644
--- a/Pages/NowPlaying.xaml.cs
+++ b/Pages/NowPlaying.xaml.cs
@@ -121,6 +121,7 @@ private void Audio_PositionChanged(object sender, TimeSpan newPos)
         if (DispatcherQueue == null) return;
         DispatcherQueue.TryEnqueue(() =>
         {
+            if (TimeElapsed == null) return;
             TimeElapsed.Text = $"{newPos:m\\:ss}";
             SongProgressValue = newPos.TotalSeconds;
         });
diff --git a/Services/AudioService.cs b/Services/AudioService.cs
index c77800e..be1be93 100644
--- a/Services/AudioService.cs
+++ b/Services/AudioService.cs
@@ -615,12 +615,25 @@ private Song ExtractSongData(TagLib.File tfile, string path, Album album)
                 ArtistName = tfile.Tag.FirstPerformer,
                 FilePath = path,
                 Genre = tfile.Tag.FirstGenre,
-                Lyrics = tfile.Tag.Lyrics,
                 Duration = tfile.Properties.Duration,
                 TrackNumber = (int)tfile.Tag.Track,
                 Lossless = IsLossless(path)
             };
             song.Favorited = song.RetrieveFavorited();
+            var lyrics = tfile.Tag.Lyrics;
+            if (!string.IsNullOrWhiteSpace(lyrics))
+            {
+                song.Lyrics = lyrics;
+            } 
+            else
+            {
+                var parent = Path.GetDirectoryName(path);
+                var lrcPath = Path.Combine(parent, $"{Path.GetFileNameWithoutExtension(path)}.lrc");
+                if (System.IO.File.Exists(lrcPath))
+                {
+                    song.Lyrics = System.IO.File.ReadAllText(lrcPath);
+                }
+            }
 
             album.Songs.Add(song);
             album.Songs.OrderBy(song => song.TrackNumber);

From 6ab808bd360b534db94ea5f9b1b57b2e5a2027e8 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 20:13:03 -0400
Subject: [PATCH 25/33] mark as instrumental + null checks

---
 Converters/LyricsPassConverter.cs | 31 +++++++++++++++++++++++++++++++
 Pages/Lyrics.xaml                 | 23 ++++++++++++++++-------
 Pages/Lyrics.xaml.cs              | 10 ++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 Converters/LyricsPassConverter.cs

diff --git a/Converters/LyricsPassConverter.cs b/Converters/LyricsPassConverter.cs
new file mode 100644
index 0000000..769d70a
--- /dev/null
+++ b/Converters/LyricsPassConverter.cs
@@ -0,0 +1,31 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Diagnostics;
+
+namespace Musium.Converters
+{
+    public class LyricsPassConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string s)
+            {
+                if (s.Equals("[INSTRUMENTAL]"))
+                {
+                    return "This song does not contain any lyrics.";
+                }
+                return s;
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return value is Visibility visibility && visibility == Visibility.Visible;
+        }
+    }
+}
+
+    
\ No newline at end of file
diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index 07b4864..0118f32 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -10,6 +10,7 @@
     mc:Ignorable="d">
     <Page.Resources>
         <converters:StringFilledToVisibilityConverter x:Key="StringFilledToVisibilityConverter"/>
+        <converters:LyricsPassConverter x:Key="LyricsPassConverter"/>
     </Page.Resources>
     <ScrollView HorizontalScrollMode="Disabled">
         <StackPanel Margin="32">
@@ -24,17 +25,25 @@
                     TextAlignment="Center"
                     TextWrapping="WrapWholeWords"
                     FontSize="18"/>
-                <Button HorizontalAlignment="Center" Padding="8" Click="AddLyricsButton_Click">
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
-                        <SymbolIcon Symbol="Add" VerticalAlignment="Center"/>
-                        <TextBlock Text="Add lyrics" FontSize="16"/>
-                    </StackPanel>
-                </Button>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="8">
+                    <Button HorizontalAlignment="Center" Padding="8" Click="AddLyricsButton_Click">
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
+                            <SymbolIcon Symbol="Add" VerticalAlignment="Center"/>
+                            <TextBlock Text="Add lyrics" FontSize="16"/>
+                        </StackPanel>
+                    </Button>
+                    <Button HorizontalAlignment="Center" Padding="8" Click="MarkInstrumentalButton_Click">
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
+                            <FontIcon Glyph="&#xEC54;" />
+                            <TextBlock Text="Mark as instrumental" FontSize="16"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
             </StackPanel>
             <TextBlock 
                 HorizontalAlignment="Center" 
                 VerticalAlignment="Top" 
-                Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, TargetNullValue='This should not be visible.'}"
+                Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource LyricsPassConverter}, TargetNullValue='This should not be visible.'}"
                 TextAlignment="Center"
                 TextWrapping="WrapWholeWords"
                 FontSize="18"
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index d38c8ee..bedc2ef 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -33,6 +33,7 @@ public Lyrics()
 
         private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
         {
+            if (Audio.CurrentSongPlaying == null) return;
             ContentDialog dialog = new ContentDialog();
 
             dialog.XamlRoot = XamlRoot;
@@ -51,6 +52,7 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                     break;
                 case ContentDialogResult.Primary: // online
                     Song currentSong = Audio.CurrentSongPlaying;
+                    if (currentSong == null) return;
                     var artist = WebUtility.UrlEncode(currentSong.ArtistName);
                     var track = WebUtility.UrlEncode(currentSong.Title);
                     var album = WebUtility.UrlEncode(currentSong.Album.Title);
@@ -142,5 +144,13 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                     break;
             }
         }
+
+        private void MarkInstrumentalButton_Click(object sender, RoutedEventArgs e)
+        {
+            Song currentSong = Audio.CurrentSongPlaying;
+            if (currentSong == null) return;
+            currentSong.Lyrics = "[INSTRUMENTAL]";
+            currentSong.ApplyLyricsToFile();
+        }
     }
 }

From 471d0d70da6c8ef3e5c02927fc4c664cfd4ddc07 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 20:14:06 -0400
Subject: [PATCH 26/33] modify file warning

---
 Popups/AddLyricsPopup.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Popups/AddLyricsPopup.xaml b/Popups/AddLyricsPopup.xaml
index 8e08ea1..29af4a0 100644
--- a/Popups/AddLyricsPopup.xaml
+++ b/Popups/AddLyricsPopup.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d">
 
     <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-        <TextBlock Text="Choose your source for retrieving lyrics." TextWrapping="Wrap" />
+        <TextBlock Text="Choose your source for retrieving lyrics. Adding lyrics will modify the file." TextWrapping="Wrap" />
         <CheckBox x:Name="SessionCheckbox" Content="Only for this session" Checked="SessionCheckbox_Checked" Unchecked="SessionCheckbox_Unchecked"/>
     </StackPanel>
 </Page>

From 80061c5a3b67a1d11e59efde0d9c98891f3d4614 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 20:16:39 -0400
Subject: [PATCH 27/33] made file modification warning clearer

---
 Popups/AddLyricsPopup.xaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Popups/AddLyricsPopup.xaml b/Popups/AddLyricsPopup.xaml
index 29af4a0..0b1a794 100644
--- a/Popups/AddLyricsPopup.xaml
+++ b/Popups/AddLyricsPopup.xaml
@@ -8,8 +8,10 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-        <TextBlock Text="Choose your source for retrieving lyrics. Adding lyrics will modify the file." TextWrapping="Wrap" />
+    <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Spacing="4">
+        <TextBlock Text="Choose your source for retrieving lyrics." TextWrapping="Wrap" />
+        <TextBlock TextWrapping="Wrap">Adding lyrics <Run FontWeight="ExtraBold">will modify the file.</Run></TextBlock>
+        
         <CheckBox x:Name="SessionCheckbox" Content="Only for this session" Checked="SessionCheckbox_Checked" Unchecked="SessionCheckbox_Unchecked"/>
     </StackPanel>
 </Page>

From c87aac9279389b1e4a866ed925618b36e36b7feb Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Fri, 3 Oct 2025 22:48:56 -0400
Subject: [PATCH 28/33] button for editing

---
 Pages/Lyrics.xaml | 72 ++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index 0118f32..ef50193 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -12,42 +12,50 @@
         <converters:StringFilledToVisibilityConverter x:Key="StringFilledToVisibilityConverter"/>
         <converters:LyricsPassConverter x:Key="LyricsPassConverter"/>
     </Page.Resources>
-    <ScrollView HorizontalScrollMode="Disabled">
-        <StackPanel Margin="32">
-            <StackPanel
-                HorizontalAlignment="Center"
-                Spacing="12"
-                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, ConverterParameter='Inverse', Converter={StaticResource StringFilledToVisibilityConverter}}">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0">
+        <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="16">
+            <Button Width="32" Height="32" Padding="0">
+                <SymbolIcon Symbol="More"/>
+            </Button>
+        </Grid>
+        <ScrollView HorizontalScrollMode="Disabled" Padding="32,0">
+            <StackPanel Margin="16">
+                <StackPanel
+                    HorizontalAlignment="Center"
+                    Spacing="12"
+                    Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, ConverterParameter='Inverse', Converter={StaticResource StringFilledToVisibilityConverter}}">
+                    <TextBlock 
+                        HorizontalAlignment="Center" 
+                        VerticalAlignment="Top" 
+                        Text="Lyrics are unavailable for this track."
+                        TextAlignment="Center"
+                        TextWrapping="WrapWholeWords"
+                        FontSize="18"/>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="8">
+                        <Button HorizontalAlignment="Center" Padding="8" Click="AddLyricsButton_Click">
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
+                                <SymbolIcon Symbol="Add" VerticalAlignment="Center"/>
+                                <TextBlock Text="Add lyrics" FontSize="16"/>
+                            </StackPanel>
+                        </Button>
+                        <Button HorizontalAlignment="Center" Padding="8" Click="MarkInstrumentalButton_Click">
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
+                                <FontIcon Glyph="&#xEC54;" />
+                                <TextBlock Text="Mark as instrumental" FontSize="16"/>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+                </StackPanel>
                 <TextBlock 
                     HorizontalAlignment="Center" 
                     VerticalAlignment="Top" 
-                    Text="Lyrics are unavailable for this track."
+                    Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource LyricsPassConverter}, TargetNullValue='This should not be visible.'}"
                     TextAlignment="Center"
                     TextWrapping="WrapWholeWords"
-                    FontSize="18"/>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="8">
-                    <Button HorizontalAlignment="Center" Padding="8" Click="AddLyricsButton_Click">
-                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
-                            <SymbolIcon Symbol="Add" VerticalAlignment="Center"/>
-                            <TextBlock Text="Add lyrics" FontSize="16"/>
-                        </StackPanel>
-                    </Button>
-                    <Button HorizontalAlignment="Center" Padding="8" Click="MarkInstrumentalButton_Click">
-                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Spacing="8">
-                            <FontIcon Glyph="&#xEC54;" />
-                            <TextBlock Text="Mark as instrumental" FontSize="16"/>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
+                    FontSize="18"
+                    Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource StringFilledToVisibilityConverter}}"/>
+
             </StackPanel>
-            <TextBlock 
-                HorizontalAlignment="Center" 
-                VerticalAlignment="Top" 
-                Text="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource LyricsPassConverter}, TargetNullValue='This should not be visible.'}"
-                TextAlignment="Center"
-                TextWrapping="WrapWholeWords"
-                FontSize="18"
-                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource StringFilledToVisibilityConverter}}"/>
-        </StackPanel>
-    </ScrollView>
+        </ScrollView>
+    </Grid>
 </Page>

From 5087bef7dd3799c63672a08a3c91303b497b6fbc Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Sat, 4 Oct 2025 01:46:29 -0400
Subject: [PATCH 29/33] button functionality

---
 Models/Song.cs                  | 35 +++++++++++++++--
 Musium.csproj                   |  4 ++
 Pages/Lyrics.xaml               | 34 +++++++++++++---
 Pages/Lyrics.xaml.cs            | 69 ++++++++++++++++++++++++++++++---
 Popups/ClearLyricsPopup.xaml    | 14 +++++++
 Popups/ClearLyricsPopup.xaml.cs | 31 +++++++++++++++
 6 files changed, 172 insertions(+), 15 deletions(-)
 create mode 100644 Popups/ClearLyricsPopup.xaml
 create mode 100644 Popups/ClearLyricsPopup.xaml.cs

diff --git a/Models/Song.cs b/Models/Song.cs
index e1bbdef..3daf318 100644
--- a/Models/Song.cs
+++ b/Models/Song.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using Windows.Devices.Radios;
 using Windows.Media.Core;
 
@@ -78,11 +79,37 @@ public string? Lyrics
                 OnPropertyChanged();
             }
         }
-        public void ApplyLyricsToFile()
+        public async Task ApplyLyricsToFileAsync()
         {
-            using var file = TagLib.File.Create(FilePath);
-            file.Tag.Lyrics = Lyrics;
-            file.Save();
+            const int maxRetries = 20;
+            const int delayOnRetry = 1000; // absolutely a hacky way to do this, however it works for virtual storage so :shrug:
+
+            for (int i = 0; i < maxRetries; i++)
+            {
+                try
+                {
+                    using (var file = TagLib.File.Create(FilePath))
+                    {
+                        file.Tag.Lyrics = Lyrics;
+                        file.Save();
+                    }
+
+                    Debug.WriteLine("lyrics saved successfully.");
+                    return;
+                }
+                catch (IOException ex)
+                {
+                    Debug.WriteLine($"attempt {i + 1} to save lyrics failed. retrying...");
+                    if (i < maxRetries - 1)
+                    {
+                        await Task.Delay(delayOnRetry);
+                    }
+                    else
+                    {
+                        Debug.WriteLine($"failed to save lyrics after {maxRetries} attempts: {ex.Message}");
+                    }
+                }
+            }
         }
 
         private int? _trackNumber;
diff --git a/Musium.csproj b/Musium.csproj
index 7b8cd72..9964123 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -26,6 +26,7 @@
     <None Remove="Pages\NowPlaying.xaml" />
     <None Remove="Pages\Queue.xaml" />
     <None Remove="Popups\AddLyricsPopup.xaml" />
+    <None Remove="Popups\ClearLyricsPopup.xaml" />
     <None Remove="Popups\ConfirmLyricsPopup.xaml" />
     <None Remove="Styles\GridContentStyles.xaml" />
   </ItemGroup>
@@ -67,6 +68,9 @@
     <None Update="Assets\Placeholder.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Popups\ClearLyricsPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Popups\ConfirmLyricsPopup.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index ef50193..45f66db 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -13,11 +13,6 @@
         <converters:LyricsPassConverter x:Key="LyricsPassConverter"/>
     </Page.Resources>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0">
-        <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="16">
-            <Button Width="32" Height="32" Padding="0">
-                <SymbolIcon Symbol="More"/>
-            </Button>
-        </Grid>
         <ScrollView HorizontalScrollMode="Disabled" Padding="32,0">
             <StackPanel Margin="16">
                 <StackPanel
@@ -57,5 +52,34 @@
 
             </StackPanel>
         </ScrollView>
+        <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="16">
+            <Button 
+                Width="32" 
+                Height="32" 
+                Padding="0" 
+                Visibility="{x:Bind Audio.CurrentSongPlaying.Lyrics, Mode=OneWay, Converter={StaticResource StringFilledToVisibilityConverter}}">
+                <SymbolIcon Symbol="More"/>
+                <Button.Flyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Text="Edit" Tag="edit" Click="MenuFlyoutItem_Click">
+                            <MenuFlyoutItem.Icon>
+                                <SymbolIcon Symbol="Edit"/>
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutSeparator/>
+                        <MenuFlyoutItem Text="Clear lyrics" Tag="clear" Click="MenuFlyoutItem_Click">
+                            <MenuFlyoutItem.Icon>
+                                <SymbolIcon Symbol="Delete"/>
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutItem Text="Mark as instrumental" Tag="instrumental" Click="MenuFlyoutItem_Click">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon Glyph="&#xEC54;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                    </MenuFlyout>
+                </Button.Flyout>
+            </Button>
+        </Grid>
     </Grid>
 </Page>
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index bedc2ef..634e5f8 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -17,6 +17,7 @@
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
@@ -32,12 +33,17 @@ public Lyrics()
         }
 
         private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
+        {
+            await EditLyrics(true);
+        }
+
+        private async Task EditLyrics(bool adding = false)
         {
             if (Audio.CurrentSongPlaying == null) return;
             ContentDialog dialog = new ContentDialog();
 
             dialog.XamlRoot = XamlRoot;
-            dialog.Title = "Add lyrics";
+            dialog.Title = adding ? "Add lyrics" : "Edit lyrics";
             dialog.PrimaryButtonText = "Online";
             dialog.SecondaryButtonText = "Clipboard";
             dialog.CloseButtonText = "Cancel";
@@ -95,7 +101,7 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                                 if (dialog.Content is AddLyricsPopup popup)
                                 {
                                     Audio.CurrentSongPlaying.Lyrics = lyrics;
-                                    if (!popup.SessionChecked) Audio.CurrentSongPlaying.ApplyLyricsToFile();
+                                    if (!popup.SessionChecked) await Audio.CurrentSongPlaying.ApplyLyricsToFileAsync();
                                 }
                                 break;
                             case ContentDialogResult.Secondary:
@@ -136,7 +142,7 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                         Audio.CurrentSongPlaying.Lyrics = text;
                         if (dialog.Content is AddLyricsPopup popup)
                         {
-                            if (!popup.SessionChecked) Audio.CurrentSongPlaying.ApplyLyricsToFile();
+                            if (!popup.SessionChecked) await Audio.CurrentSongPlaying.ApplyLyricsToFileAsync();
                         }
                     }
                     break;
@@ -144,13 +150,64 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
                     break;
             }
         }
-
-        private void MarkInstrumentalButton_Click(object sender, RoutedEventArgs e)
+        private async void ClearLyrics()
+        {
+            Song currentSong = Audio.CurrentSongPlaying;
+            if (currentSong == null) return;
+            currentSong.Lyrics = "";
+            await currentSong.ApplyLyricsToFileAsync();
+        }
+        private async void MarkAsInstrumental()
         {
             Song currentSong = Audio.CurrentSongPlaying;
             if (currentSong == null) return;
             currentSong.Lyrics = "[INSTRUMENTAL]";
-            currentSong.ApplyLyricsToFile();
+            await currentSong.ApplyLyricsToFileAsync();
+        }
+        private void MarkInstrumentalButton_Click(object sender, RoutedEventArgs e)
+        {
+            MarkAsInstrumental();
+        }
+
+        private async void MenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuFlyoutItem selectedItem)
+            {
+                string sortOption = selectedItem.Tag.ToString();
+                switch (sortOption)
+                {
+                    case "edit":
+                        await EditLyrics();
+                        break;
+                    case "clear":
+                        ContentDialog confirmDialog = new ContentDialog();
+
+                        confirmDialog.XamlRoot = XamlRoot;
+                        confirmDialog.Title = "Clear lyrics?";
+                        confirmDialog.PrimaryButtonText = "Yes";
+                        confirmDialog.CloseButtonText = "No, cancel";
+                        confirmDialog.DefaultButton = ContentDialogButton.Close;
+                        confirmDialog.Content = new ClearLyricsPopup();
+
+                        var result = await confirmDialog.ShowAsync();
+                        switch (result)
+                        {
+                            case ContentDialogResult.None:
+                                break;
+                            case ContentDialogResult.Primary:
+                                ClearLyrics();
+                                break;
+                            case ContentDialogResult.Secondary:
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    case "instrumental":
+                        MarkAsInstrumental();
+                        break;
+                }
+            }
         }
     }
 }
diff --git a/Popups/ClearLyricsPopup.xaml b/Popups/ClearLyricsPopup.xaml
new file mode 100644
index 0000000..64680f7
--- /dev/null
+++ b/Popups/ClearLyricsPopup.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="Musium.Popups.ClearLyricsPopup"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Musium.Popups"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <TextBlock Text="This action is irreversible."/>
+    </StackPanel>
+</Page>
diff --git a/Popups/ClearLyricsPopup.xaml.cs b/Popups/ClearLyricsPopup.xaml.cs
new file mode 100644
index 0000000..3d87766
--- /dev/null
+++ b/Popups/ClearLyricsPopup.xaml.cs
@@ -0,0 +1,31 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Musium.Popups
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class ClearLyricsPopup : Page
+    {
+        public ClearLyricsPopup()
+        {
+            InitializeComponent();
+        }
+    }
+}

From 0e120b9eaa4bbd5fe9751dedb5cfd0116c6e7c6a Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Sat, 4 Oct 2025 01:47:52 -0400
Subject: [PATCH 30/33] version bump

---
 Package.appxmanifest    | 2 +-
 Pages/SettingsPage.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Package.appxmanifest b/Package.appxmanifest
index 89e1916..08fe838 100644
--- a/Package.appxmanifest
+++ b/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="b838ab11-140c-408f-b4bf-a855a42f7e2a"
     Publisher="CN=jamied"
-    Version="0.3.0.0" />
+    Version="0.4.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="b838ab11-140c-408f-b4bf-a855a42f7e2a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/Pages/SettingsPage.xaml b/Pages/SettingsPage.xaml
index 5d06fd6..4a34c85 100644
--- a/Pages/SettingsPage.xaml
+++ b/Pages/SettingsPage.xaml
@@ -50,7 +50,7 @@
                     <ImageIcon Source="/Assets/Icon.ico"/>
                 </tk:SettingsExpander.HeaderIcon>
                 <tk:SettingsExpander.Content>
-                    <TextBlock FontSize="14" Text="v0.3.0"/>
+                    <TextBlock FontSize="14" Text="v0.4.0"/>
                 </tk:SettingsExpander.Content>
                 <tk:SettingsExpander.Items>
                     <tk:SettingsCard Header="Credits" HorizontalContentAlignment="Left" ContentAlignment="Vertical">

From 1131ccacf1d48ecb9170edc2390fe8f6d665dc13 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Sat, 4 Oct 2025 01:57:02 -0400
Subject: [PATCH 31/33] center lyrics in confirm

---
 Popups/ConfirmLyricsPopup.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Popups/ConfirmLyricsPopup.xaml b/Popups/ConfirmLyricsPopup.xaml
index 39ff2e1..d74f9f1 100644
--- a/Popups/ConfirmLyricsPopup.xaml
+++ b/Popups/ConfirmLyricsPopup.xaml
@@ -9,6 +9,6 @@
     mc:Ignorable="d">
 
     <ScrollView VerticalAlignment="Stretch" HorizontalAlignment="Stretch" MaxHeight="400">
-        <TextBlock x:Name="LyricText" Text="Couldn't get the song from the server. :p" TextWrapping="Wrap" />
+        <TextBlock x:Name="LyricText" Text="Couldn't get the song from the server. :p" TextWrapping="Wrap" TextAlignment="Center" />
     </ScrollView>
 </Page>

From 06a5980897407d931f8fb5b3cab66d2854a17fae Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Sat, 4 Oct 2025 01:59:53 -0400
Subject: [PATCH 32/33] clearer wording

---
 Pages/Lyrics.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pages/Lyrics.xaml b/Pages/Lyrics.xaml
index 45f66db..70bddb9 100644
--- a/Pages/Lyrics.xaml
+++ b/Pages/Lyrics.xaml
@@ -61,7 +61,7 @@
                 <SymbolIcon Symbol="More"/>
                 <Button.Flyout>
                     <MenuFlyout>
-                        <MenuFlyoutItem Text="Edit" Tag="edit" Click="MenuFlyoutItem_Click">
+                        <MenuFlyoutItem Text="Edit lyrics" Tag="edit" Click="MenuFlyoutItem_Click">
                             <MenuFlyoutItem.Icon>
                                 <SymbolIcon Symbol="Edit"/>
                             </MenuFlyoutItem.Icon>

From a911e1c41ba6632d67e9cc37c4ec5ba202776cb2 Mon Sep 17 00:00:00 2001
From: jamied <hey@isuckat.dev>
Date: Sat, 4 Oct 2025 14:37:31 -0400
Subject: [PATCH 33/33] error message on save, also removed unreliable retry
 thing

---
 Models/Song.cs                 | 39 ++++++++++------------------
 Musium.csproj                  |  4 +++
 Pages/Lyrics.xaml.cs           | 47 ++++++++++++++++++++++++++--------
 Popups/LyricErrorPopup.xaml    | 14 ++++++++++
 Popups/LyricErrorPopup.xaml.cs | 35 +++++++++++++++++++++++++
 5 files changed, 103 insertions(+), 36 deletions(-)
 create mode 100644 Popups/LyricErrorPopup.xaml
 create mode 100644 Popups/LyricErrorPopup.xaml.cs

diff --git a/Models/Song.cs b/Models/Song.cs
index 3daf318..bb3d9c4 100644
--- a/Models/Song.cs
+++ b/Models/Song.cs
@@ -79,36 +79,23 @@ public string? Lyrics
                 OnPropertyChanged();
             }
         }
-        public async Task ApplyLyricsToFileAsync()
+        public IOException? AttemptApplyLyricsToFile(string lyrics)
         {
-            const int maxRetries = 20;
-            const int delayOnRetry = 1000; // absolutely a hacky way to do this, however it works for virtual storage so :shrug:
-
-            for (int i = 0; i < maxRetries; i++)
+            try
             {
-                try
-                {
-                    using (var file = TagLib.File.Create(FilePath))
-                    {
-                        file.Tag.Lyrics = Lyrics;
-                        file.Save();
-                    }
-
-                    Debug.WriteLine("lyrics saved successfully.");
-                    return;
-                }
-                catch (IOException ex)
+                using (var file = TagLib.File.Create(FilePath))
                 {
-                    Debug.WriteLine($"attempt {i + 1} to save lyrics failed. retrying...");
-                    if (i < maxRetries - 1)
-                    {
-                        await Task.Delay(delayOnRetry);
-                    }
-                    else
-                    {
-                        Debug.WriteLine($"failed to save lyrics after {maxRetries} attempts: {ex.Message}");
-                    }
+                    file.Tag.Lyrics = lyrics;
+                    file.Save();
+                    Lyrics = lyrics;
                 }
+
+                Debug.WriteLine("lyrics saved successfully.");
+                return null;
+            }
+            catch (IOException ex)
+            {
+                return ex;
             }
         }
 
diff --git a/Musium.csproj b/Musium.csproj
index 9964123..e2068a7 100644
--- a/Musium.csproj
+++ b/Musium.csproj
@@ -28,6 +28,7 @@
     <None Remove="Popups\AddLyricsPopup.xaml" />
     <None Remove="Popups\ClearLyricsPopup.xaml" />
     <None Remove="Popups\ConfirmLyricsPopup.xaml" />
+    <None Remove="Popups\LyricErrorPopup.xaml" />
     <None Remove="Styles\GridContentStyles.xaml" />
   </ItemGroup>
 
@@ -68,6 +69,9 @@
     <None Update="Assets\Placeholder.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Page Update="Popups\LyricErrorPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Popups\ClearLyricsPopup.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Pages/Lyrics.xaml.cs b/Pages/Lyrics.xaml.cs
index 634e5f8..3d21fd8 100644
--- a/Pages/Lyrics.xaml.cs
+++ b/Pages/Lyrics.xaml.cs
@@ -37,6 +37,20 @@ private async void AddLyricsButton_Click(object sender, RoutedEventArgs e)
             await EditLyrics(true);
         }
 
+        private async void DisplayError(IOException ex)
+        {
+            ContentDialog dialog = new ContentDialog();
+
+            dialog.XamlRoot = XamlRoot;
+            dialog.Title = "An error has occurred.";
+            dialog.CloseButtonText = "Sad";
+            dialog.DefaultButton = ContentDialogButton.Close;
+            dialog.Content = new LyricErrorPopup();
+            LyricErrorPopup content = (LyricErrorPopup)dialog.Content;
+            content.SetText(ex.Message);
+
+            await dialog.ShowAsync();
+        }
         private async Task EditLyrics(bool adding = false)
         {
             if (Audio.CurrentSongPlaying == null) return;
@@ -100,8 +114,14 @@ private async Task EditLyrics(bool adding = false)
                                 if (Audio.CurrentSongPlaying == null) return;
                                 if (dialog.Content is AddLyricsPopup popup)
                                 {
-                                    Audio.CurrentSongPlaying.Lyrics = lyrics;
-                                    if (!popup.SessionChecked) await Audio.CurrentSongPlaying.ApplyLyricsToFileAsync();
+                                    if (!popup.SessionChecked) 
+                                    {
+                                        var ex = Audio.CurrentSongPlaying.AttemptApplyLyricsToFile(lyrics);
+                                        if (ex != null) DisplayError(ex);
+                                    } else
+                                    {
+                                        Audio.CurrentSongPlaying.Lyrics = lyrics;
+                                    }
                                 }
                                 break;
                             case ContentDialogResult.Secondary:
@@ -139,10 +159,17 @@ private async Task EditLyrics(bool adding = false)
                     {
                         if (Audio.CurrentSongPlaying == null) return;
                         var text = await package.GetTextAsync();
-                        Audio.CurrentSongPlaying.Lyrics = text;
                         if (dialog.Content is AddLyricsPopup popup)
                         {
-                            if (!popup.SessionChecked) await Audio.CurrentSongPlaying.ApplyLyricsToFileAsync();
+                            if (!popup.SessionChecked) 
+                            {
+                                var ex = Audio.CurrentSongPlaying.AttemptApplyLyricsToFile(text);
+                                if (ex != null) DisplayError(ex);
+                            }
+                            else
+                            {
+                                Audio.CurrentSongPlaying.Lyrics = text;
+                            };
                         }
                     }
                     break;
@@ -150,19 +177,19 @@ private async Task EditLyrics(bool adding = false)
                     break;
             }
         }
-        private async void ClearLyrics()
+        private void ClearLyrics()
         {
             Song currentSong = Audio.CurrentSongPlaying;
             if (currentSong == null) return;
-            currentSong.Lyrics = "";
-            await currentSong.ApplyLyricsToFileAsync();
+            var ex = currentSong.AttemptApplyLyricsToFile("");
+            if (ex != null) DisplayError(ex);
         }
-        private async void MarkAsInstrumental()
+        private void MarkAsInstrumental()
         {
             Song currentSong = Audio.CurrentSongPlaying;
             if (currentSong == null) return;
-            currentSong.Lyrics = "[INSTRUMENTAL]";
-            await currentSong.ApplyLyricsToFileAsync();
+            var ex = currentSong.AttemptApplyLyricsToFile("[INSTRUMENTAL]");
+            if (ex != null) DisplayError(ex);
         }
         private void MarkInstrumentalButton_Click(object sender, RoutedEventArgs e)
         {
diff --git a/Popups/LyricErrorPopup.xaml b/Popups/LyricErrorPopup.xaml
new file mode 100644
index 0000000..0d8b356
--- /dev/null
+++ b/Popups/LyricErrorPopup.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="Musium.Popups.LyricErrorPopup"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Musium.Popups"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <TextBlock x:Name="Text" TextWrapping="Wrap"/>
+    </Grid>
+</Page>
diff --git a/Popups/LyricErrorPopup.xaml.cs b/Popups/LyricErrorPopup.xaml.cs
new file mode 100644
index 0000000..59f285c
--- /dev/null
+++ b/Popups/LyricErrorPopup.xaml.cs
@@ -0,0 +1,35 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Musium.Popups
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class LyricErrorPopup : Page
+    {
+        public LyricErrorPopup()
+        {
+            InitializeComponent();
+        }
+        public void SetText(string text)
+        {
+            Text.Text = text;
+        }
+    }
+}