File for each track

AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj

@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.59.0" />
-    <PackageReference Include="MSTest" Version="4.2.3" />
+    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.62.0" />
+    <PackageReference Include="MSTest" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

AudioCuesheetEditor.End2EndTests/Models/DetailView.cs

@@ -23,8 +23,6 @@ internal class DetailView(IPage page)
 
         private readonly IPage _page = page;
 
-        internal ILocator AudiofileInput => _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "AudiofileAudiofile" }).Locator("input[type=\"file\"]");
-
         internal ILocator CuesheetArtistInput => _page.GetByRole(AriaRole.Textbox, new() { Name = "Cuesheet artist" });
 
         internal ILocator CuesheetTitleInput => _page.GetByRole(AriaRole.Textbox, new() { Name = "Cuesheet title" });
@@ -39,9 +37,19 @@ internal async Task GotoAsync()
             await _page.WaitForFunctionAsync(@"() => window.Blazor !== undefined");
         }
 
-        internal async Task AddTrackAsync()
+        internal async Task AddAudiofileAsync()
+        {
+            await _page.GetByRole(AriaRole.Button, new() { Name = "Add file" }).ClickAsync();
+        }
+
+        internal async Task SetAudiofileInputFileAsync(int audiofileIndex, string file)
+        {
+            await _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "AudiofileAudiofile" }).Nth(audiofileIndex).Locator("input[type=\"file\"]").SetInputFilesAsync(file);
+        }
+
+        internal async Task AddTrackAsync(int audiofileIndex)
         {
-            await _page.GetByRole(AriaRole.Button, new() { Name = "Add new track" }).ClickAsync();
+            await _page.GetByRole(AriaRole.Button, new() { Name = "Add new track" }).Nth(audiofileIndex).ClickAsync();
         }
 
         internal async Task EditTrackAsync(string? artist = null, string? title = null)
@@ -50,9 +58,6 @@ internal async Task EditTrackAsync(string? artist = null, string? title = null)
             {
                 await _page.Locator("td:nth-child(3)").ClickAsync();
                 await _page.Locator("td:nth-child(3)").Last.GetByRole(AriaRole.Textbox).FillAsync(artist);
-                // Autocomplete overlay will pop up, so we close it
-                await _page.Locator(".mud-popover-open").WaitForAsync(new() { State = WaitForSelectorState.Visible });
-                await _page.Keyboard.PressAsync("Escape");
                 // Click outside the autocomplete to have an focus lost event for getting the value written to model
                 await _page.GetByRole(AriaRole.Heading, new() { Name = "Playback" }).ClickAsync(new() { Force = true });
                 await _page.WaitForTimeoutAsync(100);
@@ -61,9 +66,6 @@ internal async Task EditTrackAsync(string? artist = null, string? title = null)
             {
                 await _page.Locator("td:nth-child(4)").ClickAsync();
                 await _page.Locator("td:nth-child(4)").Last.GetByRole(AriaRole.Textbox).FillAsync(title);
-                // Autocomplete overlay will pop up, so we close it
-                await _page.Locator(".mud-popover-open").WaitForAsync(new() { State = WaitForSelectorState.Visible });
-                await _page.Keyboard.PressAsync("Escape");
                 // Click outside the autocomplete to have an focus lost event for getting the value written to model
                 await _page.GetByRole(AriaRole.Heading, new() { Name = "Playback" }).ClickAsync(new() { Force = true });
                 await _page.WaitForTimeoutAsync(100);
@@ -105,16 +107,16 @@ internal async Task EditTracksModalAsync(string artist, string title, string end
             await _page.GetByRole(AriaRole.Button, new() { Name = "Save changes" }).ClickAsync();
         }
 
-        internal async Task RenameAudiofileAsync(string filename)
+        internal async Task RenameAudiofileAsync(int audiofileIndex, string filename)
         {
-            await OpenRenameAudiofileDialogAsync();
+            await OpenRenameAudiofileDialogAsync(audiofileIndex);
             await NewFileNameInput.FillAsync(filename);
             await _page.GetByRole(AriaRole.Button, new() { Name = "Ok" }).ClickAsync();
         }
 
-        internal async Task OpenRenameAudiofileDialogAsync()
+        internal async Task OpenRenameAudiofileDialogAsync(int audiofileIndex)
         {
-            await _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "AudiofileAudiofile" }).GetByLabel("More").ClickAsync();
+            await _page.GetByRole(AriaRole.Group).Filter(new() { HasText = "AudiofileAudiofile" }).Nth(audiofileIndex).GetByLabel("More").ClickAsync();
             await _page.GetByText("Rename file").ClickAsync();
         }
     }

AudioCuesheetEditor.End2EndTests/Models/ImportView.cs

@@ -23,6 +23,9 @@ partial class ImportView(IPage page, bool mobile)
         [GeneratedRegex("^Scheme common data$")]
         private static partial Regex SchemeCommonData();
 
+        [GeneratedRegex("^Scheme audiofiles$")]
+        private static partial Regex SchemeAudiofiles();
+
         internal const string BaseUrl = "http://localhost:5132/";
 
         private readonly IPage _page = page;
@@ -105,6 +108,11 @@ internal async Task ClearSchemeCommonDataAsync()
             await _page.Locator("div").Filter(new() { HasTextRegex = SchemeCommonData() }).GetByLabel("Clear").ClickAsync();
         }
 
+        internal async Task ClearSchemeAudiofilesAsync()
+        {
+            await _page.Locator("div").Filter(new() { HasTextRegex = SchemeAudiofiles() }).GetByLabel("Clear").ClickAsync();
+        }
+
         internal async Task SetSchemeCommonDataAsync(string schemeCommonData)
         {
             await _page.GetByRole(AriaRole.Textbox, new() { Name = "Scheme common data" }).FillAsync(schemeCommonData);

AudioCuesheetEditor.End2EndTests/Sample_Inputfile.txt

@@ -1,4 +1,5 @@
-CuesheetArtist - CuesheetTitle					c:\AudioFile.mp3
+CuesheetArtist - CuesheetTitle
+- c:\AudioFile.mp3
 Sample Artist 1 - Sample Title 1				00:05:00
 Sample Artist 2 - Sample Title 2				00:09:23
 Sample Artist 3 - Sample Title 3				00:15:54

AudioCuesheetEditor.End2EndTests/Sample_Project.ace

@@ -1 +1 @@
-{"Tracks":[{"Position":1,"Artist":"Sample Artist 1","Title":"Sample Title 1","Begin":"00:00:00","End":"00:05:00","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":2,"Artist":"Sample Artist 2","Title":"Sample Title 2","Begin":"00:05:00","End":"00:09:23","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":3,"Artist":"Sample Artist 3","Title":"Sample Title 3","Begin":"00:09:23","End":"00:15:54","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":4,"Artist":"Sample Artist 4","Title":"Sample Title 4","Begin":"00:15:54","End":"00:20:13","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":5,"Artist":"Sample Artist 5","Title":"Sample Title 5","Begin":"00:20:13","End":"00:24:54","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":6,"Artist":"Sample Artist 6","Title":"Sample Title 6","Begin":"00:24:54","End":"00:31:54","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":7,"Artist":"Sample Artist 7","Title":"Sample Title 7","Begin":"00:31:54","End":"00:45:54","Flags":[],"IsLinkedToPreviousTrack":false},{"Position":8,"Artist":"Sample Artist 8","Title":"Sample Title 8","Begin":"00:45:54","Flags":[],"IsLinkedToPreviousTrack":false}],"Artist":"Sample CD Artist","Title":"Sample CD Title","Audiofile":{"Name":"Sample.mp3"},"Sections":[]}
+{"Artist":"Sample CD Artist","Title":"Sample CD Title","Audiofiles":[{"Tracks":[{"Position":1,"Artist":"Sample Artist 1","Title":"Sample Title 1","Begin":"00:00:00","End":"00:05:00","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":2,"Artist":"Sample Artist 2","Title":"Sample Title 2","Begin":"00:05:00","End":"00:09:23","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":3,"Artist":"Sample Artist 3","Title":"Sample Title 3","Begin":"00:09:23","End":"00:15:54","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":4,"Artist":"Sample Artist 4","Title":"Sample Title 4","Begin":"00:15:54","End":"00:20:13","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":5,"Artist":"Sample Artist 5","Title":"Sample Title 5","Begin":"00:20:13","End":"00:24:54","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":6,"Artist":"Sample Artist 6","Title":"Sample Title 6","Begin":"00:24:54","End":"00:31:54","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":7,"Artist":"Sample Artist 7","Title":"Sample Title 7","Begin":"00:31:54","End":"00:45:54","Flags":[],"IsLinkedToPreviousTrack":true},{"Position":8,"Artist":"Sample Artist 8","Title":"Sample Title 8","Begin":"00:45:54","End":"01:15:54","Flags":[],"IsLinkedToPreviousTrack":true}]}]}

AudioCuesheetEditor.End2EndTests/Tests/Desktop/BasicTest.cs

@@ -45,8 +45,9 @@ public async Task Audiofile_ShouldBeRenamed_WhenEditingFilename()
         {
             var detailView = new DetailView(TestPage);
             await detailView.GotoAsync();
-            await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
-            await detailView.RenameAudiofileAsync("Kalimba test 123.mp3");
+            await detailView.AddAudiofileAsync();
+            await detailView.SetAudiofileInputFileAsync(0, "Kalimba.mp3");
+            await detailView.RenameAudiofileAsync(0, "Kalimba test 123.mp3");
             await Expect(TestPage.GetByRole(AriaRole.Textbox, new() { Name = "Audiofile" })).ToMatchAriaSnapshotAsync("- textbox \"Audiofile\": Kalimba test 123.mp3");
         }
 
@@ -70,12 +71,65 @@ public async Task ChangeLanguage_ShouldSwitchLanguage_WhenGermanIsSelected()
             await bar.ChangeLanguageAsync("German (Germany)");
             await Expect(TestPage.GetByRole(AriaRole.Heading, new() { Name = "Allgemeine Informationen" })).ToBeVisibleAsync();
             await Expect(TestPage.GetByText("Aufnahmeansicht")).ToBeVisibleAsync();
-            await Expect(TestPage.GetByRole(AriaRole.Heading, new() { Name = "Titel" })).ToBeVisibleAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Heading, new() { Name = "Dateien" })).ToBeVisibleAsync();
             await Expect(TestPage.GetByRole(AriaRole.Heading, new() { Name = "Wiedergabe" })).ToBeVisibleAsync();
             await bar.OpenExportDialogAsync("Textdatei", "Datei");
-            await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToMatchAriaSnapshotAsync("- tabpanel:\n  - text: \"Export ist derzeit nicht möglich: Titel hat ungültige Anzahl (0)! Künstler hat keinen Wert! Titel hat keinen Wert! Audiodatei hat keinen Wert! YouTube\"\n  - group \"Exportprofil auswählen\"\n  - text: Exportprofil auswählen\n  - group:\n    - button \"Neues Exportprofil hinzufügen\"\n    - button \"Ausgewähltes Exportprofil löschen\"\n  - separator\n  - textbox \"Name\": YouTube\n  - group \"Name\"\n  - text: Name\n  - textbox \"Dateiname\": YouTube.txt\n  - group \"Dateiname\"\n  - text: Dateiname\n  - textbox \"Schema Kopf\": \"%Cuesheet.Artist% - %Cuesheet.Title%\"\n  - button \"Clear\"\n  - button\n  - group \"Schema Kopf\"\n  - text: Schema Kopf\n  - textbox \"Schema Titel\": \"%Track.Artist% - %Track.Title% %Track.Begin%\"\n  - button \"Clear\"\n  - button\n  - group \"Schema Titel\"\n  - text: Schema Titel\n  - textbox \"Schema Fuß\"\n  - button\n  - group \"Schema Fuß\"\n  - text: Schema Fuß");
+            await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToMatchAriaSnapshotAsync(@"- dialog ""Exportprofile Close"":
+  - heading ""Exportprofile"" [level=6]
+  - button ""Close""
+  - tablist:
+    - tab ""Export konfigurieren"" [selected]:
+      - paragraph: Export konfigurieren
+    - tab ""2 Export herunterladen"" [disabled]:
+      - text: ""2""
+      - paragraph: Export herunterladen
+  - tabpanel ""Export konfigurieren"":
+    - text: ""Export ist derzeit nicht möglich: Künstler hat keinen Wert! Titel hat keinen Wert! Audiodateien hat ungültige Anzahl (0)!""
+    - combobox ""Exportprofil auswählen"": YouTube
+    - group ""Exportprofil auswählen""
+    - text: Exportprofil auswählen
+    - group:
+      - button ""Neues Exportprofil hinzufügen""
+      - button ""Ausgewähltes Exportprofil löschen""
+    - separator
+    - textbox ""Name"":
+      - /placeholder: Geben Sie hier den Namen für dieses Profil ein
+      - text: YouTube
+    - group ""Name""
+    - text: Name
+    - textbox ""Dateiname"":
+      - /placeholder: Geben Sie hier den Dateinamen für dieses Profil ein
+      - text: YouTube.txt
+    - group ""Dateiname""
+    - text: Dateiname
+    - textbox ""Schema Kopf"":
+      - /placeholder: Geben Sie hier das Kopf-Schema für dieses Profil ein
+      - text: ""%Cuesheet.Artist% - %Cuesheet.Title%""
+    - button ""Clear""
+    - button
+    - group ""Schema Kopf""
+    - text: Schema Kopf
+    - textbox ""Schema Audiodateien"":
+      - /placeholder: Geben Sie hier das Audiodatei-Schema für dieses Profil ein
+    - button
+    - group ""Schema Audiodateien""
+    - text: Schema Audiodateien
+    - textbox ""Schema Titel"":
+      - /placeholder: Geben Sie hier das Titel-Schema für dieses Profil ein
+      - text: ""%Track.Artist% - %Track.Title% %Track.Begin%""
+    - button ""Clear""
+    - button
+    - group ""Schema Titel""
+    - text: Schema Titel
+    - textbox ""Schema Fuß"":
+      - /placeholder: Geben Sie hier das Fuß-Schema für dieses Profil ein
+    - button
+    - group ""Schema Fuß""
+    - text: Schema Fuß
+  - button ""Previous"" [disabled]
+  - button ""Next"" [disabled]");
             await exportDialog.OpenSchemeMenuAsync("Schema Kopf");
-            await Expect(TestPage.Locator("#app")).ToMatchAriaSnapshotAsync("- paragraph: Künstler\n- paragraph: Titel\n- paragraph: Audiodatei\n- paragraph: CDTextdatei\n- paragraph: Katalognummer\n- paragraph: Datum\n- paragraph: Datum & Uhrzeit\n- paragraph: Uhrzeit");
+            await Expect(TestPage.Locator("#app")).ToMatchAriaSnapshotAsync("- paragraph: Künstler\n- paragraph: Titel\n- paragraph: CDTextdatei\n- paragraph: Katalognummer\n- paragraph: Datum\n- paragraph: Datum & Uhrzeit\n- paragraph: Uhrzeit");
             await TestPage.GetByText("CDTextdatei").ClickAsync();
             await exportDialog.OpenSchemeMenuAsync("Schema Titel");
             await Expect(TestPage.GetByTestId("menu-wrapper")).ToMatchAriaSnapshotAsync("- paragraph: Position\n- paragraph: Künstler\n- paragraph: Titel\n- paragraph: Begin\n- paragraph: End\n- paragraph: Länge\n- paragraph: Markierungen\n- paragraph: Vorlücke\n- paragraph: Nachlücke");
@@ -84,23 +138,23 @@ public async Task ChangeLanguage_ShouldSwitchLanguage_WhenGermanIsSelected()
         [TestMethod]
         public async Task TrackTableControls_ShouldBeEnabled_WhenSelectingFirstTrackAsync()
         {
-            var bar = new AppBar(TestPage);
             var detailView = new DetailView(TestPage);
             await detailView.GotoAsync();
-            await detailView.AddTrackAsync();
-            await detailView.AddTrackAsync();
+            await detailView.AddAudiofileAsync();
+            await detailView.AddTrackAsync(0);
+            await detailView.AddTrackAsync(0);
             await detailView.SelectTracksAsync([1]);
-            await bar.ChangeLanguageAsync("German (Germany)");
             await Expect(TestPage.GetByLabel("Track table controls")).ToMatchAriaSnapshotAsync(@"- group:
-  - button ""Neuen Titel hinzufügen""
-  - button ""Ausgewählte Titel bearbeiten""
-  - button ""Ausgewählten Titel kopieren""
-  - button ""Ausgewählte Titel löschen""
-  - button ""Alle Titel löschen""
+  - button ""Add new track""
+  - button ""Edit selected tracks""
+  - button ""Copy selected tracks""
+  - button ""Delete selected tracks""
+  - button ""Delete all tracks""
+- group:
+  - button ""Move selected tracks up"" [disabled]
+  - button ""Move selected tracks down""
 - group:
-  - button ""Ausgewählte Titel nach oben bewegen"" [disabled]
-  - button ""Ausgewählte Titel nach unten bewegen""
-- button ""Fester Tabellenkopf""");
+  - button ""Fixed table header""");
         }
 
         [TestMethod]
@@ -112,26 +166,32 @@ public async Task KeyboardCommands_ShouldControlDialogs_WhenUsingEnterOrEscapeAs
             await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
             await bar.OpenExportDialogAsync("Cuesheet");
             await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
+            await TestPage.GetByRole(AriaRole.Dialog).FocusAsync();
             await TestPage.Keyboard.PressAsync("Escape");
             await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
             await bar.OpenExportDialogAsync("Projectfile");
             await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
+            await TestPage.GetByRole(AriaRole.Dialog).FocusAsync();
             await TestPage.Keyboard.PressAsync("Escape");
             await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
             await bar.OpenExportDialogAsync("Textfile");
             await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
+            await TestPage.GetByRole(AriaRole.Dialog).FocusAsync();
             await TestPage.Keyboard.PressAsync("Escape");
             await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
             await bar.OpenSettingsAsync();
             await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
+            await TestPage.GetByRole(AriaRole.Dialog).FocusAsync();
             await TestPage.Keyboard.PressAsync("Escape");
             await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
             await bar.OpenDisplayHotkeysAsync();
             await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
+            await TestPage.GetByRole(AriaRole.Dialog).FocusAsync();
             await TestPage.Keyboard.PressAsync("Escape");
             await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
-            await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
-            await detailView.OpenRenameAudiofileDialogAsync();
+            await detailView.AddAudiofileAsync();
+            await detailView.SetAudiofileInputFileAsync(0, "Kalimba.mp3");
+            await detailView.OpenRenameAudiofileDialogAsync(0);
             await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
             await detailView.NewFileNameInput.FillAsync("Test 123");
             await TestPage.Keyboard.PressAsync("Enter");