error message on save, also removed unreliable retry thing

Author: jamiw1

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;
             }
         }
 

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>

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,30 +159,37 @@ 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;
                 default:
                     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)
         {

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>

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;
+        }
+    }
+}