diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 8bbe0776..3fd1655a 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -20,7 +20,7 @@ jobs: dotnet-version: '7.0.101' - name: Install wasm-tools - run: dotnet workload install wasm-tools + run: dotnet workload install wasm-tools-net7 # Only publish when unit tests are ok - name: Run Unit Tests diff --git a/AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs b/AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs index 2f403e00..752ba3e1 100644 --- a/AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs +++ b/AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs @@ -70,7 +70,7 @@ static TextImportScheme() } public static readonly String DefaultSchemeCuesheet = @"(?'Cuesheet.Artist'\A.*) - (?'Cuesheet.Title'\w{1,})\t{1,}(?'Cuesheet.Audiofile'.{1,})"; - public static readonly String DefaultSchemeTracks = @"(?'Track.Artist'[a-zA-Z0-9_ .();äöü&:,'*-]{1,}) - (?'Track.Title'[a-zA-Z0-9_ .();äöü&'*-]{1,})\t{0,}(?'Track.End'.{1,})"; + public static readonly String DefaultSchemeTracks = @"(?'Track.Artist'[a-zA-Z0-9_ .();äöü&:,'*-?:]{1,}) - (?'Track.Title'[a-zA-Z0-9_ .();äöü&'*-?:]{1,})\t{0,}(?'Track.End'.{1,})"; public static readonly TextImportScheme DefaultTextImportScheme = new() { diff --git a/AudioCuesheetEditor/Shared/TracksTable.razor b/AudioCuesheetEditor/Shared/TracksTable.razor index d1d3600b..4d0f7864 100644 --- a/AudioCuesheetEditor/Shared/TracksTable.razor +++ b/AudioCuesheetEditor/Shared/TracksTable.razor @@ -745,7 +745,8 @@ along with Foobar. If not, see { foreach (var trackCurrentlyAttached in TracksAttachedToValidateablePropertyChanged) { - trackCurrentlyAttached.ValidateablePropertyChanged -= Track_ValidateablePropertyChanged; } + trackCurrentlyAttached.ValidateablePropertyChanged -= Track_ValidateablePropertyChanged; + } } else { @@ -759,6 +760,7 @@ along with Foobar. If not, see { validations.ValidateAll().GetAwaiter().GetResult(); } + StateHasChanged(); } void AttachCuesheetToSplitPointsAddedRemoved()