\\s*| \\d+ | \\s*(?.*?) | \\s*(?.*?)</td>\\s*<td>(?<StartDateTime>.*?)</td>\\s*</tr>"
};
var fileContent = File.ReadAllText("Resources/Traktor Export.html");
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
var options = new ImportOptions
{
SelectedImportProfile = profile
};
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
var applicationOptions = new ApplicationOptions();
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
// Act
- var importFile = await service.AnalyseAsync(fileContent);
+ var importFile = await _textImportService.AnalyseAsync(fileContent);
// Assert
Assert.AreEqual(fileContent, importFile.FileContent);
Assert.IsNull(importFile.AnalyseException);
@@ -616,17 +598,15 @@ public async Task AnalyseAsync_WithoutRegularExpression_ReturnsCuesheetAsync()
SchemeTracks = "Artist - Title\tBegin"
};
var fileContent = File.ReadAllText("Resources/Textimport with Cuesheetdata.txt");
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
var options = new ImportOptions
{
SelectedImportProfile = profile
};
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
var applicationOptions = new ApplicationOptions();
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
// Act
- var importFile = await service.AnalyseAsync(fileContent);
+ var importFile = await _textImportService.AnalyseAsync(fileContent);
// Assert
Assert.IsNull(importFile.AnalyseException);
Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -689,17 +669,15 @@ public async Task AnalyseAsync_TextfileWithStartDateTime_CreatesValidCuesheetAsy
UseRegularExpression = false,
SchemeTracks = $"{nameof(ImportTrack.Artist)}~{nameof(ImportTrack.Title)}~{nameof(ImportTrack.StartDateTime)}"
};
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
var options = new ImportOptions
{
SelectedImportProfile = profile
};
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
var applicationOptions = new ApplicationOptions();
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
// Act
- var importFile = await service.AnalyseAsync(fileContent);
+ var importFile = await _textImportService.AnalyseAsync(fileContent);
// Assert
Assert.IsNull(importFile.AnalyseException);
Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -726,17 +704,15 @@ public async Task AnalyseAsync_WithCommonDataMatchingMultipleLines_SetsCommonDat
SchemeTracks = "Artist - Title\tBegin"
};
var fileContent = File.ReadAllText("Resources/Sample_Inputfile.txt");
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
var options = new ImportOptions
{
SelectedImportProfile = profile
};
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
var applicationOptions = new ApplicationOptions();
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
+ _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
// Act
- var importFile = await service.AnalyseAsync(fileContent);
+ var importFile = await _textImportService.AnalyseAsync(fileContent);
// Assert
Assert.IsNull(importFile.AnalyseException);
Assert.IsNotNull(importFile.AnalyzedCuesheet);
diff --git a/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs b/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs
index b7e8ef56..a8205c0f 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs
@@ -16,6 +16,7 @@
using AudioCuesheetEditor.Data.Options;
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.Options;
+using AudioCuesheetEditor.Model.Utility;
using AudioCuesheetEditor.Services.UI;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
@@ -109,5 +110,67 @@ public void GetTimespanFormatted_InvalidFormat_FallbackToDefault()
// Assert
Assert.AreEqual("01:30:27.2001030", result);
}
+
+ [TestMethod()]
+ public async Task GetTimespanAsync_CustomValidFormat_ReturnsTimeSpanAsync()
+ {
+ // Arrange
+ var options = new ApplicationOptions()
+ {
+ TimeSpanFormat = new()
+ {
+ Scheme = $"{TimeSpanFormat.Hours}-{TimeSpanFormat.Minutes}-{TimeSpanFormat.Seconds}"
+ }
+ };
+ var mockOptionsProvider = new Mock<ILocalStorageOptionsProvider>();
+ mockOptionsProvider
+ .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
+ .ReturnsAsync(options);
+ var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
+ // Act
+ var result = await parser.GetTimespanAsync("23-45-56");
+ // Assert
+ Assert.IsNotNull(result);
+ Assert.AreEqual(new TimeSpan(23, 45, 56), result);
+ }
+
+ [TestMethod()]
+ public async Task GetTimespanAsync_CustomInvalidFormat_ReturnsNullAsync()
+ {
+ // Arrange
+ var options = new ApplicationOptions()
+ {
+ TimeSpanFormat = new()
+ {
+ Scheme = $"INVALID_FORMAT"
+ }
+ };
+ var mockOptionsProvider = new Mock<ILocalStorageOptionsProvider>();
+ mockOptionsProvider
+ .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
+ .ReturnsAsync(options);
+ var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
+ // Act
+ var result = await parser.GetTimespanAsync("23-45-56");
+ // Assert
+ Assert.IsNull(result);
+ }
+
+ [TestMethod()]
+ public async Task GetTimespanAsync_DefaultFormat_ReturnsTimeSpanAsync()
+ {
+ // Arrange
+ var options = new ApplicationOptions();
+ var mockOptionsProvider = new Mock<ILocalStorageOptionsProvider>();
+ mockOptionsProvider
+ .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
+ .ReturnsAsync(options);
+ var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
+ // Act
+ var result = await parser.GetTimespanAsync("23:45:56");
+ // Assert
+ Assert.IsNotNull(result);
+ Assert.AreEqual(new TimeSpan(23, 45, 56), result);
+ }
}
}
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index 41606bdf..6a2cfe22 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -13,25 +13,28 @@
//You should have received a copy of the GNU General Public License
//along with Foobar. If not, see
//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Data.Options;
using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.IO.Audio;
using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.Options;
using AudioCuesheetEditor.Services.UI;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
+using System;
+using System.Threading.Tasks;
namespace AudioCuesheetEditor.Tests.Services.UI
{
[TestClass]
public class SessionStateContainerTests
{
- private readonly Mock<ITraceChangeManager> traceChangeManagerMock;
- private readonly SessionStateContainer sessionStateContainer;
+ private readonly SessionStateContainer _sessionStateContainer;
+ private readonly Mock<ILocalStorageOptionsProvider> _localStorageOptionsProvider;
public SessionStateContainerTests()
{
- traceChangeManagerMock = new Mock<ITraceChangeManager>();
- sessionStateContainer = new SessionStateContainer(traceChangeManagerMock.Object);
+ _localStorageOptionsProvider = new();
+ _sessionStateContainer = new(_localStorageOptionsProvider.Object);
}
[TestMethod]
@@ -40,17 +43,13 @@ public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
// Arrange
var newCuesheet = new Cuesheet();
bool eventTriggered = false;
- bool traceablePropertyChangedFired = false;
- sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
- sessionStateContainer.TraceablePropertyChanged += (sender, args) => traceablePropertyChangedFired = true;
+ _sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
// Act
- sessionStateContainer.Cuesheet = newCuesheet;
+ _sessionStateContainer.Cuesheet = newCuesheet;
// Assert
Assert.IsTrue(eventTriggered);
- Assert.IsTrue(traceablePropertyChangedFired);
- traceChangeManagerMock.Verify(m => m.TraceChanges(newCuesheet), Times.Once);
}
[TestMethod]
@@ -59,47 +58,93 @@ public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
// Arrange
var newImportCuesheet = new Cuesheet();
bool eventTriggered = false;
- sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
+ _sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
// Act
- sessionStateContainer.ImportCuesheet = newImportCuesheet;
+ _sessionStateContainer.ImportCuesheet = newImportCuesheet;
// Assert
Assert.IsTrue(eventTriggered);
}
[TestMethod]
- public void ImportAudiofile_SetNewValue_ShouldUpdateImportCuesheetAndTriggerEvent()
+ public void ResetImport_ShouldClearImportProperties()
{
// Arrange
- var importCuesheet = new Cuesheet();
- var audioFile = new Audiofile("Test audio file.mp3");
- sessionStateContainer.ImportCuesheet = importCuesheet;
- bool eventTriggered = false;
- sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
+ _sessionStateContainer.Importfile = Mock.Of<IImportfile>();
+ _sessionStateContainer.ImportCuesheet = new Cuesheet();
// Act
- sessionStateContainer.ImportAudiofile = audioFile;
+ _sessionStateContainer.ResetImport();
// Assert
- Assert.AreEqual(audioFile, importCuesheet.Audiofile);
- Assert.IsTrue(eventTriggered);
+ Assert.IsNull(_sessionStateContainer.Importfile);
+ Assert.IsNull(_sessionStateContainer.ImportAudiofile);
+ Assert.IsNull(_sessionStateContainer.ImportCuesheet);
}
[TestMethod]
- public void ResetImport_ShouldClearImportProperties()
+ public async Task InitializeAsync_NotInitialized_ShouldInitializeAsync()
+ {
+ // Arrange
+ var viewOptions = new ViewOptions();
+ _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+ // Act
+ await _sessionStateContainer.InitializeAsync();
+ // Assert
+ _localStorageOptionsProvider.Verify(x => x.GetOptionsAsync<ViewOptions>(), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task InitializeAsync_Initialized_ShouldNoptInitializeAsync()
+ {
+ // Arrange
+ var viewOptions = new ViewOptions();
+ _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+ await _sessionStateContainer.InitializeAsync();
+ // Act
+ await _sessionStateContainer.InitializeAsync();
+ // Assert
+ _localStorageOptionsProvider.Verify(x => x.GetOptionsAsync<ViewOptions>(), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task GetActiveCuesheet_Initialized_ReturnsDetailViewCuesheeetAsync()
{
// Arrange
- sessionStateContainer.Importfile = Mock.Of<IImportfile>();
- sessionStateContainer.ImportCuesheet = new Cuesheet();
+ var viewOptions = new ViewOptions();
+ _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+ await _sessionStateContainer.InitializeAsync();
+ // Act
+ var result = _sessionStateContainer.GetActiveCuesheet();
+ // Assert
+ Assert.AreEqual(_sessionStateContainer.Cuesheet, result);
+ }
+ [TestMethod]
+ public async Task GetActiveCuesheet_InitializedWithImportView_ReturnsDetailViewCuesheeetAsync()
+ {
+ // Arrange
+ var viewOptions = new ViewOptions()
+ {
+ ActiveTab = ViewMode.ImportView
+ };
+ _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+ await _sessionStateContainer.InitializeAsync();
// Act
- sessionStateContainer.ResetImport();
+ var result = _sessionStateContainer.GetActiveCuesheet();
+ // Assert
+ Assert.AreEqual(_sessionStateContainer.ImportCuesheet, result);
+ }
+ [TestMethod]
+ public void GetActiveCuesheet_NotInitialized_ThrowsException()
+ {
+ // Arrange
+ // Act
+ var exception = Assert.Throws<InvalidOperationException>(() => _sessionStateContainer.GetActiveCuesheet());
// Assert
- Assert.IsNull(sessionStateContainer.Importfile);
- Assert.IsNull(sessionStateContainer.ImportAudiofile);
- Assert.IsNull(sessionStateContainer.ImportCuesheet);
+ Assert.AreEqual("Not initialized!", exception.Message);
}
}
}
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 195cbcb3..98b99a17 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -14,12 +14,10 @@
//along with Foobar. If not, see
//<http: //www.gnu.org/licenses />.
using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.Entity;
using AudioCuesheetEditor.Services.UI;
using AudioCuesheetEditor.Tests.Utility;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
-using System.Collections.Generic;
using System.Linq;
namespace AudioCuesheetEditor.Tests.Services.UI
@@ -27,386 +25,331 @@ namespace AudioCuesheetEditor.Tests.Services.UI
[TestClass()]
public class TraceChangeManagerTests
{
- private static T CallInItsOwnScope<T>(Func<T> getter)
- {
- return getter();
- }
+ private readonly TraceChangeManager _traceChangeManager = new(TestHelper.CreateLogger<TraceChangeManager>());
[TestMethod()]
- public void TraceChangesTest()
+ public void AddChange_SingleChange_EnablesUndo()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var callResult = CallInItsOwnScope(() =>
+ // Arrange
+ var cuesheet = new Cuesheet
{
- var track = new Track();
- manager.TraceChanges(track);
- var track2 = new Track();
- manager.TraceChanges(track2);
- track2.Title = "Title 2";
- track.Artist = "Artist 1";
- track = null;
- GC.Collect();
- return track2;
- });
- GC.Collect();
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- Assert.IsNull(callResult.Title);
- Assert.IsFalse(manager.CanUndo);
+ Artist = "Test Artist 1"
+ };
+ var tracedObjectHistoryChangedFired = false;
+ _traceChangeManager.TracedObjectHistoryChanged += delegate
+ {
+ tracedObjectHistoryChangedFired = true;
+ };
+ // Act
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Artist))));
+ // Assert
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ Assert.IsFalse(_traceChangeManager.CanRedo);
+ Assert.IsTrue(tracedObjectHistoryChangedFired);
}
[TestMethod()]
- public void UndoTest()
+ public void AddChange_BulkChange_EnablesUndo()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var track = new Track();
- manager.TraceChanges(track);
- Assert.IsFalse(manager.CanUndo);
- manager.Undo();
- track.Position = 3;
- Assert.IsTrue(manager.CanUndo);
- track.Artist = "Artist";
- track.End = new TimeSpan(0, 3, 23);
- manager.Undo();
- Assert.IsTrue(manager.CanRedo);
- Assert.IsNull(track.End);
- var track2 = new Track();
- manager.TraceChanges(track2);
- track2.Position = 5;
- Assert.IsFalse(manager.CanRedo);
- track2.Artist = "Artist 2";
- track2.Title = "Title 2";
- track2.Length = new TimeSpan(0, 4, 12);
- Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
- manager.Undo();
- Assert.IsNull(track2.Length);
+ // Arrange
+ var cuesheet = new Cuesheet
+ {
+ Artist = "Test Artist 1",
+ Title = "Test Title 1",
+ Cataloguenumber = "1234567890"
+ };
+ var tracedObjectHistoryChangedFired = false;
+ _traceChangeManager.TracedObjectHistoryChanged += delegate
+ {
+ tracedObjectHistoryChangedFired = true;
+ };
+ _traceChangeManager.BulkEdit = true;
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Artist))));
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Title))));
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Cataloguenumber))));
+ // Act
+ _traceChangeManager.BulkEdit = false;
+ // Assert
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ Assert.IsFalse(_traceChangeManager.CanRedo);
+ Assert.IsTrue(tracedObjectHistoryChangedFired);
}
[TestMethod()]
- public void RedoTest()
+ public void BulkEdit_WithoutChange_DoesntAddChange()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var track = new Track();
- manager.TraceChanges(track);
- Assert.IsFalse(manager.CanUndo);
- track.Position = 3;
- Assert.IsTrue(manager.CanUndo);
- track.Artist = "Artist";
- track.End = new TimeSpan(0, 3, 23);
- Assert.IsFalse(manager.CanRedo);
- manager.Redo();
- manager.Undo();
- Assert.IsTrue(manager.CanRedo);
- Assert.IsNull(track.End);
- manager.Redo();
- Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
- var track2 = new Track();
- manager.TraceChanges(track2);
- track2.Position = 5;
- Assert.IsFalse(manager.CanRedo);
- track2.Artist = "Artist 2";
- track2.Title = "Title 2";
- track2.Length = new TimeSpan(0, 4, 12);
- Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
- manager.Undo();
- Assert.IsNull(track2.Length);
- manager.Redo();
- Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
+ // Arrange
+ _traceChangeManager.BulkEdit = true;
+ // Act
+ _traceChangeManager.BulkEdit = false;
+ // Assert
+ Assert.IsFalse(_traceChangeManager.CanUndo);
}
[TestMethod()]
- public void UndoRedoCombinationTest()
+ public void BulkEdit_AlreadyEnabledBulkEdit_DoesntDropPreviousEdits()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var track = new Track();
- manager.TraceChanges(track);
- Assert.IsFalse(manager.CanUndo);
- track.Position = 3;
- Assert.IsTrue(manager.CanUndo);
- track.Artist = "Artist";
- track.End = new TimeSpan(0, 3, 23);
- Assert.IsFalse(manager.CanRedo);
- manager.Redo();
- manager.Undo();
- Assert.IsTrue(manager.CanRedo);
- Assert.IsNull(track.End);
- manager.Redo();
- Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- Assert.IsNull(track.End);
- manager.Redo();
- Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
+ // Arrange
+ var cuesheet = new Cuesheet
+ {
+ Artist = "Test Artist 1",
+ Title = "Test Title 1",
+ Cataloguenumber = "1234567890"
+ };
+ _traceChangeManager.BulkEdit = true;
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Artist))));
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Title))));
+ _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Cataloguenumber))));
+ _traceChangeManager.BulkEdit = true;
+ _traceChangeManager.BulkEdit = false;
+ // Act
+ _traceChangeManager.Undo();
+ // Assert
+ Assert.IsNull(cuesheet.Artist);
+ Assert.IsNull(cuesheet.Title);
+ Assert.IsNull(cuesheet.Cataloguenumber);
+ Assert.IsTrue(_traceChangeManager.CanRedo);
}
[TestMethod()]
- public void TrackListTest()
+ public void Undo_SingleChange_UndoesChange()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var cuesheet = new Cuesheet();
- manager.TraceChanges(cuesheet);
- Assert.IsFalse(manager.CanUndo);
- cuesheet.AddTrack(new Track());
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- Assert.IsEmpty(cuesheet.Tracks);
- Assert.IsTrue(manager.CanRedo);
- manager.Redo();
- Assert.HasCount(1, cuesheet.Tracks);
- Assert.IsFalse(manager.CanRedo);
+ // Arrange
+ var track = new Track
+ {
+ Position = 3
+ };
+ var undoDoneEventFired = false;
+ _traceChangeManager.UndoDone += delegate
+ {
+ undoDoneEventFired = true;
+ };
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+ // Act
+ _traceChangeManager.Undo();
+ // Assert
+ Assert.IsNull(track.Position);
+ Assert.IsTrue(undoDoneEventFired);
+ Assert.IsFalse(_traceChangeManager.CanUndo);
+ Assert.IsTrue(_traceChangeManager.CanRedo);
}
[TestMethod()]
- public void RemoveTracksTest()
+ public void Undo_BulkChange_UndoesChanges()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var cuesheet = new Cuesheet();
- manager.TraceChanges(cuesheet);
- var track1 = new Track()
+ // Arrange
+ var track = new Track
{
- Artist = "Track 1 Artist",
- Title = "Track 1 Title",
- End = new TimeSpan(0, 2, 30)
+ Position = 3,
+ Artist = "Artist"
};
- var track2 = new Track()
+ var undoDoneEventFired = false;
+ _traceChangeManager.UndoDone += delegate
{
- Artist = "Track 2 Artist",
- Title = "Track 2 Title",
- End = new TimeSpan(0, 4, 20)
+ undoDoneEventFired = true;
};
- var track3 = new Track()
+ _traceChangeManager.BulkEdit = true;
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Artist))));
+ _traceChangeManager.BulkEdit = false;
+ // Act
+ _traceChangeManager.Undo();
+ // Assert
+ Assert.IsNull(track.Position);
+ Assert.IsNull(track.Artist);
+ Assert.IsTrue(undoDoneEventFired);
+ Assert.IsFalse(_traceChangeManager.CanUndo);
+ Assert.IsTrue(_traceChangeManager.CanRedo);
+ }
+
+ [TestMethod()]
+ public void Redo_SingleChange_UndoesChange()
+ {
+ // Arrange
+ var track = new Track
{
- Artist = "Track 3 Artist",
- Title = "Track 3 Title",
- End = new TimeSpan(0, 7, 12)
+ Position = 3
};
- var track4 = new Track()
+ var redoDoneEventFired = false;
+ _traceChangeManager.RedoDone += delegate
{
- Artist = "Track 4 Artist",
- Title = "Track 4 Title",
- End = new TimeSpan(0, 9, 12)
+ redoDoneEventFired = true;
};
- cuesheet.AddTrack(track1);
- cuesheet.AddTrack(track2);
- cuesheet.AddTrack(track3);
- cuesheet.AddTrack(track4);
- Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
- Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
- Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
- Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
- var tracksToRemove = new List<Track>
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+ _traceChangeManager.Undo();
+ // Act
+ _traceChangeManager.Redo();
+ // Assert
+ Assert.AreEqual((ushort)3, track.Position);
+ Assert.IsTrue(redoDoneEventFired);
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ Assert.IsFalse(_traceChangeManager.CanRedo);
+ }
+
+ [TestMethod()]
+ public void Redo_BulkChange_UndoesChanges()
+ {
+ // Arrange
+ var track = new Track
{
- track2,
- track4
+ Position = 3,
+ Artist = "Artist"
};
- cuesheet.RemoveTracks(tracksToRemove);
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- Assert.HasCount(4, cuesheet.Tracks);
- //We need to set object references back to cue sheet tracks since TraceChangeManager creates new objects
- track1 = cuesheet.Tracks.ElementAt(0);
- track2 = cuesheet.Tracks.ElementAt(1);
- track3 = cuesheet.Tracks.ElementAt(2);
- track4 = cuesheet.Tracks.ElementAt(3);
- Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
- Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
- Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
- Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
+ var redoDoneEventFired = false;
+ _traceChangeManager.RedoDone += delegate
+ {
+ redoDoneEventFired = true;
+ };
+ _traceChangeManager.BulkEdit = true;
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Artist))));
+ _traceChangeManager.BulkEdit = false;
+ _traceChangeManager.Undo();
+ // Act
+ _traceChangeManager.Redo();
+ // Assert
+ Assert.AreEqual((ushort)3, track.Position);
+ Assert.AreEqual("Artist", track.Artist);
+ Assert.IsTrue(redoDoneEventFired);
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ Assert.IsFalse(_traceChangeManager.CanRedo);
}
- [TestMethod()]
- public void ResetTest()
+ [TestMethod]
+ public void Undo_ObjectReferences_UndoesChanges()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- Assert.IsFalse(manager.CanUndo);
- Assert.IsFalse(manager.CanRedo);
- var cuesheet = new Cuesheet();
- manager.TraceChanges(cuesheet);
- var track1 = new Track()
+ // Arrange
+ var cuesheet = new Cuesheet()
{
- Artist = "Track 1 Artist",
- Title = "Track 1 Title",
- End = new TimeSpan(0, 2, 30)
+ Tracks = [new()]
+ };
+ var undoDoneEventFired = false;
+ _traceChangeManager.UndoDone += delegate
+ {
+ undoDoneEventFired = true;
};
- cuesheet.AddTrack(track1);
- Assert.IsTrue(manager.CanUndo);
- manager.Reset();
- Assert.IsFalse(manager.CanUndo);
- Assert.IsFalse(manager.CanRedo);
+ _traceChangeManager.AddChange(new(cuesheet, new(Enumerable.Empty<Track>(), nameof(Cuesheet.Tracks))));
+ // Act
+ _traceChangeManager.Undo();
+ // Assert
+ Assert.IsEmpty(cuesheet.Tracks);
+ Assert.IsFalse(_traceChangeManager.CanUndo);
+ Assert.IsTrue(_traceChangeManager.CanRedo);
+ Assert.IsTrue(undoDoneEventFired);
}
- [TestMethod()]
- public void BulkEditTracksTest()
+ [TestMethod]
+ public void Redo_ObjectReferences_UndoesChanges()
{
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var cuesheet = new Cuesheet();
- manager.TraceChanges(cuesheet);
- var tracedObjectHistoryChangedFired = false;
- manager.TracedObjectHistoryChanged += delegate
+ // Arrange
+ var cuesheet = new Cuesheet()
{
- tracedObjectHistoryChangedFired = true;
+ Tracks = [new()]
};
- var track1 = new Track();
- var track2 = new Track();
- var track3 = new Track();
- var track4 = new Track();
- manager.TraceChanges(track1);
- manager.TraceChanges(track2);
- manager.TraceChanges(track3);
- manager.TraceChanges(track4);
- cuesheet.AddTrack(track1);
- cuesheet.AddTrack(track2);
- cuesheet.AddTrack(track3);
- cuesheet.AddTrack(track4);
- track1.IsLinkedToPreviousTrack = true;
- track2.IsLinkedToPreviousTrack = true;
- track3.IsLinkedToPreviousTrack = true;
- track4.IsLinkedToPreviousTrack = true;
- var editedTrack = new Track() { Artist = "Test", Title = "Testtitle", Length = new TimeSpan(0, 2, 0) };
- manager.BulkEdit = true;
- track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- manager.BulkEdit = false;
- Assert.IsTrue(manager.CanUndo);
- Assert.AreEqual(editedTrack.Length, track1.End);
- Assert.AreEqual(track1.End, track2.Begin);
- Assert.AreEqual(track2.End, track3.Begin);
- Assert.AreEqual(track3.End, track4.Begin);
- Assert.IsNotNull(track4.End);
- Assert.AreEqual(editedTrack.Artist, track1.Artist);
- Assert.AreEqual(editedTrack.Artist, track2.Artist);
- Assert.AreEqual(editedTrack.Artist, track3.Artist);
- Assert.AreEqual(editedTrack.Artist, track4.Artist);
- Assert.AreEqual(editedTrack.Title, track1.Title);
- Assert.AreEqual(editedTrack.Title, track2.Title);
- Assert.AreEqual(editedTrack.Title, track3.Title);
- Assert.AreEqual(editedTrack.Title, track4.Title);
- Assert.IsTrue(tracedObjectHistoryChangedFired);
- manager.Undo();
- Assert.IsNull(track1.End);
- Assert.IsNull(track2.End);
- Assert.IsNull(track3.End);
- Assert.IsNull(track4.End);
- Assert.IsNull(track1.Artist);
- Assert.IsNull(track2.Artist);
- Assert.IsNull(track3.Artist);
- Assert.IsNull(track4.Artist);
- Assert.IsNull(track1.Title);
- Assert.IsNull(track2.Title);
- Assert.IsNull(track3.Title);
- Assert.IsNull(track4.Title);
+ var redoDoneEventFired = false;
+ _traceChangeManager.RedoDone += delegate
+ {
+ redoDoneEventFired = true;
+ };
+ _traceChangeManager.AddChange(new(cuesheet, new(Enumerable.Empty<Track>(), nameof(Cuesheet.Tracks))));
+ _traceChangeManager.Undo();
+ // Act
+ _traceChangeManager.Redo();
+ // Assert
+ Assert.HasCount(1, cuesheet.Tracks);
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ Assert.IsFalse(_traceChangeManager.CanRedo);
+ Assert.IsTrue(redoDoneEventFired);
}
- [TestMethod()]
- public void BulkEditTracksLengthTest()
+ [TestMethod]
+ public void Reset_HasChanges_ResetsAllChanges()
{
- //We do an edit on 4 tracks to set the length, undo, redo and again undo.
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var cuesheet = new Cuesheet();
- manager.TraceChanges(cuesheet);
- var track1 = new Track();
- var track2 = new Track();
- var track3 = new Track();
- var track4 = new Track();
- manager.TraceChanges(track1);
- manager.TraceChanges(track2);
- manager.TraceChanges(track3);
- manager.TraceChanges(track4);
- cuesheet.AddTrack(track1);
- cuesheet.AddTrack(track2);
- cuesheet.AddTrack(track3);
- cuesheet.AddTrack(track4);
- track1.IsLinkedToPreviousTrack = true;
- track2.IsLinkedToPreviousTrack = true;
- track3.IsLinkedToPreviousTrack = true;
- track4.IsLinkedToPreviousTrack = true;
- var editedTrack = new Track() { Length = new TimeSpan(0, 2, 0) };
- manager.BulkEdit = true;
- track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
- manager.BulkEdit = false;
- Assert.IsTrue(manager.CanUndo);
- Assert.AreEqual(editedTrack.Length, track1.End);
- Assert.AreEqual(track1.End, track2.Begin);
- Assert.AreEqual(track2.End, track3.Begin);
- Assert.AreEqual(track3.End, track4.Begin);
- Assert.IsNotNull(track4.End);
- manager.Undo();
- Assert.IsNull(track1.End);
- Assert.IsNull(track2.End);
- Assert.IsNull(track3.End);
- Assert.IsNull(track4.End);
- Assert.IsTrue(manager.CanRedo);
- manager.Redo();
- Assert.AreEqual(editedTrack.Length, track1.End);
- Assert.AreEqual(track1.End, track2.Begin);
- Assert.AreEqual(track2.End, track3.Begin);
- Assert.AreEqual(track3.End, track4.Begin);
- Assert.IsNotNull(track4.End);
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- Assert.IsNull(track1.End);
- Assert.IsNull(track2.End);
- Assert.IsNull(track3.End);
- Assert.IsNull(track4.End);
+ // Arrange
+ var track = new Track()
+ {
+ Artist = "Track 1 Artist",
+ Title = "Track 1 Title",
+ End = new TimeSpan(0, 2, 30)
+ };
+ var cuesheet = new Cuesheet()
+ {
+ Tracks = [track]
+ };
+ _traceChangeManager.AddChange(new(cuesheet, new(Enumerable.Empty<Track>(), nameof(Cuesheet.Tracks))));
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.End))));
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Title))));
+ _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Artist))));
+ _traceChangeManager.Undo();
+ // Act
+ _traceChangeManager.Reset();
+ // Assert
+ Assert.IsFalse(_traceChangeManager.CanUndo);
+ Assert.IsFalse(_traceChangeManager.CanRedo);
}
-
+
[TestMethod()]
public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()
{
// Arrange
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
- var cuesheet1 = new Cuesheet();
- var cuesheet2 = new Cuesheet();
- manager.TraceChanges(cuesheet1);
- manager.TraceChanges(cuesheet2);
- cuesheet1.Artist = "Test Artist Cuesheet 1";
- cuesheet1.Title = "Test Title Cuesheet 1";
- cuesheet2.CDTextfile = new("CD Testfile.cdt");
- cuesheet2.Title = "Test Title Cuesheet 2";
+ var cuesheet1 = new Cuesheet()
+ {
+ Artist = "Test Artist Cuesheet 1",
+ Title = "Test Title Cuesheet 1"
+ };
+ var cuesheet2 = new Cuesheet()
+ {
+ CDTextfile = new("CD Testfile.cdt"),
+ Title = "Test Title Cuesheet 2"
+ };
+ _traceChangeManager.AddChange(new(cuesheet1, new(null, nameof(Cuesheet.Artist))));
+ _traceChangeManager.AddChange(new(cuesheet1, new(null, nameof(Cuesheet.Title))));
+ _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.CDTextfile))));
+ _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.Title))));
var tracedObjectHistoryChangedFired = false;
- manager.TracedObjectHistoryChanged += delegate
+ _traceChangeManager.TracedObjectHistoryChanged += delegate
{
tracedObjectHistoryChangedFired = true;
};
// Act
- manager.RemoveTracedChanges([cuesheet1]);
+ _traceChangeManager.RemoveTracedChanges([cuesheet1]);
// Assert
Assert.IsTrue(tracedObjectHistoryChangedFired);
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- manager.Undo();
- Assert.IsFalse(manager.CanUndo);
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ _traceChangeManager.Undo();
+ _traceChangeManager.Undo();
+ Assert.IsFalse(_traceChangeManager.CanUndo);
+ Assert.IsNull(cuesheet2.CDTextfile);
+ Assert.IsNull(cuesheet2.Title);
}
[TestMethod()]
public void RemoveTracedChanges_RemovesNoChanges_WhenNoChangesAvailable()
{
// Arrange
- var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
var cuesheet1 = new Cuesheet();
- var cuesheet2 = new Cuesheet();
- manager.TraceChanges(cuesheet1);
- manager.TraceChanges(cuesheet2);
- cuesheet2.CDTextfile = new("CD Testfile.cdt");
- cuesheet2.Title = "Test Title Cuesheet 2";
+ var cuesheet2 = new Cuesheet()
+ {
+ CDTextfile = new("CD Testfile.cdt"),
+ Title = "Test Title Cuesheet 2"
+ };
+ _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.CDTextfile))));
+ _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.Title))));
var tracedObjectHistoryChangedFired = false;
- manager.TracedObjectHistoryChanged += delegate
+ _traceChangeManager.TracedObjectHistoryChanged += delegate
{
tracedObjectHistoryChangedFired = true;
};
// Act
- manager.RemoveTracedChanges([cuesheet1]);
+ _traceChangeManager.RemoveTracedChanges([cuesheet1]);
// Assert
Assert.IsTrue(tracedObjectHistoryChangedFired);
- Assert.IsTrue(manager.CanUndo);
- manager.Undo();
- manager.Undo();
- Assert.IsFalse(manager.CanUndo);
+ Assert.IsTrue(_traceChangeManager.CanUndo);
+ _traceChangeManager.Undo();
+ _traceChangeManager.Undo();
+ Assert.IsFalse(_traceChangeManager.CanUndo);
+ Assert.IsNull(cuesheet2.CDTextfile);
+ Assert.IsNull(cuesheet2.Title);
}
}
}
\ No newline at end of file
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index 171d7120..3aea3302 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -6,8 +6,8 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
- <RazorLangVersion>3.0</RazorLangVersion>
- <Version>12.0.0</Version>
+ <RazorLangVersion>Latest</RazorLangVersion>
+ <Version>12.1.0</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<PublishTrimmed>true</PublishTrimmed>
<RunAOTCompilation>true</RunAOTCompilation>
@@ -22,15 +22,15 @@
<ItemGroup>
<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
<PackageReference Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" PrivateAssets="all" />
<PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
<PackageReference Include="Howler.Blazor" Version="0.10.0" />
- <PackageReference Include="Markdig" Version="1.1.1" />
- <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
- <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.5" />
- <PackageReference Include="MudBlazor" Version="9.2.0" />
- <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.0" />
+ <PackageReference Include="Markdig" Version="1.2.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.7" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.7" />
+ <PackageReference Include="MudBlazor" Version="9.4.0" />
+ <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.1" />
</ItemGroup>
<ItemGroup>
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 65ea5d96..501f90cf 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -15,113 +15,24 @@
//<http: //www.gnu.org/licenses />.
using AudioCuesheetEditor.Model.Entity;
using AudioCuesheetEditor.Model.IO.Audio;
-using AudioCuesheetEditor.Model.UI;
using System.Text.Json.Serialization;
namespace AudioCuesheetEditor.Model.AudioCuesheet
{
- public enum MoveDirection
+ public class Cuesheet() : Validateable, ICuesheet
{
- Up,
- Down
- }
-
- public class TracksAddedRemovedEventArgs(IEnumerable<Track> tracks) : EventArgs
- {
- public IEnumerable<Track> Tracks { get; } = tracks;
- }
-
- public class Cuesheet() : Validateable, ITraceable, ICuesheet
- {
- private readonly Lock syncLock = new();
-
- private List<Track> tracks = [];
- private String? artist;
- private String? title;
- private Audiofile? audiofile;
- private CDTextfile? cDTextfile;
- private String? catalogueNumber;
- private readonly List<KeyValuePair<String, Track>> currentlyHandlingLinkedTrackPropertyChange = [];
-
- public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
- public event EventHandler? IsRecordingChanged;
- public event EventHandler? AudiofileChanged;
-
[JsonInclude]
- public IReadOnlyCollection<Track> Tracks
- {
- get => tracks.AsReadOnly();
- private set
- {
- foreach (var track in tracks)
- {
- track.RankPropertyValueChanged -= Track_RankPropertyValueChanged;
- track.IsLinkedToPreviousTrackChanged -= Track_IsLinkedToPreviousTrackChanged;
- track.Cuesheet = null;
- }
- tracks = [.. value];
- foreach (var track in tracks)
- {
- track.Cuesheet = this;
- track.RankPropertyValueChanged += Track_RankPropertyValueChanged;
- track.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged;
- }
- }
- }
+ public IEnumerable<Track> Tracks { get; set; } = [];
- public String? Artist
- {
- get => artist;
- set
- {
- var previousValue = artist;
- artist = value;
- FireEvents(previousValue, propertyName: nameof(Artist));
- }
- }
- public String? Title
- {
- get => title;
- set
- {
- var previousValue = title;
- title = value;
- FireEvents(previousValue, propertyName: nameof(Title));
- }
- }
- public Audiofile? Audiofile
- {
- get => audiofile;
- set
- {
- var previousValue = audiofile;
- audiofile = value;
- FireEvents(previousValue, propertyName: nameof(Audiofile));
- AudiofileChanged?.Invoke(this, EventArgs.Empty);
- }
- }
+ public String? Artist { get; set; }
+
+ public String? Title { get; set; }
- public CDTextfile? CDTextfile
- {
- get => cDTextfile;
- set
- {
- var previousValue = cDTextfile;
- cDTextfile = value;
- FireEvents(previousValue, fireValidateablePropertyChanged: false, propertyName: nameof(CDTextfile));
- }
- }
+ public Audiofile? Audiofile { get; set; }
- public String? Cataloguenumber
- {
- get => catalogueNumber;
- set
- {
- var previousValue = catalogueNumber;
- catalogueNumber = value;
- FireEvents(previousValue, propertyName: nameof(Cataloguenumber));
- }
- }
+ public CDTextfile? CDTextfile { get; set; }
+
+ public String? Cataloguenumber { get; set; }
[JsonIgnore]
public bool IsRecording => RecordingStart.HasValue;
@@ -129,231 +40,6 @@ public String? Cataloguenumber
[JsonIgnore]
public DateTime? RecordingStart { get; set; }
- [JsonIgnore]
- public IEnumerable<String> IsRecordingPossible
- {
- get
- {
- var errors = new List<String>();
- if (IsRecording)
- {
- errors.Add("Record is already running!");
- }
- if (Tracks.Count != 0)
- {
- errors.Add("Cuesheet already contains tracks!");
- }
- return errors;
- }
- }
-
- [JsonIgnore]
- public Boolean IsImporting { get; set; }
-
- /// <summary>
- /// Get the previous linked track of a track object
- /// </summary>
- /// <param name="track">Track object to get the previous link to</param>
- /// <returns>Previous linked track or null (if not linked)</returns>
- public Track? GetPreviousLinkedTrack(Track track)
- {
- Track? previousLinkedTrack = null;
- if (track.IsLinkedToPreviousTrack)
- {
- var index = tracks.IndexOf(track);
- if (index > 0)
- {
- previousLinkedTrack = tracks.ElementAt(index - 1);
- }
- }
- return previousLinkedTrack;
- }
-
- public void AddTrack(Track track)
- {
- if (track.IsCloned)
- {
- throw new ArgumentException("Cloned tracks may not be added!");
- }
- var previousValue = new List<Track>(tracks);
- track.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged;
- if (IsRecording && RecordingStart.HasValue)
- {
- track.Begin = DateTime.UtcNow - RecordingStart.Value;
- }
- //Fire the event manually since we don't know if the track is already linked to previous one
- Track_IsLinkedToPreviousTrackChanged(track, EventArgs.Empty);
- tracks.Add(track);
- track.Cuesheet = this;
- RecalculateTrackProperties(track);
- track.RankPropertyValueChanged += Track_RankPropertyValueChanged;
- OnTraceablePropertyChanged(previousValue, nameof(Tracks));
- }
-
- public void RemoveTrack(Track track)
- {
- var index = tracks.IndexOf(track);
- Track? nextTrack = null;
- if ((index + 1) < tracks.Count)
- {
- if (tracks.ElementAt(index + 1).IsLinkedToPreviousTrack)
- {
- nextTrack = tracks.ElementAt(index + 1);
- }
- }
- var previousValue = new List<Track>();
- tracks.ForEach(x => previousValue.Add(new Track(x)));
- tracks.Remove(track);
- track.Cuesheet = null;
- track.RankPropertyValueChanged -= Track_RankPropertyValueChanged;
- track.IsLinkedToPreviousTrackChanged -= Track_IsLinkedToPreviousTrackChanged;
- //If Tracks are linked, we need to set the linked track again
- if (nextTrack != null)
- {
- index = tracks.IndexOf(nextTrack);
- if (index > 0)
- {
- var previousTrack = tracks.ElementAt(index - 1);
- if (previousTrack.Position.HasValue)
- {
- nextTrack.Position = previousTrack.Position.Value + 1;
- }
- if (previousTrack.End.HasValue)
- {
- nextTrack.Begin = previousTrack.End.Value;
- }
- }
- }
- RecalculateLastTrackEnd();
- OnTraceablePropertyChanged(previousValue, nameof(Tracks));
- }
-
- /// <summary>
- /// Remove selected tracks
- /// </summary>
- /// <param name="tracksToRemove">Selected tracks to remove (can not be null, only empty)</param>
- public void RemoveTracks(IReadOnlyCollection<Track> tracksToRemove)
- {
- var previousValue = new List<Track>();
- tracks.ForEach(x => previousValue.Add(new Track(x)));
- tracks.ForEach(x => x.RankPropertyValueChanged -= Track_RankPropertyValueChanged);
- tracks.ForEach(x => x.IsLinkedToPreviousTrackChanged -= Track_IsLinkedToPreviousTrackChanged);
- var intersection = tracks.Intersect(tracksToRemove);
- tracks = [.. tracks.Except(intersection)];
- foreach (var track in tracks)
- {
- if (track.IsLinkedToPreviousTrack)
- {
- track.Position = (uint)tracks.IndexOf(track) + 1;
- }
- var previousTrack = GetPreviousLinkedTrack(track);
- if (previousTrack != null)
- {
- if (previousTrack.End.HasValue)
- {
- track.Begin = previousTrack.End;
- }
- }
- }
- tracks.ForEach(x => x.RankPropertyValueChanged += Track_RankPropertyValueChanged);
- tracks.ForEach(x => x.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged);
- RecalculateLastTrackEnd();
- OnTraceablePropertyChanged(previousValue, nameof(Tracks));
- }
- public Boolean MoveTracksPossible(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
- {
- lock (syncLock)
- {
- var trackIndices = tracksToMove.Select(t => tracks.IndexOf(t)).Where(i => i >= 0).OrderBy(i => i).ToList();
-
- if (trackIndices.Count == 0)
- {
- return false;
- }
-
- if (moveDirection == MoveDirection.Up)
- {
- return trackIndices.First() > 0;
- }
- if (moveDirection == MoveDirection.Down)
- {
- return trackIndices.Last() < Tracks.Count - 1;
- }
-
- return false;
- }
- }
- public void MoveTracks(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
- {
- lock (syncLock)
- {
- if (!MoveTracksPossible(tracksToMove, moveDirection))
- {
- return;
- }
- var trackIndices = tracksToMove.Select(t => tracks.IndexOf(t)).Where(i => i >= 0).OrderBy(i => i).ToList();
-
- var previousValue = new List<Track>(Tracks);
-
- if (moveDirection == MoveDirection.Up)
- {
- foreach (var index in trackIndices)
- {
- if (index > 0)
- {
- SwitchTracks(tracks[index], tracks[index - 1]);
- }
- }
- }
- else if (moveDirection == MoveDirection.Down)
- {
- for (int i = trackIndices.Count - 1; i >= 0; i--)
- {
- int index = trackIndices[i];
- if (index < Tracks.Count - 1)
- {
- SwitchTracks(tracks[index], tracks[index + 1]);
- }
- }
- }
-
- OnTraceablePropertyChanged(previousValue, nameof(Tracks));
- }
- }
-
- public void StartRecording()
- {
- if (IsRecordingPossible.Any() == false)
- {
- RecordingStart = DateTime.UtcNow;
- IsRecordingChanged?.Invoke(this, EventArgs.Empty);
- }
- }
-
- public void StopRecording()
- {
- //Set end of last track
- var lastTrack = Tracks.LastOrDefault();
- if ((lastTrack != null) && (RecordingStart.HasValue))
- {
- lastTrack.End = DateTime.UtcNow - RecordingStart.Value;
- }
- RecordingStart = null;
- IsRecordingChanged?.Invoke(this, EventArgs.Empty);
- }
-
- public Boolean RecalculateLastTrackEnd()
- {
- //Try to recalculate length by recalculating last track
- var lastTrack = tracks.LastOrDefault();
- if (lastTrack != null)
- {
- RecalculateTrackProperties(lastTrack);
- return true;
- }
- return false;
- }
-
public override ValidationResult Validate(string property)
{
ValidationStatus validationStatus = ValidationStatus.NoValidation;
@@ -362,7 +48,7 @@ public override ValidationResult Validate(string property)
{
case nameof(Tracks):
validationStatus = ValidationStatus.Success;
- if (Tracks.Count <= 0)
+ if (!Tracks.Any())
{
validationMessages ??= [];
validationMessages.Add(new ValidationMessage("{0} has invalid Count ({1})!", nameof(Tracks), 0));
@@ -370,7 +56,7 @@ public override ValidationResult Validate(string property)
else
{
//Check track overlapping
- var tracksWithSamePosition = Tracks.Where(x => x.IsCloned == false)
+ var tracksWithSamePosition = Tracks
.GroupBy(x => x.Position)
.Where(grp => grp.Count() > 1);
if (tracksWithSamePosition.Any())
@@ -443,228 +129,5 @@ public override ValidationResult Validate(string property)
}
return ValidationResult.Create(validationStatus, validationMessages);
}
-
- private void RecalculateTrackProperties(Track trackToCalculate)
- {
- if ((Audiofile?.Duration.HasValue == true) && (trackToCalculate.End.HasValue == false))
- {
- trackToCalculate.End = Audiofile.Duration;
- }
- if (Tracks.Count > 1)
- {
- var lastTrack = tracks.ElementAt(tracks.IndexOf(trackToCalculate) - 1);
- if (lastTrack != trackToCalculate)
- {
- if ((Audiofile != null) && (Audiofile.Duration.HasValue) && (lastTrack.End.HasValue) && (lastTrack.End.Value == Audiofile.Duration.Value))
- {
- lastTrack.End = null;
- }
- if (trackToCalculate.Position.HasValue == false)
- {
- trackToCalculate.Position = lastTrack.Position + 1;
- }
- if (trackToCalculate.Begin.HasValue == false)
- {
- trackToCalculate.Begin = lastTrack.End;
- }
- else
- {
- if (lastTrack.End.HasValue == false)
- {
- lastTrack.End = trackToCalculate.Begin;
- }
- }
- if (IsRecording)
- {
- lastTrack.End = trackToCalculate.Begin;
- }
- }
- }
- else
- {
- if (trackToCalculate.Position.HasValue == false)
- {
- trackToCalculate.Position = 1;
- }
- if ((trackToCalculate.Begin.HasValue == false) || (IsRecording))
- {
- trackToCalculate.Begin = TimeSpan.Zero;
- }
- }
- }
-
- private void Track_RankPropertyValueChanged(object? sender, string e)
- {
- if (sender is Track trackRaisedEvent)
- {
- var item = KeyValuePair.Create(e, trackRaisedEvent);
- if (currentlyHandlingLinkedTrackPropertyChange.Contains(item) == false)
- {
- currentlyHandlingLinkedTrackPropertyChange.Add(item);
- var linkedPreviousTrack = GetPreviousLinkedTrack(trackRaisedEvent);
- //Check if raising track has linked previous track
- if (trackRaisedEvent.IsLinkedToPreviousTrack && (linkedPreviousTrack != null))
- {
- switch (e)
- {
- case nameof(Track.Position):
- if (trackRaisedEvent.Position.HasValue)
- {
- linkedPreviousTrack.Position = trackRaisedEvent.Position.Value - 1;
- }
- break;
- case nameof(Track.Begin):
- if (trackRaisedEvent.Begin.HasValue)
- {
- linkedPreviousTrack.End = trackRaisedEvent.Begin;
- }
- break;
- }
- }
- //Check if track is linked by next track
- var index = tracks.IndexOf(trackRaisedEvent);
- if ((index + 1) < tracks.Count)
- {
- var nextTrack = tracks.ElementAt(index + 1);
- if (nextTrack.IsLinkedToPreviousTrack)
- {
- switch (e)
- {
- case nameof(Track.Position):
- if (trackRaisedEvent.Position.HasValue)
- {
- nextTrack.Position = trackRaisedEvent.Position.Value + 1;
- }
- break;
- case nameof(Track.End):
- nextTrack.Begin = trackRaisedEvent.End;
- break;
- }
- }
- }
- currentlyHandlingLinkedTrackPropertyChange.Remove(item);
- }
- }
- else
- {
- throw new ArgumentNullException(nameof(sender));
- }
- }
-
- private void Track_IsLinkedToPreviousTrackChanged(object? sender, EventArgs e)
- {
- if (sender != null)
- {
- Track trackRaisedEvent = (Track)sender;
- if (trackRaisedEvent.IsLinkedToPreviousTrack)
- {
- //Set values
- var index = tracks.IndexOf(trackRaisedEvent);
- if (index > 0)
- {
- var previousTrack = tracks.ElementAt(index - 1);
- if ((trackRaisedEvent.Position.HasValue) && (previousTrack.Position.HasValue) && (trackRaisedEvent.Position != previousTrack.Position.Value + 1))
- {
- trackRaisedEvent.Position = previousTrack.Position.Value + 1;
- }
- if ((previousTrack.End.HasValue) && (trackRaisedEvent.Begin != previousTrack.End))
- {
- trackRaisedEvent.Begin = previousTrack.End;
- }
- if ((previousTrack.End.HasValue == false) && (trackRaisedEvent.Begin.HasValue))
- {
- previousTrack.End = trackRaisedEvent.Begin;
- }
- }
- }
- }
- else
- {
- throw new ArgumentNullException(nameof(sender));
- }
- }
-
- private void OnTraceablePropertyChanged(object? previousValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
- {
- TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, propertyName)));
- }
-
- private void SwitchTracks(Track track1, Track track2)
- {
- var indexTrack1 = tracks.IndexOf(track1);
- var indexTrack2 = tracks.IndexOf(track2);
- //Switch track positions in array
- tracks[indexTrack2] = track1;
- tracks[indexTrack1] = track2;
- //Set linked tracks correct again
- indexTrack1 = tracks.IndexOf(track1);
- indexTrack2 = tracks.IndexOf(track2);
- //If using linked tracks, we set values correctly
- if (track1.IsLinkedToPreviousTrack || track2.IsLinkedToPreviousTrack)
- {
- //Set values corresponding to their new positions
- track1.Position = (uint)indexTrack1 + 1;
- track2.Position = (uint)indexTrack2 + 1;
- //Set also begin and end
- if (indexTrack1 < indexTrack2)
- {
- track1.Begin = track2.Begin;
- (track2.End, track1.End) = (track1.End, track2.End);
- if (track2.IsLinkedToPreviousTrack)
- {
- var previousTrack = GetPreviousLinkedTrack(track2);
- if ((previousTrack != null) && (previousTrack.End.HasValue))
- {
- track2.Begin = previousTrack.End;
- }
- }
- }
- else
- {
- track2.Begin = track1.Begin;
- (track1.End, track2.End) = (track2.End, track1.End);
- if (track1.IsLinkedToPreviousTrack)
- {
- var previousTrack = GetPreviousLinkedTrack(track1);
- if ((previousTrack != null) && (previousTrack.End.HasValue))
- {
- track1.Begin = previousTrack.End;
- }
- }
- }
- }
- }
-
- /// <summary>
- /// Method for checking if fire of events should be done
- /// </summary>
- /// <param name="previousValue">Previous value of the property firing events</param>
- /// <param name="fireValidateablePropertyChanged">Fire OnValidateablePropertyChanged?</param>
- /// <param name="fireTraceablePropertyChanged">Fire TraceablePropertyChanged?</param>
- /// <param name="propertyName">Property firing the event</param>
- /// <exception cref="NullReferenceException">If propertyName can not be found, an exception is thrown.</exception>
- private void FireEvents(object? previousValue, Boolean fireValidateablePropertyChanged = true, Boolean fireTraceablePropertyChanged = true, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
- {
- var propertyInfo = GetType().GetProperty(propertyName);
- if (propertyInfo != null)
- {
- var propertyValue = propertyInfo.GetValue(this);
- if (Equals(propertyValue, previousValue) == false)
- {
- if (fireValidateablePropertyChanged)
- {
- OnValidateablePropertyChanged(propertyName);
- }
- if (fireTraceablePropertyChanged)
- {
- OnTraceablePropertyChanged(previousValue, propertyName);
- }
- }
- }
- else
- {
- throw new NullReferenceException(String.Format("Property {0} could not be found!", propertyName));
- }
- }
}
}
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs b/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs
index 38a27e34..36c36a28 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs
@@ -19,7 +19,7 @@ public interface ITrack
{
string? Artist { get; set; }
string? Title { get; set; }
- uint? Position { get; set; }
+ ushort? Position { get; set; }
TimeSpan? Begin { get; set; }
TimeSpan? End { get; set; }
TimeSpan? Length { get; set; }
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs
index b73b1025..213453d0 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs
@@ -20,7 +20,7 @@ public class ImportTrack : ITrack
{
public string? Artist { get; set; }
public string? Title { get; set; }
- public uint? Position { get; set; }
+ public ushort? Position { get; set; }
public TimeSpan? Begin { get; set; }
public TimeSpan? End { get; set; }
public TimeSpan? Length { get; set; }
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 09b511b7..1efc32ef 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -14,353 +14,69 @@
//along with Foobar. If not, see
//<http: //www.gnu.org/licenses />.
using AudioCuesheetEditor.Model.Entity;
-using AudioCuesheetEditor.Model.UI;
using System.Text.Json.Serialization;
namespace AudioCuesheetEditor.Model.AudioCuesheet
{
- public enum SetFlagMode
+ public class Track : Validateable, ITrack
{
- Add,
- Remove
- }
-
- public class Track : Validateable, ITraceable, ITrack
- {
- public static readonly List<String> AllPropertyNames = [nameof(IsLinkedToPreviousTrack), nameof(Position), nameof(Artist), nameof(Title), nameof(Begin), nameof(End), nameof(Flags), nameof(PreGap), nameof(PostGap), nameof(Length)];
-
- private uint? position;
- private String? artist;
- private String? title;
- private TimeSpan? begin;
- private TimeSpan? end;
- private TimeSpan? length;
- private List<Flag> flags = [];
- private Boolean isLinkedToPreviousTrack;
- private Cuesheet? cuesheet;
- private TimeSpan? preGap;
- private TimeSpan? postGap;
-
- /// <summary>
- /// A property with influence to position of this track in cuesheet has been changed. Name of the property changed is provided in event arguments.
- /// </summary>
- public event EventHandler<String>? RankPropertyValueChanged;
-
- /// <summary>
- /// Eventhandler for IsLinkedToPreviousTrack has changed
- /// </summary>
- public event EventHandler? IsLinkedToPreviousTrackChanged;
-
- /// <inheritdoc/>
- public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
-
- public Track() { }
-
- /// <summary>
- /// Create object with copied values from input
- /// </summary>
- /// <param name="track">Object to copy values from</param>
- /// <param name="copyCuesheetReference">Copy cuesheet reference from track also?</param>
- public Track(ITrack track, Boolean copyCuesheetReference = true) : this()
- {
- CopyValues(track, copyCuesheetReference);
- }
-
- public uint? Position
- {
- get => position;
- set { var previousValue = position; position = value; FireEvents(previousValue, propertyName: nameof(Position)); }
- }
- public String? Artist
- {
- get => artist;
- set { var previousValue = artist; artist = value; FireEvents(previousValue, fireRankPropertyValueChanged: false, propertyName: nameof(Artist)); }
- }
- public String? Title
- {
- get => title;
- set { var previousValue = title; title = value; FireEvents(previousValue, fireRankPropertyValueChanged: false, propertyName: nameof(Title)); }
- }
- public TimeSpan? Begin
- {
- get => begin;
- set { var previousValue = begin; begin = value; FireEvents(previousValue, propertyName: nameof(Begin)); }
- }
- public TimeSpan? End
- {
- get => end;
- set { var previousValue = end; end = value; FireEvents(previousValue, propertyName: nameof(End)); }
- }
- /// <summary>
- /// If <see cref="Length"/> is set, should it be automatically change begin and end? Defaulting to true, because only during edit dialog this should be set to false.
- /// If set to false an internal field will be used.
- /// </summary>
- [JsonIgnore]
- public Boolean AutomaticallyCalculateLength { get; init; } = true;
+ public ushort? Position { get; set; }
+ public String? Artist { get; set; }
+ public String? Title { get; set; }
+ public TimeSpan? Begin { get; set; }
+ public TimeSpan? End { get; set; }
[JsonIgnore]
public TimeSpan? Length
{
get
{
- if (AutomaticallyCalculateLength)
+ if ((Begin.HasValue == true) && (End.HasValue == true) && (Begin.Value <= End.Value))
{
- if ((Begin.HasValue == true) && (End.HasValue == true) && (Begin.Value <= End.Value))
- {
- return End - Begin;
- }
- else
- {
- return null;
- }
+ return End - Begin;
}
else
{
- return length;
+ return null;
}
}
set
{
- var previousValue = Length;
- if (AutomaticallyCalculateLength)
+ if ((Begin.HasValue == false) && (End.HasValue == false))
+ {
+ End = value;
+ }
+ else
{
- if ((Begin.HasValue == false) && (End.HasValue == false))
+ if ((Begin.HasValue == true) && (End.HasValue == true))
{
- Begin = TimeSpan.Zero;
End = Begin.Value + value;
}
else
{
- if ((Begin.HasValue == true) && (End.HasValue == true))
+ if ((End.HasValue == false) && (Begin.HasValue))
{
End = Begin.Value + value;
}
- else
+ if ((Begin.HasValue == false) && (End.HasValue))
{
- if ((End.HasValue == false) && (Begin.HasValue))
- {
- End = Begin.Value + value;
- }
- if ((Begin.HasValue == false) && (End.HasValue))
- {
- Begin = End.Value - value;
- }
+ Begin = End.Value - value;
}
}
}
- else
- {
- length = value;
- }
- FireEvents(previousValue, fireRankPropertyValueChanged: false, fireTraceablePropertyChanged: false);
}
}
[JsonInclude]
- public IEnumerable<Flag> Flags
- {
- get { return flags.AsReadOnly(); }
- set
- {
- var previousValue = flags;
- flags = [.. value];
- FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(Flags));
- }
- }
- [JsonIgnore]
- public Cuesheet? Cuesheet
- {
- get => cuesheet;
- set
- {
- var previousValue = cuesheet;
- Boolean setValue = true;
- if (value != null)
- {
- setValue = value.Tracks.Contains(this);
- }
- if (setValue)
- {
- cuesheet = value;
- FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(Cuesheet));
- }
- }
- }
-
- /// <summary>
- /// Indicates that this track has been cloned from another track and is a transparent proxy
- /// </summary>
+ public IEnumerable<Flag> Flags { get; set; } = [];
[JsonIgnore]
- public Boolean IsCloned { get { return ClonedFrom != null; } }
- /// <summary>
- /// Get the original track that this track has been cloned from. Can be null on original objects
- /// </summary>
- public Track? ClonedFrom { get; set; }
+ public Cuesheet? Cuesheet { get; set; }
/// <inheritdoc/>
- public TimeSpan? PreGap
- {
- get => preGap;
- set { var previousValue = preGap; preGap = value; FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(PreGap)); }
- }
+ public TimeSpan? PreGap { get; set; }
/// <inheritdoc/>
- public TimeSpan? PostGap
- {
- get => postGap;
- set { var previousValue = postGap; postGap = value; FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(PostGap)); }
- }
+ public TimeSpan? PostGap { get; set; }
/// <summary>
/// Set that this track is linked to the previous track in cuesheet
/// </summary>
- public Boolean IsLinkedToPreviousTrack
- {
- get => isLinkedToPreviousTrack;
- set { var previousValue = IsLinkedToPreviousTrack; isLinkedToPreviousTrack = value; IsLinkedToPreviousTrackChanged?.Invoke(this, EventArgs.Empty); FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(IsLinkedToPreviousTrack)); }
- }
-
- /// <summary>
- /// Performs a deep clone of the current object
- /// </summary>
- /// <returns>A deep clone of the current object</returns>
- public Track Clone()
- {
- return new Track(this)
- {
- ClonedFrom = this
- };
- }
-
- /// <summary>
- /// Copy values from input object to this object
- /// </summary>
- /// <param name="track">Object to copy values from</param>
- /// <param name="setCuesheet">Copy Cuesheet reference from track also?</param>
- /// <param name="setIsLinkedToPreviousTrack">Copy IsLinkedToPreviousTrack from track also?</param>
- /// <param name="setPosition">Copy Position from track also?</param>
- /// <param name="setArtist">Copy Artist from track also?</param>
- /// <param name="setTitle">Copy Title from track also?</param>
- /// <param name="setBegin">Copy Begin from track also?</param>
- /// <param name="setEnd">Copy End from track also?</param>
- /// <param name="setLength">Copy Length from track also?</param>
- /// <param name="setFlags">Copy Flags from track also?</param>
- /// <param name="setPreGap">Copy PreGap from track also?</param>
- /// <param name="setPostGap">Copy PostGap from track also?</param>
- /// <param name="useInternalSetters">A list of properties, for whom the internal set construct should be used, in order to avoid automatic calculation.</param>
- public void CopyValues(ITrack track, Boolean setCuesheet = true, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = false, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true, IEnumerable<String>? useInternalSetters = null)
- {
- if (setCuesheet && (track is Track cuesheetTrack))
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Cuesheet))))
- {
- cuesheet = cuesheetTrack.Cuesheet;
- }
- else
- {
- Cuesheet = cuesheetTrack.Cuesheet;
- }
- }
- if (setPosition)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Position))))
- {
- position = track.Position;
- }
- else
- {
- Position = track.Position;
- }
- }
- if (setArtist)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Artist))))
- {
- artist = track.Artist;
- }
- else
- {
- Artist = track.Artist;
- }
- }
- if (setTitle)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Title))))
- {
- title = track.Title;
- }
- else
- {
- Title = track.Title;
- }
- }
- if (setBegin)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Begin))))
- {
- begin = track.Begin;
- }
- else
- {
- Begin = track.Begin;
- }
- }
- if (setEnd)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(End))))
- {
- end = track.End;
- }
- else
- {
- End = track.End;
- }
- }
- if (setLength)
- {
- Length = track.Length;
- }
- if (setFlags)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Flags))))
- {
- flags.Clear();
- flags.AddRange(track.Flags);
- }
- else
- {
- Flags = track.Flags;
- }
- }
- if (setPreGap)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(PreGap))))
- {
- preGap = track.PreGap;
- }
- else
- {
- PreGap = track.PreGap;
- }
- }
- if (setPostGap)
- {
- if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(PostGap))))
- {
- postGap = track.PostGap;
- }
- else
- {
- PostGap = track.PostGap;
- }
- }
- if (setIsLinkedToPreviousTrack)
- {
- if (useInternalSetters?.Contains(nameof(IsLinkedToPreviousTrack)) == true)
- {
- isLinkedToPreviousTrack = track.IsLinkedToPreviousTrack;
- }
- else
- {
- IsLinkedToPreviousTrack = track.IsLinkedToPreviousTrack;
- }
- }
- }
+ public Boolean IsLinkedToPreviousTrack { get; set; }
public override ValidationResult Validate(string property)
{
@@ -385,7 +101,7 @@ public override ValidationResult Validate(string property)
else
{
// Check correct track position
- if ((IsCloned == false) && (Cuesheet != null))
+ if (Cuesheet != null)
{
var positionTrackShouldHave = Cuesheet.Tracks.OrderBy(x => x.Begin ?? TimeSpan.MaxValue).ThenBy(x => x.Position).ToList().IndexOf(this) + 1;
if (positionTrackShouldHave != Position)
@@ -450,47 +166,5 @@ public override ValidationResult Validate(string property)
}
return ValidationResult.Create(validationStatus, validationMessages);
}
-
- protected void OnTraceablePropertyChanged(object? previousValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
- {
- TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, propertyName)));
- }
-
- /// <summary>
- /// Method for checking if fire of events should be done
- /// </summary>
- /// <param name="previousValue">Previous value of the property firing events</param>
- /// <param name="fireValidateablePropertyChanged">Fire OnValidateablePropertyChanged?</param>
- /// <param name="fireRankPropertyValueChanged">Fire RankPropertyValueChanged?</param>
- /// <param name="fireTraceablePropertyChanged">Fire OnTraceablePropertyChanged?</param>
- /// <exception cref="NullReferenceException">If propertyName can not be found, an exception is thrown.</exception>
- /// <param name="propertyName">Property firing the events</param>
- private void FireEvents(object? previousValue, Boolean fireValidateablePropertyChanged = true, Boolean fireRankPropertyValueChanged = true, Boolean fireTraceablePropertyChanged = true, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
- {
- var propertyInfo = GetType().GetProperty(propertyName);
- if (propertyInfo != null)
- {
- var propertyValue = propertyInfo.GetValue(this);
- if (Equals(propertyValue, previousValue) == false)
- {
- if (fireValidateablePropertyChanged)
- {
- OnValidateablePropertyChanged(propertyName);
- }
- if (fireRankPropertyValueChanged)
- {
- RankPropertyValueChanged?.Invoke(this, propertyName);
- }
- if (fireTraceablePropertyChanged)
- {
- OnTraceablePropertyChanged(previousValue, propertyName);
- }
- }
- }
- else
- {
- throw new NullReferenceException(String.Format("Property {0} could not be found!", propertyName));
- }
- }
}
}
diff --git a/AudioCuesheetEditor/Model/Entity/IValidateable.cs b/AudioCuesheetEditor/Model/Entity/IValidateable.cs
index 4d88ec34..8a848945 100644
--- a/AudioCuesheetEditor/Model/Entity/IValidateable.cs
+++ b/AudioCuesheetEditor/Model/Entity/IValidateable.cs
@@ -28,8 +28,6 @@ public interface IValidateable
/// <param name="property"></param>
/// <returns></returns>
ValidationResult Validate(String property);
-
- event EventHandler<String>? ValidateablePropertyChanged;
}
public enum ValidationStatus
{
diff --git a/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs b/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
index ebee7f8d..b6d86c42 100644
--- a/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
+++ b/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
@@ -101,19 +101,5 @@ public String? AudioFileType
return audioFileType;
}
}
-
- [JsonIgnore]
- public Boolean PlaybackPossible
- {
- get
- {
- Boolean playbackPossible = false;
- if ((String.IsNullOrEmpty(Name) == false) && (String.IsNullOrEmpty(ObjectURL) == false) && (String.IsNullOrEmpty(AudioFileType) == false) && (AudioCodec != null))
- {
- playbackPossible = true;
- }
- return playbackPossible;
- }
- }
}
}
diff --git a/AudioCuesheetEditor/Model/IO/Projectfile.cs b/AudioCuesheetEditor/Model/IO/Projectfile.cs
index c6d2617e..a1e187bc 100644
--- a/AudioCuesheetEditor/Model/IO/Projectfile.cs
+++ b/AudioCuesheetEditor/Model/IO/Projectfile.cs
@@ -36,7 +36,15 @@ public class Projectfile(Cuesheet cuesheet)
public static Cuesheet? ImportFile(string fileContent)
{
- return JsonSerializer.Deserialize<Cuesheet>(fileContent, Options);
+ var cuesheet = JsonSerializer.Deserialize<Cuesheet>(fileContent, Options);
+ if (cuesheet != null)
+ {
+ foreach (var track in cuesheet.Tracks)
+ {
+ track.Cuesheet = cuesheet;
+ }
+ }
+ return cuesheet;
}
public Cuesheet Cuesheet { get; private set; } = cuesheet;
diff --git a/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs b/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
index 5fcefbd1..3aefd35e 100644
--- a/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
+++ b/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
@@ -24,11 +24,10 @@ public enum DynamicEditValue
EnteredValueAdd = 2,
EnteredValueSubstract = 3
}
- public class EditMultipleTracksModalResult(Track editedTrack, DynamicEditValue isLinkedToPreviousTrackChanged, DynamicEditValue positionEditMode, DynamicEditValue artistEditMode, DynamicEditValue titleEditMode, DynamicEditValue beginEditMode, DynamicEditValue endEditMode, DynamicEditValue lengthEditMode, DynamicEditValue flagsEditMode, DynamicEditValue pregapEditMode, DynamicEditValue postgapEditMode)
+ public class EditMultipleTracksModalResult(Track editedTrack, DynamicEditValue isLinkedToPreviousTrackChanged, DynamicEditValue artistEditMode, DynamicEditValue titleEditMode, DynamicEditValue beginEditMode, DynamicEditValue endEditMode, DynamicEditValue lengthEditMode, DynamicEditValue flagsEditMode, DynamicEditValue pregapEditMode, DynamicEditValue postgapEditMode)
{
public Track EditedTrack { get; } = editedTrack;
public DynamicEditValue IsLinkedToPreviousTrackEditMode { get; } = isLinkedToPreviousTrackChanged;
- public DynamicEditValue PositionEditMode { get; } = positionEditMode;
public DynamicEditValue ArtistEditMode { get; } = artistEditMode;
public DynamicEditValue TitleEditMode { get; } = titleEditMode;
public DynamicEditValue BeginEditMode { get; } = beginEditMode;
diff --git a/AudioCuesheetEditor/Model/UI/ITraceable.cs b/AudioCuesheetEditor/Model/UI/TraceableChange.cs
similarity index 67%
rename from AudioCuesheetEditor/Model/UI/ITraceable.cs
rename to AudioCuesheetEditor/Model/UI/TraceableChange.cs
index 7db690eb..e5dfa0ba 100644
--- a/AudioCuesheetEditor/Model/UI/ITraceable.cs
+++ b/AudioCuesheetEditor/Model/UI/TraceableChange.cs
@@ -30,20 +30,4 @@ public TraceableChange(object? previousValue, string propertyName)
public object? PreviousValue { get; }
public string PropertyName { get; }
}
-
- public class TraceablePropertiesChangedEventArgs(TraceableChange traceableChange) : EventArgs
- {
- public TraceableChange TraceableChange { get; } = traceableChange;
- }
-
- /// <summary>
- /// Interface for undo/redoable actions
- /// </summary>
- public interface ITraceable
- {
- /// <summary>
- /// A property of this object has been changed and therefore needs to be traced by the TraceChangeManager.
- /// </summary>
- public event EventHandler<TraceablePropertiesChangedEventArgs> TraceablePropertyChanged;
- }
}
diff --git a/AudioCuesheetEditor/Model/UI/TracedChange.cs b/AudioCuesheetEditor/Model/UI/TracedChange.cs
new file mode 100644
index 00000000..fb4eb9a9
--- /dev/null
+++ b/AudioCuesheetEditor/Model/UI/TracedChange.cs
@@ -0,0 +1,39 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+namespace AudioCuesheetEditor.Model.UI
+{
+ /// <summary>
+ /// Class for tracing changes on an object
+ /// </summary>
+ public class TracedChange(object traceableObject, TraceableChange traceableChange)
+ {
+ private readonly WeakReference<object> _tracedObject = new(traceableObject, false);
+
+ public object? TraceableObject
+ {
+ get
+ {
+ if (_tracedObject.TryGetTarget(out var traceable))
+ {
+ return traceable;
+ }
+ return null;
+ }
+ }
+
+ public TraceableChange TraceableChange { get; } = traceableChange;
+ }
+}
diff --git a/AudioCuesheetEditor/Model/UI/TracedChanges.cs b/AudioCuesheetEditor/Model/UI/TracedChanges.cs
new file mode 100644
index 00000000..00ce7c1d
--- /dev/null
+++ b/AudioCuesheetEditor/Model/UI/TracedChanges.cs
@@ -0,0 +1,23 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+namespace AudioCuesheetEditor.Model.UI
+{
+ public class TracedChanges(IEnumerable<TracedChange> changes)
+ {
+ public List<TracedChange> Changes { get; } = [.. changes];
+ public bool HasTraceableObject { get { return Changes.Any(x => x.TraceableObject != null); } }
+ }
+}
diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index 8fe46021..445ba103 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -25,6 +25,7 @@ along with Foobar. If not, see
@inject ISessionStateContainer _sessionStateContainer
@inject DialogManager _dialogManager
@inject ISnackbar _snackbar
+@inject ICuesheetManager _cuesheetManager
<CascadingValue Value="currentViewmode">
<MudTabs Rounded ApplyEffectsToContainer Outlined Color="Color.Success" ActivePanelIndex="(int)currentViewmode" ActivePanelIndexChanged="this.AsNonRenderingEventHandler<int>(ActiveTabIndexChanged)">
@@ -44,18 +45,6 @@ along with Foobar. If not, see
ViewOptions? options;
ViewMode currentViewmode = ViewMode.DetailView;
- public Cuesheet? Cuesheet
- {
- get
- {
- if (currentViewmode == ViewMode.ImportView)
- {
- return _sessionStateContainer.ImportCuesheet;
- }
- return _sessionStateContainer.Cuesheet;
- }
- }
-
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
@@ -112,17 +101,21 @@ along with Foobar. If not, see
switch (_sessionStateContainer.Importfile?.FileType)
{
case ImportFileType.ProjectFile:
+ await _importManager.AnalyseImportfile();
+ _sessionStateContainer.ResetImport();
+ break;
case ImportFileType.Cuesheet:
await _importManager.AnalyseImportfile();
+ _importManager.ImportCuesheet();
_sessionStateContainer.ResetImport();
break;
case ImportFileType.Textfile:
await LocalStorageOptionsProvider.SaveOptionsValueAsync<ViewOptions>(x => x.ActiveTab, ViewMode.ImportView);
break;
}
- if ((Cuesheet != null) && (_sessionStateContainer.ImportAudiofile != null))
+ if (_sessionStateContainer.ImportAudiofile != null)
{
- Cuesheet.Audiofile = _sessionStateContainer.ImportAudiofile;
+ _cuesheetManager.SetProperty(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
}
}
finally
diff --git a/AudioCuesheetEditor/Program.cs b/AudioCuesheetEditor/Program.cs
index ce09002c..031766d3 100644
--- a/AudioCuesheetEditor/Program.cs
+++ b/AudioCuesheetEditor/Program.cs
@@ -19,6 +19,7 @@
using AudioCuesheetEditor.Extensions;
using AudioCuesheetEditor.Model.Options;
using AudioCuesheetEditor.Services.Audio;
+using AudioCuesheetEditor.Services.AudioCuesheet;
using AudioCuesheetEditor.Services.IO;
using AudioCuesheetEditor.Services.UI;
using AudioCuesheetEditor.Services.Validation;
@@ -48,7 +49,13 @@
builder.Services.AddScoped<ILocalStorageOptionsProvider, LocalStorageOptionsProvider>();
builder.Services.AddScoped<MusicBrainzDataProvider>();
-builder.Services.AddScoped<ISessionStateContainer, SessionStateContainer>();
+builder.Services.AddScoped<ISessionStateContainer>(x =>
+{
+ var localStorageOptionsProvider = x.GetRequiredService<ILocalStorageOptionsProvider>();
+ var sessionStateContainer = new SessionStateContainer(localStorageOptionsProvider);
+ _ = sessionStateContainer.InitializeAsync();
+ return sessionStateContainer;
+});
builder.Services.AddScoped<ITraceChangeManager, TraceChangeManager>();
builder.Services.AddScoped<ImportManager>();
builder.Services.AddScoped<ITextImportService, TextImportService>();
@@ -62,6 +69,8 @@
builder.Services.AddScoped<DialogManager>();
builder.Services.AddScoped<ExportfileGenerator>();
builder.Services.AddScoped<AutocompleteManager>();
+builder.Services.AddScoped<ITrackManager, TrackManager>();
+builder.Services.AddScoped<ICuesheetManager, CuesheetManager>();
builder.Services.AddLogging();
// Read out configuration for loglevel
diff --git a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
index b451800e..68142028 100644
--- a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
+++ b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
@@ -25,42 +25,44 @@ public class PlaybackService : IDisposable
private readonly ISessionStateContainer _sessionStateContainer;
private readonly IHowl _howl;
- private int? soundId;
- private Audiofile? currentlyPlayingAudiofile;
- private Timer? updateTimer;
- private bool disposedValue;
- private readonly Lock timerLock = new();
- private TimeSpan? currentPosition;
- private Cuesheet cuesheet;
+ private int? _currentPlayingSoundId;
+ private Audiofile? _currentlyPlayingAudiofile;
+ private Timer? _updateTimer;
+ private bool _disposedValue;
+ private readonly Lock _timerLock = new();
+ private TimeSpan? _currentPosition;
public event Action? CurrentPositionChanged;
public TimeSpan? CurrentPosition
{
- get => currentPosition;
+ get => _currentPosition;
private set
{
- if (currentPosition != value)
+ if (_currentPosition != value)
{
- currentPosition = value;
+ _currentPosition = value;
CurrentPositionChanged?.Invoke();
}
}
}
- public Track? CurrentlyPlayingTrack => cuesheet.Tracks.SingleOrDefault(x => x.Begin.HasValue == true && x.End.HasValue == true && x.Begin <= CurrentPosition && x.End > CurrentPosition);
- public TimeSpan? TotalTime => cuesheet.Audiofile?.Duration;
+ public Track? CurrentlyPlayingTrack => _sessionStateContainer.Cuesheet.Tracks.SingleOrDefault(x => x.Begin.HasValue == true && x.End.HasValue == true && x.Begin <= CurrentPosition && x.End > CurrentPosition);
+ public TimeSpan? TotalTime => _sessionStateContainer.Cuesheet.Audiofile?.Duration;
public Boolean IsPlaying { get; private set; } = false;
- //Refer to Cuesheet (not ImportCuesheet) since playback will always be done on the imported cuesheet
- public Boolean PlaybackPossible => cuesheet.Audiofile != null && cuesheet.Audiofile.PlaybackPossible;
- public Boolean PreviousPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) >= 1;
- public Boolean NextPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) < cuesheet.Tracks.Count - 1;
+ public Boolean IsPlaybackPossible
+ {
+ get
+ {
+ var audiofile = _sessionStateContainer.Cuesheet.Audiofile;
+ return String.IsNullOrEmpty(audiofile?.ObjectURL) == false && String.IsNullOrEmpty(audiofile?.AudioFileType) == false;
+ }
+ }
+ public Boolean IsPreviousPossible => (CurrentlyPlayingTrack != null) && _sessionStateContainer.Cuesheet.Tracks.FirstOrDefault(x => x.End <= CurrentlyPlayingTrack.Begin) != null;
+ public Boolean IsNextPossible => (CurrentlyPlayingTrack != null) && _sessionStateContainer.Cuesheet.Tracks.FirstOrDefault(x => x.Begin >= CurrentlyPlayingTrack.End) != null;
public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
{
_sessionStateContainer = sessionStateContainer;
- cuesheet = _sessionStateContainer.Cuesheet;
- cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
- _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
_howl = howl;
_howl.OnPlay += Howl_OnPlay;
_howl.OnPause += Howl_OnPause;
@@ -71,28 +73,28 @@ public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
public async Task PlayOrPauseAsync()
{
//Reset if the last played audiofile is not the current one
- if (currentlyPlayingAudiofile != cuesheet.Audiofile)
+ if (_currentlyPlayingAudiofile != _sessionStateContainer.Cuesheet.Audiofile)
{
- soundId = null;
+ _currentPlayingSoundId = null;
}
//If the current audiofile already started, we just pause
- if (soundId != null)
+ if (_currentPlayingSoundId != null)
{
- await _howl.Pause(soundId.Value);
+ await _howl.Pause(_currentPlayingSoundId.Value);
}
else
{
- if (PlaybackPossible)
+ if (IsPlaybackPossible)
{
string[]? sources = null;
string[]? formats = null;
- if (cuesheet.Audiofile?.ObjectURL != null)
+ if (_sessionStateContainer.Cuesheet.Audiofile?.ObjectURL != null)
{
- sources = [cuesheet.Audiofile.ObjectURL];
+ sources = [_sessionStateContainer.Cuesheet.Audiofile.ObjectURL];
}
- if (cuesheet.Audiofile?.AudioFileType != null)
+ if (_sessionStateContainer.Cuesheet.Audiofile?.AudioFileType != null)
{
- formats = [cuesheet.Audiofile.AudioFileType.ToLower()];
+ formats = [_sessionStateContainer.Cuesheet.Audiofile.AudioFileType.ToLower()];
}
var options = new HowlOptions
{
@@ -100,8 +102,8 @@ public async Task PlayOrPauseAsync()
Formats = formats,
Html5 = true
};
- soundId = await _howl.Play(options);
- currentlyPlayingAudiofile = cuesheet.Audiofile;
+ _currentPlayingSoundId = await _howl.Play(options);
+ _currentlyPlayingAudiofile = _sessionStateContainer.Cuesheet.Audiofile;
}
}
}
@@ -114,18 +116,18 @@ public async Task PlayAsync(Track trackToPlay)
{
await PlayOrPauseAsync();
}
- if (soundId.HasValue)
+ if (_currentPlayingSoundId.HasValue)
{
- await _howl.Seek(soundId.Value, trackToPlay.Begin.Value);
+ await _howl.Seek(_currentPlayingSoundId.Value, trackToPlay.Begin.Value);
}
}
}
public async Task StopAsync()
{
- if (soundId != null)
+ if (_currentPlayingSoundId != null)
{
- await _howl.Stop(soundId.Value);
+ await _howl.Stop(_currentPlayingSoundId.Value);
}
}
@@ -133,8 +135,7 @@ public async Task PlayNextTrackAsync()
{
if (CurrentlyPlayingTrack != null)
{
- var index = cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack);
- var trackToPlay = cuesheet.Tracks.ElementAtOrDefault(index + 1);
+ var trackToPlay = _sessionStateContainer.Cuesheet.Tracks.FirstOrDefault(x => x.Begin >= CurrentlyPlayingTrack.End);
if (trackToPlay != null)
{
await PlayAsync(trackToPlay);
@@ -146,8 +147,7 @@ public async Task PlayPreviousTrackAsync()
{
if (CurrentlyPlayingTrack != null)
{
- var index = cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack);
- var trackToPlay = cuesheet.Tracks.ElementAtOrDefault(index - 1);
+ var trackToPlay = _sessionStateContainer.Cuesheet.Tracks.LastOrDefault(x => x.End <= CurrentlyPlayingTrack.Begin);
if (trackToPlay != null)
{
await PlayAsync(trackToPlay);
@@ -157,17 +157,17 @@ public async Task PlayPreviousTrackAsync()
public async Task SeekAsync(TimeSpan time)
{
- if (soundId.HasValue == false)
+ if (_currentPlayingSoundId.HasValue == false)
{
await PlayOrPauseAsync();
}
- if (soundId.HasValue)
+ if (_currentPlayingSoundId.HasValue)
{
if (IsPlaying == false)
{
await PlayOrPauseAsync();
}
- await _howl.Seek(soundId.Value, time);
+ await _howl.Seek(_currentPlayingSoundId.Value, time);
}
}
@@ -180,27 +180,26 @@ public void Dispose()
protected virtual void Dispose(bool disposing)
{
- if (!disposedValue)
+ if (!_disposedValue)
{
if (disposing)
{
- cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
- _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
_howl.OnPlay -= Howl_OnPlay;
_howl.OnPause -= Howl_OnPause;
_howl.OnEnd -= Howl_OnEnd;
_howl.OnStop -= Howl_OnStop;
}
- disposedValue = true;
+ _disposedValue = true;
}
}
private void Howl_OnStop(Howler.Blazor.Components.Events.HowlEventArgs obj)
{
IsPlaying = false;
- soundId = null;
+ _currentPlayingSoundId = null;
StopTimer();
CurrentPosition = null;
+ _currentlyPlayingAudiofile = _sessionStateContainer.Cuesheet.Audiofile;
}
private void Howl_OnEnd(Howler.Blazor.Components.Events.HowlEventArgs obj)
@@ -224,36 +223,27 @@ private void Howl_OnPlay(Howler.Blazor.Components.Events.HowlPlayEventArgs obj)
private void StartTimer()
{
- updateTimer ??= new Timer(UpdateCurrentPosition, null, 0, 500);
+ _updateTimer ??= new Timer(UpdateCurrentPosition, null, 0, 500);
}
private void StopTimer()
{
- updateTimer?.Dispose();
- updateTimer = null;
+ _updateTimer?.Dispose();
+ _updateTimer = null;
}
private async void UpdateCurrentPosition(object? state)
{
// Thread-safe access
- lock (timerLock)
+ lock (_timerLock)
{
- if (soundId == null || !IsPlaying) return;
+ if (_currentPlayingSoundId == null || !IsPlaying) return;
+ }
+ CurrentPosition = await _howl.GetCurrentTime(_currentPlayingSoundId.Value);
+ if (_sessionStateContainer.Cuesheet.Audiofile != _currentlyPlayingAudiofile)
+ {
+ await _howl.Stop(_currentPlayingSoundId.Value);
}
- CurrentPosition = await _howl.GetCurrentTime(soundId.Value);
- }
-
- private void SessionStateContainer_CuesheetChanged(object? sender, EventArgs e)
- {
- _ = StopAsync();
- cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
- cuesheet = _sessionStateContainer.Cuesheet;
- cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
- }
-
- private void Cuesheet_AudiofileChanged(object? sender, EventArgs e)
- {
- _ = StopAsync();
}
}
}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
new file mode 100644
index 00000000..6f45baa8
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -0,0 +1,279 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Services.UI;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+ /// <inheritdoc/>
+ public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer, ITrackManager trackManager) : ICuesheetManager
+ {
+ private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+ private readonly ISessionStateContainer _sessionStateContainer = sessionStateContainer;
+ private readonly ITrackManager _trackManager = trackManager;
+
+ public event EventHandler? IsRecordingChanged;
+
+ /// <inheritdoc/>
+ public void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+ {
+ _traceChangeManager.BulkEdit = true;
+ var cuesheet = _sessionStateContainer.GetActiveCuesheet();
+ var audiofile = cuesheet?.Audiofile;
+ SetValue(cuesheet!, propertyExpression, value);
+ // If audiofile has been set, we need to calculate last track end
+ if (audiofile != cuesheet?.Audiofile)
+ {
+ SetLastTrackEnd(cuesheet!);
+ }
+ _traceChangeManager.BulkEdit = false;
+ }
+
+ /// <inheritdoc/>
+ public Result IsRecordingPossible
+ {
+ get
+ {
+ if (_sessionStateContainer.Cuesheet.Tracks.Any())
+ {
+ return Result.Failure(new Error(ErrorType.NotPossible, "Cuesheet already contains tracks!"));
+ }
+ return Result.Success();
+ }
+ }
+
+ /// <inheritdoc/>
+ public Result StartRecording()
+ {
+ var isRecordingPossibleResult = IsRecordingPossible;
+ if (isRecordingPossibleResult.IsSuccess)
+ {
+ var cuesheet = _sessionStateContainer.Cuesheet;
+ if (cuesheet.IsRecording == true)
+ {
+ return Result.Failure(new Error(ErrorType.NotPossible, "Record is already running!"));
+ }
+ cuesheet.RecordingStart = DateTime.UtcNow;
+ IsRecordingChanged?.Invoke(this, EventArgs.Empty);
+ return Result.Success();
+ }
+ return isRecordingPossibleResult;
+ }
+
+ /// <inheritdoc/>
+ public void StopRecording()
+ {
+ var cuesheet = _sessionStateContainer.Cuesheet;
+ if (cuesheet.IsRecording == true)
+ {
+ var lastTrack = cuesheet.Tracks.LastOrDefault();
+ if ((lastTrack != null) && cuesheet.RecordingStart.HasValue)
+ {
+ lastTrack.End = DateTime.UtcNow - cuesheet.RecordingStart.Value;
+ }
+ cuesheet.RecordingStart = null;
+ IsRecordingChanged?.Invoke(this, EventArgs.Empty);
+ }
+ }
+
+ /// <inheritdoc/>
+ public void AddTrack(Track track)
+ {
+ var cuesheet = _sessionStateContainer.GetActiveCuesheet();
+ track.Cuesheet = cuesheet;
+ // Calculate track properties
+ _traceChangeManager.BulkEdit = true;
+ if (cuesheet?.IsRecording == true)
+ {
+ _trackManager.SetProperty(track, x => x.Begin, DateTime.UtcNow - cuesheet.RecordingStart);
+ }
+ if (cuesheet?.Tracks.Any() == false)
+ {
+ _trackManager.SetProperty(track, x => x.Position, (ushort)(1));
+ if ((track.Begin.HasValue == false) || cuesheet.IsRecording)
+ {
+ _trackManager.SetProperty(track, x => x.Begin, TimeSpan.Zero);
+ }
+ }
+ else
+ {
+ var lastTrack = GetLastTrack(cuesheet!);
+ if ((cuesheet?.Audiofile?.Duration.HasValue == true) && (lastTrack?.End.HasValue == true) && (lastTrack.End == cuesheet.Audiofile.Duration))
+ {
+ _trackManager.SetProperty(lastTrack, x => x.End, null);
+ }
+ if (track.Position.HasValue == false)
+ {
+ _trackManager.SetProperty(track, x => x.Position, (ushort?)(lastTrack?.Position + 1));
+ }
+ if (track.Begin.HasValue == false)
+ {
+ _trackManager.SetProperty(track, x => x.Begin, lastTrack?.End);
+ }
+ else
+ {
+ if (lastTrack?.End.HasValue == false)
+ {
+ _trackManager.SetProperty(lastTrack, x => x.End, track.Begin);
+ }
+ }
+ if (cuesheet?.IsRecording == true && lastTrack != null)
+ {
+ _trackManager.SetProperty(lastTrack, x => x.End, track.Begin);
+ }
+ }
+ var newValue = new List<Track>(cuesheet!.Tracks)
+ {
+ track
+ };
+ SetValue(cuesheet, x => x.Tracks, newValue);
+ SetLastTrackEnd(cuesheet);
+ _traceChangeManager.BulkEdit = false;
+ }
+
+ /// <inheritdoc/>
+ public void RemoveTracks(IEnumerable<Track> tracksToRemove)
+ {
+ var cuesheet = _sessionStateContainer.GetActiveCuesheet();
+ var intersection = cuesheet!.Tracks.Intersect(tracksToRemove);
+ ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
+ //Calculate position and begin of new tracks
+ ushort position = 1;
+ foreach (var track in newValue.OrderBy(x => x.Position))
+ {
+ track.Position = position;
+ position++;
+ var previousTrack = _trackManager.GetPreviousLinkedTrack(track);
+ if (previousTrack?.End.HasValue == true)
+ {
+ track.Begin = previousTrack.End;
+ }
+ }
+ _traceChangeManager.BulkEdit = true;
+ SetValue(cuesheet, x => x.Tracks, newValue);
+ SetLastTrackEnd(cuesheet);
+ _traceChangeManager.BulkEdit = false;
+ }
+
+ /// <inheritdoc/>
+ public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Min(x => x.Position) >= 2;
+
+ /// <inheritdoc/>
+ public bool IsMoveTracksDownPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Max(x => x.Position) < _sessionStateContainer.GetActiveCuesheet()?.Tracks.Max(x => x.Position);
+
+ /// <inheritdoc/>
+ public Result MoveTracksUp(HashSet<Track> selectedTracks)
+ {
+ if (IsMoveTracksUpPossible(selectedTracks) == false)
+ {
+ return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks up is not possible!"));
+ }
+ _traceChangeManager.BulkEdit = true;
+ var cuesheet = _sessionStateContainer.GetActiveCuesheet();
+ foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
+ {
+ var previousTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
+ var newBegin = previousTrack?.Begin;
+ var newEnd = previousTrack?.End;
+ if (previousTrack != null)
+ {
+ _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
+ _trackManager.SetProperty(previousTrack, x => x.Begin, selectedTrack.Begin);
+ _trackManager.SetProperty(previousTrack, x => x.End, selectedTrack.End);
+ }
+ _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
+ _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
+ _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
+ }
+ SetValue(cuesheet!, x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+ _traceChangeManager.BulkEdit = false;
+ return Result.Success();
+ }
+
+ /// <inheritdoc/>
+ public Result MoveTracksDown(HashSet<Track> selectedTracks)
+ {
+ var cuesheet = _sessionStateContainer.GetActiveCuesheet();
+ if (IsMoveTracksDownPossible(selectedTracks) == false)
+ {
+ return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
+ }
+ _traceChangeManager.BulkEdit = true;
+ foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
+ {
+ var nextTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
+ var newBegin = nextTrack?.Begin;
+ var newEnd = nextTrack?.End;
+ if (nextTrack != null)
+ {
+ _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
+ _trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
+ _trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
+ }
+ var newPosition = (ushort?)(selectedTrack.Position + 1);
+ _trackManager.SetProperty(selectedTrack, x => x.Position, newPosition);
+ _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
+ _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
+ }
+ SetValue(cuesheet!, x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+ _traceChangeManager.BulkEdit = false;
+ return Result.Success();
+ }
+
+ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+ {
+ if (propertyExpression.Body is not MemberExpression memberExpression)
+ {
+ throw new ArgumentException("Expression must be a property");
+ }
+
+ if (memberExpression.Member is not PropertyInfo propertyInfo)
+ {
+ throw new ArgumentException("Member is not a property");
+ }
+
+ var previousValue = (TProperty?)propertyInfo.GetValue(cuesheet);
+ if (Equals(previousValue, value))
+ {
+ return;
+ }
+
+ propertyInfo.SetValue(cuesheet, value);
+
+ _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
+ }
+
+ void SetLastTrackEnd(Cuesheet cuesheet)
+ {
+ var lastTrack = GetLastTrack(cuesheet);
+ if ((lastTrack?.End.HasValue == false) && (cuesheet.Audiofile?.Duration.HasValue == true))
+ {
+ _trackManager.SetProperty(lastTrack, x => x.End, cuesheet.Audiofile.Duration);
+ }
+ }
+
+ static Track? GetLastTrack(Cuesheet cuesheet)
+ {
+ return cuesheet.Tracks
+ .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
+ .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)
+ .ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End)
+ .LastOrDefault();
+ }
+ }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
new file mode 100644
index 00000000..460264ff
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -0,0 +1,86 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using System.Linq.Expressions;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+ /// <summary>
+ /// Manager for cuesheet interactions
+ /// </summary>
+ public interface ICuesheetManager
+ {
+ /// <summary>
+ /// Event propagated when recording on a cuesheet changes
+ /// </summary>
+ public event EventHandler? IsRecordingChanged;
+ /// <summary>
+ /// Set property for cuesheet
+ /// </summary>
+ /// <typeparam name="TProperty"></typeparam>
+ /// <param name="propertyExpression"></param>
+ /// <param name="value"></param>
+ void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
+ /// <summary>
+ /// Checks if recording for the cuesheet is possible
+ /// </summary>
+ /// <returns></returns>
+ Result IsRecordingPossible { get; }
+ /// <summary>
+ /// Starts recording on cuesheet
+ /// </summary>
+ /// <returns></returns>
+ Result StartRecording();
+ /// <summary>
+ /// Stop recording on cuesheet
+ /// </summary>
+ /// <returns></returns>
+ void StopRecording();
+ /// <summary>
+ /// Adds a track to the cuesheet
+ /// </summary>
+ /// <param name="track"></param>
+ void AddTrack(Track track);
+ /// <summary>
+ /// Remove tracks from cuesheet
+ /// </summary>
+ /// <param name="tracksToRemove"></param>
+ void RemoveTracks(IEnumerable<Track> tracksToRemove);
+ /// <summary>
+ /// Determines if moving tracks up is possible
+ /// </summary>
+ /// <param name="selectedTracks"></param>
+ /// <returns></returns>
+ Boolean IsMoveTracksUpPossible(HashSet<Track> selectedTracks);
+ /// <summary>
+ /// Determines if moving tracks down is possible
+ /// </summary>
+ /// <param name="selectedTracks"></param>
+ /// <returns></returns>
+ Boolean IsMoveTracksDownPossible(HashSet<Track> selectedTracks);
+ /// <summary>
+ /// Moves selected tracks up
+ /// </summary>
+ /// <param name="selectedTracks"></param>
+ Result MoveTracksUp(HashSet<Track> selectedTracks);
+ /// <summary>
+ /// Moves selected tracks down
+ /// </summary>
+ /// <param name="selectedTracks"></param>
+ /// <returns></returns>
+ Result MoveTracksDown(HashSet<Track> selectedTracks);
+ }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
new file mode 100644
index 00000000..fc631edd
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -0,0 +1,74 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using System.Linq.Expressions;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+ /// <summary>
+ /// Manages track interactions
+ /// </summary>
+ public interface ITrackManager
+ {
+ /// <summary>
+ /// Set property value for track
+ /// </summary>
+ /// <typeparam name="TProperty"></typeparam>
+ /// <param name="track"></param>
+ /// <param name="propertyExpression"></param>
+ /// <param name="value"></param>
+ void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value);
+ /// <summary>
+ /// Copies values from a track to another
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="target"></param>
+ /// <param name="setIsLinkedToPreviousTrack"></param>
+ /// <param name="setPosition"></param>
+ /// <param name="setArtist"></param>
+ /// <param name="setTitle"></param>
+ /// <param name="setBegin"></param>
+ /// <param name="setEnd"></param>
+ /// <param name="setLength"></param>
+ /// <param name="setFlags"></param>
+ /// <param name="setPreGap"></param>
+ /// <param name="setPostGap"></param>
+ void CopyValues(ITrack source, Track target, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = true, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true);
+ /// <summary>
+ /// Create a clone of a track
+ /// </summary>
+ /// <param name="track"></param>
+ /// <returns></returns>
+ Track Clone(ITrack track);
+ /// <summary>
+ /// Get the previous linked track of a track object
+ /// </summary>
+ /// <param name="track">Track object to get the previous link to</param>
+ /// <returns>Previous linked track or null (if not linked)</returns>
+ Track? GetPreviousLinkedTrack(Track track);
+ /// <summary>
+ /// Get next linked track that is linked to the parameter track
+ /// </summary>
+ /// <param name="track"></param>
+ /// <returns></returns>
+ Track? GetNextLinkedTrack(Track track);
+ /// <summary>
+ /// Recalculates properties of linked tracks (previous and next track)
+ /// </summary>
+ /// <param name="track"></param>
+ void RecalculateLinkedTracksProperties(Track track);
+ }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
new file mode 100644
index 00000000..cbffeb9b
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -0,0 +1,193 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Services.UI;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+ /// <inheritdoc/>
+ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManager
+ {
+ private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+
+ /// <inheritdoc/>
+ public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
+ {
+ SetValue(track, propertyExpression, value);
+ }
+
+ /// <inheritdoc/>
+ public Track Clone(ITrack track)
+ {
+ Boolean setLength = true;
+ if (track.Begin.HasValue && track.End.HasValue)
+ {
+ setLength = false;
+ }
+ var clone = new Track()
+ {
+ IsLinkedToPreviousTrack = track.IsLinkedToPreviousTrack,
+ Position = track.Position,
+ Artist = track.Artist,
+ Title = track.Title,
+ Begin = track.Begin,
+ End = track.End,
+ Flags = track.Flags,
+ PreGap = track.PreGap,
+ PostGap = track.PostGap
+ };
+ if (setLength)
+ {
+ clone.Length = track.Length;
+ }
+ return clone;
+ }
+
+ /// <inheritdoc/>
+ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = true, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
+ {
+ if (setIsLinkedToPreviousTrack)
+ {
+ SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack);
+ }
+ if (setPosition)
+ {
+ SetValue(target, x => x.Position, source.Position);
+ }
+ if (setArtist)
+ {
+ SetValue(target, x => x.Artist, source.Artist);
+ }
+ if (setTitle)
+ {
+ SetValue(target, x => x.Title, source.Title);
+ }
+ if (setBegin)
+ {
+ SetValue(target, x => x.Begin, source.Begin );
+ }
+ if (setEnd)
+ {
+ SetValue(target, x => x.End, source.End);
+ }
+ if (setLength)
+ {
+ SetValue(target, x => x.Length, source.Length);
+ }
+ if (setFlags)
+ {
+ SetValue(target, x => x.Flags, source.Flags);
+ }
+ if (setPreGap)
+ {
+ SetValue(target, x => x.PreGap, source.PreGap);
+ }
+ if (setPostGap)
+ {
+ SetValue(target, x=> x.PostGap, source.PostGap);
+ }
+ }
+
+ /// <inheritdoc/>
+ public Track? GetPreviousLinkedTrack(Track track)
+ {
+ if (track.IsLinkedToPreviousTrack == false)
+ {
+ return null;
+ }
+ if (track.Position.HasValue && (track.Cuesheet?.Tracks.All(x => x.Position.HasValue) == true))
+ {
+ return track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
+ }
+ if (track.Begin.HasValue)
+ {
+ return track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin && Equals(x, track) == false);
+ }
+ return null;
+ }
+
+ /// <inheritdoc/>
+ public Track? GetNextLinkedTrack(Track track)
+ {
+ if (track.Position.HasValue && (track.Cuesheet?.Tracks.All(x => x.Position.HasValue) == true))
+ {
+ return track.Cuesheet?.Tracks.OrderBy(x => x.Begin).FirstOrDefault(x => x.Position >= track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
+ }
+ if (track.End.HasValue)
+ {
+ return track.Cuesheet?.Tracks.OrderBy(x => x.Begin).LastOrDefault(x => x.Begin <= track.End && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
+ }
+ return null;
+ }
+
+ /// <inheritdoc/>
+ public void RecalculateLinkedTracksProperties(Track track)
+ {
+ if (track.Cuesheet != null)
+ {
+ var previousTrack = GetPreviousLinkedTrack(track);
+ if (previousTrack != null)
+ {
+ if (track.Position.HasValue == false && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
+ {
+ SetValue(track, x => x.Position, (ushort?)(previousTrack.Position + 1));
+ }
+ if (previousTrack.End.HasValue && (track.Begin != previousTrack.End))
+ {
+ SetValue(track, x => x.Begin, previousTrack.End);
+ }
+ if ((previousTrack.End.HasValue == false) && track.Begin.HasValue)
+ {
+ SetValue(previousTrack, x => x.End, track.Begin);
+ }
+ }
+ var nextTrack = GetNextLinkedTrack(track);
+ if (nextTrack != null)
+ {
+ if (track.Position.HasValue)
+ {
+ SetValue(nextTrack, x => x.Position, (ushort?)(track.Position + 1));
+ }
+ SetValue(nextTrack, x => x.Begin, track.End);
+ }
+ }
+ }
+
+ void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
+ {
+ if (propertyExpression.Body is not MemberExpression memberExpression)
+ {
+ throw new ArgumentException("Expression must be a property");
+ }
+
+ if (memberExpression.Member is not PropertyInfo propertyInfo)
+ {
+ throw new ArgumentException("Member is not a property");
+ }
+
+ var previousValue = (TProperty?)propertyInfo.GetValue(track);
+ if (Equals(previousValue, value))
+ {
+ return;
+ }
+
+ propertyInfo.SetValue(track, value);
+ _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+ }
+ }
+}
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index adeabb5e..1a17a2dc 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -18,6 +18,8 @@
using AudioCuesheetEditor.Model.IO;
using AudioCuesheetEditor.Model.IO.Audio;
using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services.AudioCuesheet;
using AudioCuesheetEditor.Services.UI;
using System.Diagnostics;
@@ -31,7 +33,7 @@ public enum ImportFileType
Textfile,
Audiofile
}
- public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ILogger<ImportManager> logger)
+ public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ITrackManager trackManager, ILogger<ImportManager> logger)
{
public event EventHandler<IEnumerable<string>>? UploadFilesFinished;
@@ -40,6 +42,7 @@ public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceC
private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
private readonly IFileInputManager _fileInputManager = fileInputManager;
private readonly ITextImportService _textImportService = textImportService;
+ private readonly ITrackManager _trackManager = trackManager;
public void ImportData(String? data)
{
@@ -67,7 +70,10 @@ public async Task AnalyseImportfile()
switch (_sessionStateContainer.Importfile?.FileType)
{
case ImportFileType.ProjectFile:
- _sessionStateContainer.Cuesheet = Projectfile.ImportFile(fileContent)!;
+ var importedCuesheet = Projectfile.ImportFile(fileContent);
+ var previousValue = _sessionStateContainer.Cuesheet;
+ _sessionStateContainer.Cuesheet = importedCuesheet!;
+ _traceChangeManager.AddChange(new TracedChange(_sessionStateContainer, new(previousValue, nameof(SessionStateContainer.Cuesheet))));
break;
case ImportFileType.Textfile:
_sessionStateContainer.Importfile = await _textImportService.AnalyseAsync(fileContent);
@@ -81,24 +87,18 @@ public async Task AnalyseImportfile()
{
switch (_sessionStateContainer.Importfile?.FileType)
{
+ case ImportFileType.Cuesheet:
case ImportFileType.Textfile:
var importCuesheet = new Cuesheet();
CopyCuesheet(importCuesheet, _sessionStateContainer.Importfile.AnalyzedCuesheet);
_sessionStateContainer.ImportCuesheet = importCuesheet;
- StartTracing();
- break;
- case ImportFileType.Cuesheet:
- _traceChangeManager.BulkEdit = true;
- _sessionStateContainer.Cuesheet = new();
- CopyCuesheet(_sessionStateContainer.Cuesheet, _sessionStateContainer.Importfile.AnalyzedCuesheet);
- _traceChangeManager.BulkEdit = false;
break;
}
}
stopwatch.Stop();
if (_logger.IsEnabled(LogLevel.Debug))
{
- _logger.LogDebug("ImportTextAsync duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+ _logger.LogDebug("AnalyseImportfile duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
}
}
@@ -108,9 +108,11 @@ public void ImportCuesheet()
ResetTracing();
if (_sessionStateContainer.ImportCuesheet != null)
{
- _traceChangeManager.BulkEdit = true;
- CopyCuesheet(_sessionStateContainer.Cuesheet, _sessionStateContainer.ImportCuesheet);
- _traceChangeManager.BulkEdit = false;
+ var newCuesheet = _sessionStateContainer.ImportCuesheet;
+ CopyCuesheet(newCuesheet, _sessionStateContainer.ImportCuesheet);
+ var previousValue = _sessionStateContainer.Cuesheet;
+ _sessionStateContainer.Cuesheet = newCuesheet;
+ _traceChangeManager.AddChange(new TracedChange(_sessionStateContainer, new(previousValue, nameof(SessionStateContainer.Cuesheet))));
}
_sessionStateContainer.ResetImport();
stopwatch.Stop();
@@ -177,9 +179,8 @@ public async Task UploadFilesAsync(IEnumerable<FileUpload> files)
}
}
- private static void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
+ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
{
- target.IsImporting = true;
target.Artist = cuesheetToCopy.Artist;
target.Title = cuesheetToCopy.Title;
target.Cataloguenumber = cuesheetToCopy.Cataloguenumber;
@@ -205,49 +206,74 @@ private static void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
}
if (tracks != null)
{
- var begin = TimeSpan.Zero;
- for (int i = 0; i < tracks.Count(); i++)
+ IOrderedEnumerable<ITrack> sortedTracks;
+ if (tracks.All(x => x.Position.HasValue))
+ {
+ sortedTracks = tracks.OrderBy(x => x.Position);
+ }
+ else
+ {
+ sortedTracks = tracks.OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position);
+ }
+ if (sortedTracks.All(x => x.Begin.HasValue))
+ {
+ sortedTracks = sortedTracks.ThenBy(x => x.Begin);
+ }
+ else
+ {
+ sortedTracks = sortedTracks.ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin);
+ }
+ if (sortedTracks.All(x => x.End.HasValue))
+ {
+ sortedTracks = sortedTracks.ThenBy(x => x.End);
+ }
+ else
+ {
+ sortedTracks = sortedTracks.ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End);
+ }
+ List<Track> targetTracks = [];
+ TimeSpan? begin = TimeSpan.Zero;
+ ushort position = 1;
+ foreach (var (importTrack, index) in sortedTracks.Select((track, i) => (track, i)))
{
- var importTrack = tracks.ElementAt(i);
- //We don't want to copy the cuesheet reference since we are doing a copy and want to assign the track to this object
- var track = new Track(importTrack, false);
- if (importTrack is ImportTrack importTrackReference)
+ ITrack? nextTrack = null;
+ if (index < sortedTracks.Count() - 1)
{
- if (importTrackReference.StartDateTime != null)
- {
- if (i < tracks.Count() - 1)
- {
- var nextTrack = (ImportTrack)tracks.ElementAt(i + 1);
- var length = nextTrack.StartDateTime - importTrackReference.StartDateTime;
- track.Begin = begin;
- track.End = begin + length;
- if (track.End.HasValue)
- {
- begin = track.End.Value;
- }
- }
- }
+ nextTrack = sortedTracks.ElementAt(index + 1);
+ }
+ // Copy track
+ var track = _trackManager.Clone(importTrack);
+ track.Cuesheet = target;
+ // Special treatment for StartDateTime of ImportTrack
+ if (importTrack is ImportTrack importTrackReference && importTrackReference.StartDateTime != null && nextTrack is ImportTrack nextImportTrackReference)
+ {
+ var length = nextImportTrackReference.StartDateTime - importTrackReference.StartDateTime;
+ track.Begin = begin;
+ track.End = begin + length;
+ }
+ // Calculate properties
+ if (track.Position.HasValue == false)
+ {
+ track.Position = position;
+ }
+ if (track.Begin.HasValue == false)
+ {
+ track.Begin = begin;
+ }
+ if ((track.End.HasValue == false) && (nextTrack?.Begin.HasValue == true))
+ {
+ track.End = nextTrack.Begin;
}
- target.AddTrack(track);
+ begin = track.End;
+ position++;
+ targetTracks.Add(track);
}
+ target.Tracks = targetTracks;
}
else
{
throw new NullReferenceException();
}
- target.IsImporting = false;
- }
-
- private void StartTracing()
- {
- if (_sessionStateContainer.ImportCuesheet != null)
- {
- _traceChangeManager.TraceChanges(_sessionStateContainer.ImportCuesheet);
- foreach (var track in _sessionStateContainer.ImportCuesheet.Tracks)
- {
- _traceChangeManager.TraceChanges(track);
- }
- }
}
private void ResetTracing()
diff --git a/AudioCuesheetEditor/Services/IO/TextImportService.cs b/AudioCuesheetEditor/Services/IO/TextImportService.cs
index 63245326..ab975076 100644
--- a/AudioCuesheetEditor/Services/IO/TextImportService.cs
+++ b/AudioCuesheetEditor/Services/IO/TextImportService.cs
@@ -199,9 +199,9 @@ private static void SetValue(object entity, PropertyInfo property, string value,
{
property.SetValue(entity, TimeSpanUtility.ParseTimeSpan(value, timeSpanFormat));
}
- if (property.PropertyType == typeof(uint?))
+ if (property.PropertyType == typeof(ushort?))
{
- property.SetValue(entity, Convert.ToUInt32(value));
+ property.SetValue(entity, Convert.ToUInt16(value));
}
if (property.PropertyType == typeof(String))
{
@@ -255,7 +255,7 @@ private static Regex CreateCuesheetRegexPattern(string scheme)
nextFieldIdx = pos;
}
}
- string separator = scheme.Substring(idx, nextFieldIdx - idx);
+ string separator = scheme[idx..nextFieldIdx];
parts.Add(separator);
idx = nextFieldIdx;
}
@@ -324,7 +324,7 @@ private static Regex CreateTrackRegexPattern(string scheme)
nextFieldIdx = pos;
}
}
- string separator = scheme.Substring(idx, nextFieldIdx - idx);
+ string separator = scheme[idx..nextFieldIdx];
parts.Add(separator);
idx = nextFieldIdx;
}
diff --git a/AudioCuesheetEditor/Services/Result.cs b/AudioCuesheetEditor/Services/Result.cs
index da870084..fac41830 100644
--- a/AudioCuesheetEditor/Services/Result.cs
+++ b/AudioCuesheetEditor/Services/Result.cs
@@ -23,7 +23,15 @@ public enum ErrorType
/// <summary>
/// Validation failed with error
/// </summary>
- ValidationFailed
+ ValidationFailed,
+ /// <summary>
+ /// Resource already exists
+ /// </summary>
+ AlreadyDone,
+ /// <summary>
+ /// Current action is not possible
+ /// </summary>
+ NotPossible
}
/// <summary>
diff --git a/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs b/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
index 6317037b..d23c44ac 100644
--- a/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
+++ b/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
@@ -54,6 +54,13 @@ public async Task TimespanTextChanged<T, TProperty>(T entity, Expression<Func<T,
}
}
+ public async Task<TimeSpan?> GetTimespanAsync(String value)
+ {
+ await EnsureInitializedAsync();
+ TimeSpan? result = TimeSpanUtility.ParseTimeSpan(value, applicationOptions?.TimeSpanFormat);
+ return result;
+ }
+
public string? GetTimespanFormatted(TimeSpan? timeSpan)
{
string? formatted = null;
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 6c59f2dd..16b48a45 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -15,35 +15,38 @@
//<http: //www.gnu.org/licenses />.
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services.AudioCuesheet;
using AudioCuesheetEditor.Shared.Dialogs;
using MudBlazor;
namespace AudioCuesheetEditor.Services.UI
{
- public class DialogManager(IDialogService dialogService, ITraceChangeManager traceChangeManager)
+ public class DialogManager(IDialogService dialogService, ITraceChangeManager traceChangeManager, ITrackManager trackManager)
{
private readonly IDialogService _dialogService = dialogService;
private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+ private readonly ITrackManager _trackManager = trackManager;
- private IDialogReference? loadingDialog;
+ private IDialogReference? _loadingDialog;
public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
{
_traceChangeManager.BulkEdit = true;
if (tracks.Count() == 1)
{
- var parameters = new DialogParameters<EditTrackModal> { { x => x.EditedTrack, tracks.First().Clone() } };
+ var parameters = new DialogParameters<EditTrackModal> { { x => x.EditedTrack, _trackManager.Clone(tracks.First()) } };
var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
var dialog = await _dialogService.ShowAsync<EditTrackModal>(null, parameters, options);
var result = await dialog.Result;
if ((result?.Canceled == false) && (result.Data is Track editedTrack))
{
- tracks.First().CopyValues(editedTrack, setCuesheet: false);
+ _trackManager.CopyValues(editedTrack, tracks.First());
+ _trackManager.RecalculateLinkedTracksProperties(tracks.First());
}
}
if (tracks.Count() > 1)
{
- var parameters = new DialogParameters<EditMultipleTracksModal> { { x => x.EditedTrack, new() { AutomaticallyCalculateLength = false } } };
+ var parameters = new DialogParameters<EditMultipleTracksModal> { { x => x.EditedTrack, new() } };
var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
var dialog = await _dialogService.ShowAsync<EditMultipleTracksModal>(null, parameters, options);
var result = await dialog.Result;
@@ -58,7 +61,6 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
var preGap = editMultipleTracksModalResult.EditedTrack.PreGap;
var postGap = editMultipleTracksModalResult.EditedTrack.PostGap;
Boolean copyIsLinkedToPreviousTrack = editMultipleTracksModalResult.IsLinkedToPreviousTrackEditMode == DynamicEditValue.EnteredValueEquals;
- Boolean copyTrackPosition = true;
Boolean copyTrackArtist = editMultipleTracksModalResult.ArtistEditMode == DynamicEditValue.EnteredValueEquals;
Boolean copyTrackTitle = editMultipleTracksModalResult.TitleEditMode == DynamicEditValue.EnteredValueEquals;
Boolean copyTrackBegin = true;
@@ -68,27 +70,6 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
Boolean copyTrackPreGap = true;
Boolean copyTrackPostGap = true;
//First process dynamic edit, because we need to increase each value separately
- switch (editMultipleTracksModalResult.PositionEditMode)
- {
- case DynamicEditValue.DoNotChange:
- copyTrackPosition = false;
- break;
- case DynamicEditValue.EnteredValueEquals:
- copyTrackPosition = true;
- break;
- case DynamicEditValue.EnteredValueAdd:
- editMultipleTracksModalResult.EditedTrack.Position += track.Position;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
- copyTrackPosition = false;
- editMultipleTracksModalResult.EditedTrack.Position = position;
- break;
- case DynamicEditValue.EnteredValueSubstract:
- var newValue = track.Position - editMultipleTracksModalResult.EditedTrack.Position;
- editMultipleTracksModalResult.EditedTrack.Position = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
- copyTrackPosition = false;
- break;
- }
switch (editMultipleTracksModalResult.BeginEditMode)
{
case DynamicEditValue.DoNotChange:
@@ -100,13 +81,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
case DynamicEditValue.EnteredValueAdd:
var newValue = editMultipleTracksModalResult.EditedTrack.Begin + track.Begin;
editMultipleTracksModalResult.EditedTrack.Begin = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
copyTrackBegin = false;
break;
case DynamicEditValue.EnteredValueSubstract:
newValue = track.Begin - editMultipleTracksModalResult.EditedTrack.Begin;
editMultipleTracksModalResult.EditedTrack.Begin = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
copyTrackBegin = false;
break;
}
@@ -121,13 +102,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
case DynamicEditValue.EnteredValueAdd:
var newValue = editMultipleTracksModalResult.EditedTrack.End + track.End;
editMultipleTracksModalResult.EditedTrack.End = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
copyTrackEnd = false;
break;
case DynamicEditValue.EnteredValueSubstract:
newValue = track.End - editMultipleTracksModalResult.EditedTrack.End;
editMultipleTracksModalResult.EditedTrack.End = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
copyTrackEnd = false;
break;
}
@@ -142,13 +123,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
case DynamicEditValue.EnteredValueAdd:
var newValue = editMultipleTracksModalResult.EditedTrack.Length + track.Length;
editMultipleTracksModalResult.EditedTrack.Length = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false);
copyTrackLength = false;
break;
case DynamicEditValue.EnteredValueSubstract:
newValue = track.Length - editMultipleTracksModalResult.EditedTrack.Length;
editMultipleTracksModalResult.EditedTrack.Length = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false);
copyTrackLength = false;
break;
}
@@ -163,13 +144,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
case DynamicEditValue.EnteredValueAdd:
var newValue = editMultipleTracksModalResult.EditedTrack.PreGap + track.PreGap;
editMultipleTracksModalResult.EditedTrack.PreGap = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false);
copyTrackPreGap = false;
break;
case DynamicEditValue.EnteredValueSubstract:
newValue = track.PreGap - editMultipleTracksModalResult.EditedTrack.PreGap;
editMultipleTracksModalResult.EditedTrack.PreGap = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false);
copyTrackPreGap = false;
break;
}
@@ -184,13 +165,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
case DynamicEditValue.EnteredValueAdd:
var newValue = editMultipleTracksModalResult.EditedTrack.PostGap + track.PostGap;
editMultipleTracksModalResult.EditedTrack.PostGap = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap);
copyTrackPostGap = false;
break;
case DynamicEditValue.EnteredValueSubstract:
newValue = track.PostGap - editMultipleTracksModalResult.EditedTrack.PostGap;
editMultipleTracksModalResult.EditedTrack.PostGap = newValue;
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap, useInternalSetters: Track.AllPropertyNames);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap);
copyTrackPostGap = false;
break;
}
@@ -201,7 +182,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
editMultipleTracksModalResult.EditedTrack.PreGap = preGap;
editMultipleTracksModalResult.EditedTrack.PostGap = postGap;
//Now copy all values
- track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: copyTrackPosition, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
+ _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: false, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
}
}
}
@@ -210,21 +191,18 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
public async Task ShowLoadingDialogAsync()
{
- if (loadingDialog == null)
+ if (_loadingDialog == null)
{
var options = new DialogOptions() { BackdropClick = false, FullWidth = true, MaxWidth = MaxWidth.ExtraSmall, NoHeader = true };
- loadingDialog = await _dialogService.ShowAsync<LoadingDialog>(null, options);
+ _loadingDialog = await _dialogService.ShowAsync<LoadingDialog>(null, options);
await Task.Delay(1);
}
}
public void HideLoadingDialog()
{
- if (loadingDialog != null)
- {
- loadingDialog.Close();
- loadingDialog = null;
- }
+ _loadingDialog?.Close();
+ _loadingDialog = null;
}
}
}
diff --git a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
index 4dcd0aca..e3f31f3f 100644
--- a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
@@ -27,7 +27,17 @@ public interface ISessionStateContainer
public Cuesheet? ImportCuesheet { get; set; }
public Audiofile? ImportAudiofile { get; set; }
public IImportfile? Importfile { get; set; }
- public void ResetImport();
public Boolean ImportIsAnalyzed { get; set; }
+ public void ResetImport();
+ /// <summary>
+ /// Initialize this class
+ /// </summary>
+ /// <returns></returns>
+ Task InitializeAsync();
+ /// <summary>
+ /// Get current cuesheet based on current view
+ /// </summary>
+ /// <returns></returns>
+ public Cuesheet? GetActiveCuesheet();
}
}
diff --git a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
index 757b64bd..4aec1c11 100644
--- a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
@@ -1,4 +1,19 @@
-using AudioCuesheetEditor.Model.UI;
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar. If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.UI;
namespace AudioCuesheetEditor.Services.UI
{
@@ -19,11 +34,14 @@ public interface ITraceChangeManager
/// </summary>
public bool CanRedo { get; }
public bool BulkEdit { get; set; }
- public void TraceChanges(ITraceable traceable);
+ /// <summary>
+ /// Adds a change of a property
+ /// </summary>
+ /// <param name="tracedChange"></param>
+ void AddChange(TracedChange tracedChange);
public void Reset();
public void Undo();
public void Redo();
- public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit);
- public void RemoveTracedChanges(IEnumerable<ITraceable> traceables);
+ public void RemoveTracedChanges(IEnumerable<object> traceables);
}
}
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index b1a7b0df..f4e00e55 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -13,72 +13,66 @@
//You should have received a copy of the GNU General Public License
//along with Foobar. If not, see
//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Data.Options;
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.IO.Audio;
using AudioCuesheetEditor.Model.IO.Import;
-using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Model.Options;
namespace AudioCuesheetEditor.Services.UI
{
- public class SessionStateContainer : ISessionStateContainer, ITraceable
+ public class SessionStateContainer : ISessionStateContainer, IDisposable
{
+ private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider;
+
+ private Cuesheet _cuesheet = new();
+ private Cuesheet? _importCuesheet;
+ private ViewOptions? _viewOptions;
+ private bool disposedValue;
+
public event EventHandler? CuesheetChanged;
public event EventHandler? ImportCuesheetChanged;
- public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
-
- private readonly ITraceChangeManager _traceChangeManager;
- private Cuesheet cuesheet;
- private Cuesheet? importCuesheet;
- private Audiofile? importAudiofile;
- public SessionStateContainer(ITraceChangeManager traceChangeManager)
+ public SessionStateContainer(ILocalStorageOptionsProvider localStorageOptionsProvider)
{
- _traceChangeManager = traceChangeManager;
- cuesheet = new Cuesheet();
- SetCuesheetReference(cuesheet);
- _traceChangeManager.TraceChanges(this);
+ _localStorageOptionsProvider = localStorageOptionsProvider;
+ _localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
}
- public Cuesheet Cuesheet
+
+ public void Dispose()
{
- get { return cuesheet; }
- set { SetCuesheetReference(value); }
+ Dispose(disposing: true);
+ GC.SuppressFinalize(this);
}
- public Cuesheet? ImportCuesheet
+
+ public Cuesheet Cuesheet
{
- get { return importCuesheet; }
+ get => _cuesheet;
set
{
- var previousValue = importCuesheet;
- importCuesheet = value;
- //When there is an audiofile from import, we use this file because it has an object url and gets duration, etc.
- if (importCuesheet != null && ImportAudiofile != null)
- {
- importCuesheet.Audiofile = ImportAudiofile;
- }
- if (Equals(previousValue, importCuesheet) == false)
- {
- ImportCuesheetChanged?.Invoke(this, EventArgs.Empty);
- }
+ _cuesheet = value;
+ CuesheetChanged?.Invoke(this, EventArgs.Empty);
}
}
-
- public Audiofile? ImportAudiofile
+ public Cuesheet? ImportCuesheet
{
- get => importAudiofile;
+ get => _importCuesheet;
set
{
- importAudiofile = value;
- if (ImportCuesheet != null && ImportAudiofile != null)
- {
- ImportCuesheet.Audiofile = ImportAudiofile;
- ImportCuesheetChanged?.Invoke(this, EventArgs.Empty);
- }
+ _importCuesheet = value;
+ ImportCuesheetChanged?.Invoke(this, EventArgs.Empty);
}
}
-
+ public Audiofile? ImportAudiofile { get; set; }
public IImportfile? Importfile{ get; set; }
public Boolean ImportIsAnalyzed { get; set; } = false;
+ /// <inheritdoc/>
+ public async Task InitializeAsync()
+ {
+ _viewOptions ??= await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
+ }
+
public void ResetImport()
{
Importfile = null;
@@ -86,13 +80,38 @@ public void ResetImport()
ImportCuesheet = null;
}
- private void SetCuesheetReference(Cuesheet value)
+ /// <inheritdoc/>
+ public Cuesheet? GetActiveCuesheet()
{
- var previousValue = Cuesheet;
- cuesheet = value;
- _traceChangeManager.TraceChanges(Cuesheet);
- TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, nameof(Cuesheet))));
- CuesheetChanged?.Invoke(this, EventArgs.Empty);
+ if (_viewOptions == null)
+ {
+ throw new InvalidOperationException("Not initialized!");
+ }
+ if (_viewOptions.ActiveTab == ViewMode.ImportView)
+ {
+ return ImportCuesheet;
+ }
+ return Cuesheet;
+ }
+
+ protected virtual void Dispose(bool disposing)
+ {
+ if (!disposedValue)
+ {
+ if (disposing)
+ {
+ _localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
+ }
+ disposedValue = true;
+ }
+ }
+
+ private void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions options)
+ {
+ if (options is ViewOptions viewOptions)
+ {
+ _viewOptions = viewOptions;
+ }
}
}
}
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 45e944db..79a53ef1 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -17,75 +17,30 @@
namespace AudioCuesheetEditor.Services.UI
{
- /// <summary>
- /// Class for tracing changes on an object
- /// </summary>
- public class TracedChange(ITraceable traceableObject, TraceableChange traceableChange)
- {
- private readonly WeakReference<ITraceable> _tracedObject = new(traceableObject, false);
-
- public ITraceable? TraceableObject
- {
- get
- {
- if (_tracedObject.TryGetTarget(out var traceable))
- {
- return traceable;
- }
- return null;
- }
- }
-
- public TraceableChange TraceableChange { get; } = traceableChange;
- }
-
- public class TracedChanges(IEnumerable<TracedChange> changes)
- {
- public List<TracedChange> Changes { get; } = [.. changes];
- public bool HasTraceableObject { get { return Changes.Any(x => x.TraceableObject != null); } }
- }
-
/// <inheritdoc />
public class TraceChangeManager(ILogger<TraceChangeManager> logger) : ITraceChangeManager
{
private readonly ILogger<TraceChangeManager> _logger = logger;
- private readonly List<TracedChanges> undoStack = [];
- private readonly List<TracedChanges> redoStack = [];
+ private readonly List<TracedChanges> _undoStack = [];
+ private readonly List<TracedChanges> _redoStack = [];
- private List<TracedChange>? bulkEditTracedChanges;
+ private List<TracedChange>? _bulkEditTracedChanges;
public event EventHandler? TracedObjectHistoryChanged;
public event EventHandler? UndoDone;
public event EventHandler? RedoDone;
- public bool CurrentlyHandlingRedoOrUndoChanges { get; private set; } = false;
- /// <inheritdoc />
- public bool CanUndo
- {
- get
- {
- return undoStack.Count > 0;
- }
- }
/// <inheritdoc />
- public bool CanRedo
- {
- get
- {
- return redoStack.Count > 0;
- }
- }
+ public bool CanUndo => _undoStack.Count > 0;
- public void TraceChanges(ITraceable traceable)
- {
- traceable.TraceablePropertyChanged += Traceable_TraceablePropertyChanged;
- }
+ /// <inheritdoc />
+ public bool CanRedo => _redoStack.Count > 0;
public void Reset()
{
- Reset(redoStack);
- Reset(undoStack);
+ _redoStack.Clear();
+ _undoStack.Clear();
}
public void Undo()
@@ -93,12 +48,11 @@ public void Undo()
_logger.LogDebug("Undo called");
if (CanUndo)
{
- CurrentlyHandlingRedoOrUndoChanges = true;
TracedChanges? changes = null;
- while (undoStack.Count > 0 && changes == null)
+ while (_undoStack.Count > 0 && changes == null)
{
- changes = undoStack[^1];
- undoStack.Remove(changes);
+ changes = _undoStack[^1];
+ _undoStack.Remove(changes);
if (changes.HasTraceableObject == false)
{
changes = null;
@@ -112,15 +66,21 @@ public void Undo()
var change = changes.Changes.ElementAt(i);
var tracedObject = change?.TraceableObject;
var traceAbleChange = change?.TraceableChange;
- _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+ if (_logger.IsEnabled(LogLevel.Debug))
+ {
+ _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+ }
if (tracedObject != null && traceAbleChange != null)
{
var propertyInfo = tracedObject.GetType().GetProperty(traceAbleChange.PropertyName);
if (propertyInfo != null)
{
var currentValue = propertyInfo.GetValue(tracedObject);
- redoChanges.Add(new TracedChange(tracedObject, new TraceableChange(currentValue, traceAbleChange.PropertyName)));
- _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+ redoChanges.Add(new TracedChange(tracedObject, new(currentValue, traceAbleChange.PropertyName)));
+ if (_logger.IsEnabled(LogLevel.Debug))
+ {
+ _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+ }
propertyInfo.SetValue(tracedObject, traceAbleChange.PreviousValue);
}
else
@@ -134,9 +94,8 @@ public void Undo()
}
}
//Push the old value to redo stack
- redoStack.Add(new TracedChanges(redoChanges));
+ _redoStack.Add(new TracedChanges(redoChanges));
}
- CurrentlyHandlingRedoOrUndoChanges = false;
UndoDone?.Invoke(this, EventArgs.Empty);
}
}
@@ -146,12 +105,11 @@ public void Redo()
_logger.LogDebug("Redo called");
if (CanRedo)
{
- CurrentlyHandlingRedoOrUndoChanges = true;
TracedChanges? changes = null;
- while (redoStack.Count > 0 && changes == null)
+ while (_redoStack.Count > 0 && changes == null)
{
- changes = redoStack[^1];
- redoStack.Remove(changes);
+ changes = _redoStack[^1];
+ _redoStack.Remove(changes);
if (changes.HasTraceableObject == false)
{
changes = null;
@@ -165,15 +123,21 @@ public void Redo()
var change = changes.Changes.ElementAt(i);
var tracedObject = change?.TraceableObject;
var traceAbleChange = change?.TraceableChange;
- _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+ if (_logger.IsEnabled(LogLevel.Debug))
+ {
+ _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+ }
if (tracedObject != null && traceAbleChange != null)
{
var propertyInfo = tracedObject.GetType().GetProperty(traceAbleChange.PropertyName);
if (propertyInfo != null)
{
var currentValue = propertyInfo.GetValue(tracedObject);
- undoChanges.Add(new TracedChange(tracedObject, new TraceableChange(currentValue, traceAbleChange.PropertyName)));
- _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+ undoChanges.Add(new TracedChange(tracedObject, new(currentValue, traceAbleChange.PropertyName)));
+ if (_logger.IsEnabled(LogLevel.Debug))
+ {
+ _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+ }
propertyInfo.SetValue(tracedObject, traceAbleChange.PreviousValue);
}
else
@@ -187,101 +151,64 @@ public void Redo()
}
}
//Push the old value to redo stack
- undoStack.Add(new TracedChanges(undoChanges));
+ _undoStack.Add(new TracedChanges(undoChanges));
}
- CurrentlyHandlingRedoOrUndoChanges = false;
RedoDone?.Invoke(this, EventArgs.Empty);
}
}
public bool BulkEdit
{
- get => bulkEditTracedChanges != null;
+ get => _bulkEditTracedChanges != null;
set
{
- _logger.LogDebug("Set BulkEdit called with {value}", value);
+ if (_logger.IsEnabled(LogLevel.Debug))
+ {
+ _logger.LogDebug("Set BulkEdit called with {value}", value);
+ }
if (value)
{
- bulkEditTracedChanges = [];
+ _bulkEditTracedChanges ??= [];
}
else
{
- if (bulkEditTracedChanges != null)
+ if (_bulkEditTracedChanges?.Count > 0)
{
- undoStack.Add(new TracedChanges(bulkEditTracedChanges));
+ _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
- bulkEditTracedChanges = null;
}
+ _bulkEditTracedChanges = null;
}
}
}
- public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
+ public void AddChange(TracedChange tracedChange)
{
- var edit = undoStack.FirstOrDefault(targetEdit);
- if ((edit != null) && (undoStack.Count > 0))
+ if (_logger.IsEnabled(LogLevel.Debug))
{
- var lastEdits = undoStack[^1];
- undoStack.Remove(lastEdits);
- edit.Changes.AddRange(lastEdits.Changes);
- UndoDone?.Invoke(this, EventArgs.Empty);
+ _logger.LogDebug("AddChange: {tracedChange.TraceableObject}, {tracedChange.TraceableChange.PropertyName}, {tracedChange.TraceableChange.PreviousValue}", tracedChange.TraceableObject, tracedChange.TraceableChange.PropertyName, tracedChange.TraceableChange.PreviousValue);
}
- }
-
- public void RemoveTracedChanges(IEnumerable<ITraceable> traceables)
- {
- undoStack.RemoveAll(x => x.HasTraceableObject == false);
- undoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
- redoStack.RemoveAll(x => x.HasTraceableObject == false);
- redoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
- TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
- }
-
- private void Reset(List<TracedChanges> stack)
- {
- while (stack.Count > 0)
+ if (BulkEdit == false)
{
- var tracedChange = stack[^1];
- stack.Remove(tracedChange);
- foreach (var change in tracedChange.Changes)
- {
- if (change.TraceableObject != null)
- {
- change.TraceableObject.TraceablePropertyChanged -= Traceable_TraceablePropertyChanged;
- }
- }
+ //Single change
+ _undoStack.Add(new([tracedChange]));
+ _redoStack.Clear();
+ TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
+ }
+ else
+ {
+ //We are tracing multiple changes
+ _bulkEditTracedChanges?.Add(tracedChange);
}
- stack.Clear();
}
- private void Traceable_TraceablePropertyChanged(object? sender, TraceablePropertiesChangedEventArgs e)
+ public void RemoveTracedChanges(IEnumerable<object> traceables)
{
- _logger.LogDebug("Traceable_TraceablePropertyChanged called with {sender}, {PropertyName}, {PreviousValue}", sender, e.TraceableChange.PropertyName, e.TraceableChange.PreviousValue);
- _logger.LogDebug("CurrentlyHandlingRedoOrUndoChanges = {CurrentlyHandlingRedoOrUndoChanges}", CurrentlyHandlingRedoOrUndoChanges);
- if (CurrentlyHandlingRedoOrUndoChanges == false)
- {
- if (sender != null)
- {
- _logger.LogDebug("BulkEdit = {BulkEdit}", BulkEdit);
- if (BulkEdit == false)
- {
- //Single change
- var changes = new TracedChanges([new((ITraceable)sender, e.TraceableChange)]);
- undoStack.Add(changes);
- redoStack.Clear();
- TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
- }
- else
- {
- //We are tracing multiple changes
- bulkEditTracedChanges?.Add(new TracedChange((ITraceable)sender, e.TraceableChange));
- }
- }
- else
- {
- throw new ArgumentNullException(nameof(sender));
- }
- }
+ _undoStack.RemoveAll(x => x.HasTraceableObject == false);
+ _undoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
+ _redoStack.RemoveAll(x => x.HasTraceableObject == false);
+ _redoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
+ TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
}
}
}
diff --git a/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor b/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor
index 5533938b..122d0742 100644
--- a/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor
+++ b/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor
@@ -38,7 +38,7 @@ along with Foobar. If not, see
{
<MudText>@String.Format("--{0}--{1}--", CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator, CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator)</MudText>
}
- <MudSlider T="double" Variant="Variant.Filled" Min="0" Max="100" Disabled="!_playbackService.PlaybackPossible" Value="sliderValue" ValueChanged="OnSliderValueChanged" ValueLabel aria-label="Playback slider">
+ <MudSlider T="double" Variant="Variant.Filled" Min="0" Max="100" Disabled="!_playbackService.IsPlaybackPossible" Value="sliderValue" ValueChanged="OnSliderValueChanged" ValueLabel aria-label="Playback slider">
<ValueLabelContent>
@GetSliderTimeValue()
</ValueLabelContent>
@@ -54,17 +54,17 @@ along with Foobar. If not, see
</MudStack>
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.Center">
<MudTooltip Text="@_localizer["Play or pause the current audio"]">
- <MudIconButton Icon="@(_playbackService.IsPlaying ? Icons.Material.Outlined.Pause : Icons.Material.Outlined.PlayArrow)" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_playbackService.PlaybackPossible" OnClick="OnPlayOrPauseClicked" aria-label="Play" />
+ <MudIconButton Icon="@(_playbackService.IsPlaying ? Icons.Material.Outlined.Pause : Icons.Material.Outlined.PlayArrow)" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_playbackService.IsPlaybackPossible" OnClick="OnPlayOrPauseClicked" aria-label="Play" />
</MudTooltip>
<MudButtonGroup OverrideStyles="false">
<MudTooltip Text="@_localizer["Jump to previous track"]">
- <MudIconButton Icon="@Icons.Material.Outlined.SkipPrevious" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.PreviousPossible" OnClick="PlayPreviousTrackAsync" aria-label="@_localizer["Jump to previous track"]" />
+ <MudIconButton Icon="@Icons.Material.Outlined.SkipPrevious" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.IsPreviousPossible" OnClick="PlayPreviousTrackAsync" aria-label="@_localizer["Jump to previous track"]" />
</MudTooltip>
<MudTooltip Text="@_localizer["Stop the current playback"]">
- <MudIconButton Icon="@Icons.Material.Outlined.Stop" Variant="Variant.Filled" Color="Color.Primary" OnClick="StopAsync" Disabled="!_playbackService.PlaybackPossible" aria-label="@_localizer["Stop the current playback"]" />
+ <MudIconButton Icon="@Icons.Material.Outlined.Stop" Variant="Variant.Filled" Color="Color.Primary" OnClick="StopAsync" Disabled="!_playbackService.IsPlaybackPossible" aria-label="@_localizer["Stop the current playback"]" />
</MudTooltip>
<MudTooltip Text="@_localizer["Jump to next track"]">
- <MudIconButton Icon="@Icons.Material.Outlined.SkipNext" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.NextPossible" OnClick="PlayNextTrackAsync" aria-label="@_localizer["Jump to next track"]" />
+ <MudIconButton Icon="@Icons.Material.Outlined.SkipNext" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.IsNextPossible" OnClick="PlayNextTrackAsync" aria-label="@_localizer["Jump to next track"]" />
</MudTooltip>
</MudButtonGroup>
</MudStack>
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index cc0cf4eb..6de35334 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -20,26 +20,27 @@ along with Foobar. If not, see
@inject IStringLocalizer<CuesheetData> _localizer
@inject ValidationService _validationService
@inject IFileInputManager _fileInputManager
-@inject IBlazorDownloadFileService _blazorDownloadFileService
@inject IDialogService _dialogService
@inject ISessionStateContainer _sessionStateContainer
+@inject ICuesheetManager _cuesheetManager
+@inject ITrackManager _trackManager
@if (Cuesheet != null)
{
- <MudForm @ref="form" Model="Cuesheet">
- <MudTextField @bind-Value="Cuesheet.Artist" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]"
+ <MudForm @ref="_form" Model="Cuesheet">
+ <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]"
Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
- <MudTextField @bind-Value="Cuesheet.Title" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
+ <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
@switch(CurrentViewMode)
{
case ViewMode.ImportView:
case ViewMode.DetailView:
- <FileInput Id="@fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@fileInputAudiofileErrorText"
+ <FileInput Id="@_fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@_fileInputAudiofileErrorText"
Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
<FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile"
- Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
- <MudTextField @ref="catalogueNumberTextField" @bind-Value="catalogueNumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
+ Error="@_fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
+ <MudTextField @ref="_catalogueNumberTextField" @bind-Value="_catalogueNumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
break;
@@ -63,43 +64,43 @@ along with Foobar. If not, see
[CascadingParameter]
public ViewMode CurrentViewMode { get; set; }
- string? fileInputAudiofileId;
- string? fileInputAudiofileErrorText;
- string? fileInputCDTextfileErrorText;
- string? catalogueNumber;
- MudForm? form;
- MudTextField<string>? catalogueNumberTextField;
+ string? _fileInputAudiofileId;
+ string? _fileInputAudiofileErrorText;
+ string? _fileInputCDTextfileErrorText;
+ string? _catalogueNumber;
+ MudForm? _form;
+ MudTextField<string>? _catalogueNumberTextField;
protected override void OnInitialized()
{
base.OnInitialized();
- if (fileInputAudiofileId == null)
+ if (_fileInputAudiofileId == null)
{
- fileInputAudiofileId = $"Input_Audiofile_{Guid.NewGuid()}";
+ _fileInputAudiofileId = $"Input_Audiofile_{Guid.NewGuid()}";
}
- _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
- _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
TraceChangeManager.UndoDone += TraceChangeManager_UndoDone;
TraceChangeManager.RedoDone += TraceChangeManager_RedoDone;
+ _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
+ _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
}
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
- _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
- _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
TraceChangeManager.UndoDone -= TraceChangeManager_UndoDone;
TraceChangeManager.RedoDone -= TraceChangeManager_RedoDone;
+ _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
+ _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
}
protected override void OnParametersSet()
{
base.OnParametersSet();
- if (form?.IsTouched == true)
+ if (_form?.IsTouched == true)
{
SetAudiofileValidationText();
}
- catalogueNumber = Cuesheet?.Cataloguenumber;
+ _catalogueNumber = Cuesheet?.Cataloguenumber;
}
async Task OnAudiofileSelected(IBrowserFile? browserFile)
@@ -108,29 +109,23 @@ along with Foobar. If not, see
{
return;
}
- fileInputAudiofileErrorText = null;
+ _fileInputAudiofileErrorText = null;
try
{
+ Audiofile? audiofile = null;
if (browserFile != null)
{
- var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], fileInputAudiofileId);
- Cuesheet.Audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
- if (Cuesheet.RecalculateLastTrackEnd())
- {
- TraceChangeManager.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == Cuesheet && y.TraceableChange.PropertyName == nameof(Audiofile)));
- }
- }
- else
- {
- Cuesheet.Audiofile = null;
+ var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], _fileInputAudiofileId);
+ audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
}
+ _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
}
catch(ArgumentException ae)
{
- fileInputAudiofileErrorText = ae.Message;
+ _fileInputAudiofileErrorText = ae.Message;
}
// Just validate the cuesheet if there is no error already
- if (fileInputAudiofileErrorText == null)
+ if (_fileInputAudiofileErrorText == null)
{
SetAudiofileValidationText();
}
@@ -145,11 +140,11 @@ along with Foobar. If not, see
var validationMessages = _validationService.Validate(Cuesheet, nameof(Cuesheet.Audiofile));
if (validationMessages.Count() > 0)
{
- fileInputAudiofileErrorText = String.Join(Environment.NewLine, validationMessages);
+ _fileInputAudiofileErrorText = String.Join(Environment.NewLine, validationMessages);
}
else
{
- fileInputAudiofileErrorText = null;
+ _fileInputAudiofileErrorText = null;
}
}
@@ -159,21 +154,19 @@ along with Foobar. If not, see
{
return;
}
- fileInputCDTextfileErrorText = null;
+ _fileInputCDTextfileErrorText = null;
try
{
+ CDTextfile? newValue = null;
if (browserFile != null)
{
- Cuesheet.CDTextfile = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
- }
- else
- {
- Cuesheet.CDTextfile = null;
+ newValue = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
}
+ _cuesheetManager.SetProperty(x => x.CDTextfile, newValue);
}
catch (ArgumentException ae)
{
- fileInputCDTextfileErrorText = ae.Message;
+ _fileInputCDTextfileErrorText = ae.Message;
}
}
@@ -225,33 +218,31 @@ along with Foobar. If not, see
}
}
- void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
+ void CataloguenumberOnBlur()
{
- StateHasChanged();
+ var newValue = _catalogueNumber?.Replace(" ", string.Empty);
+ _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue);
}
- void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
+ void TraceChangeManager_RedoDone(object? sender, EventArgs e)
{
- StateHasChanged();
+ _catalogueNumber = Cuesheet?.Cataloguenumber;
+ _catalogueNumberTextField?.ResetAsync();
}
- void CataloguenumberOnBlur()
+ void TraceChangeManager_UndoDone(object? sender, EventArgs e)
{
- if (Cuesheet != null)
- {
- Cuesheet.Cataloguenumber = catalogueNumber?.Replace(" ", string.Empty);
- }
+ _catalogueNumber = Cuesheet?.Cataloguenumber;
+ _catalogueNumberTextField?.ResetAsync();
}
- void TraceChangeManager_RedoDone(object? sender, EventArgs e)
+ void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
{
- catalogueNumber = Cuesheet?.Cataloguenumber;
- catalogueNumberTextField?.ResetAsync();
+ StateHasChanged();
}
- void TraceChangeManager_UndoDone(object? sender, EventArgs e)
+ void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
{
- catalogueNumber = Cuesheet?.Cataloguenumber;
- catalogueNumberTextField?.ResetAsync();
+ StateHasChanged();
}
}
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
index b03a5f25..c15b5e68 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
@@ -121,7 +121,7 @@
<value>Künstler</value>
</data>
<data name="Begin" xml:space="preserve">
- <value>Start</value>
+ <value>Beginn</value>
</data>
<data name="Change" xml:space="preserve">
<value>Ändern</value>
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
index e029d6f8..6995dc3e 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
@@ -40,19 +40,6 @@ along with Foobar. If not, see
</MudItem>
<MudItem xs="8" sm="9"><MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Disabled="editModeTrackIsLinkedToPreviousTrack == DynamicEditValue.DoNotChange" /></MudItem>
<MudFlexBreak />
- <MudItem xs="4" sm="3">
- <MudSelect @bind-Value="editModeTrackPosition" Variant="Variant.Outlined" Modal="true">
- <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
- <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
- <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
- <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
- </MudSelect>
- </MudItem>
- <MudItem xs="8" sm="9">
- <MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Disabled="editModeTrackPosition == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackPosition != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Position)))"
- ErrorText="@GetValidationErrorMessage(editModeTrackPosition != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Position))" />
- </MudItem>
- <MudFlexBreak />
<MudItem xs="4" sm="3">
<MudSelect @bind-Value="editModeTrackArtist" Variant="Variant.Outlined" Modal="true">
<MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
@@ -212,11 +199,11 @@ along with Foobar. If not, see
[EditorRequired]
public Track EditedTrack { get; set; } = null!;
- DynamicEditValue editModeTrackIsLinkedToPreviousTrack, editModeTrackPosition, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap;
+ DynamicEditValue editModeTrackIsLinkedToPreviousTrack, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap;
void SaveClick()
{
- var result = new EditMultipleTracksModalResult(EditedTrack, editModeTrackIsLinkedToPreviousTrack, editModeTrackPosition, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength,
+ var result = new EditMultipleTracksModalResult(EditedTrack, editModeTrackIsLinkedToPreviousTrack, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength,
editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap);
MudDialog?.Close(DialogResult.Ok(result));
}
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
index 721e7fe9..e26e5b7c 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
@@ -31,7 +31,7 @@ along with Foobar. If not, see
<MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(EditedTrack, nameof(Track.IsLinkedToPreviousTrack)))"
ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.IsLinkedToPreviousTrack))" />
<MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(EditedTrack, nameof(Track.Position)))"
- ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.Position))" />
+ ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.Position))" Disabled />
@{
MusicBrainzArtist? autocompleteArtist = new()
{
diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 102317a2..d461b00a 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -21,6 +21,7 @@ along with Foobar. If not, see
@inject AutocompleteManager _autocompleteManager
@inject ValidationService _validationService
@inject ISessionStateContainer _sessionStateContainer
+@inject ICuesheetManager _cuesheetManager
<MudCard Outlined>
<MudCardContent>
@@ -28,12 +29,12 @@ along with Foobar. If not, see
@{
MusicBrainzArtist? autocompleteArtist = new()
{
- Name = currentRecordingTrack.Artist
+ Name = _currentRecordingTrack.Artist
};
}
- <MudAutocomplete @ref="artistInput" T="MusicBrainzArtist" Label="@_localizer["Artist"]" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(value) => value?.Name"
- @bind-Text="@currentRecordingTrack.Artist" @bind-Value="autocompleteArtist" Clearable ShowProgressIndicator ResetValueOnEmptyText
- Error="!String.IsNullOrEmpty(GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Artist)))" ErrorText="@GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Artist))"
+ <MudAutocomplete @ref="_artistInput" T="MusicBrainzArtist" Label="@_localizer["Artist"]" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(value) => value?.Name"
+ @bind-Text="@_currentRecordingTrack.Artist" @bind-Value="autocompleteArtist" Clearable ShowProgressIndicator ResetValueOnEmptyText
+ Error="!String.IsNullOrEmpty(GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Artist)))" ErrorText="@GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Artist))"
Disabled="Cuesheet?.IsRecording == false" MaxItems="null" CoerceText="false">
<ItemTemplate Context="autocompleteContext">
@if (autocompleteContext.Disambiguation != null)
@@ -49,13 +50,13 @@ along with Foobar. If not, see
@{
MusicBrainzTrack? autocompleteTrack = new()
{
- Artist = currentRecordingTrack.Artist,
- Title = currentRecordingTrack.Title
+ Artist = _currentRecordingTrack.Artist,
+ Title = _currentRecordingTrack.Title
};
}
- <MudAutocomplete @ref="titleInput" T="MusicBrainzTrack" Label="@_localizer["Title"]" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, currentRecordingTrack.Artist, token)" ToStringFunc="(value) => value?.Title"
- @bind-Text="currentRecordingTrack.Title" @bind-Value="autocompleteTrack" Clearable ShowProgressIndicator ResetValueOnEmptyText
- Error="!String.IsNullOrEmpty(GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Title)))" ErrorText="@GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Title))"
+ <MudAutocomplete @ref="_titleInput" T="MusicBrainzTrack" Label="@_localizer["Title"]" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, _currentRecordingTrack.Artist, token)" ToStringFunc="(value) => value?.Title"
+ @bind-Text="_currentRecordingTrack.Title" @bind-Value="autocompleteTrack" Clearable ShowProgressIndicator ResetValueOnEmptyText
+ Error="!String.IsNullOrEmpty(GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Title)))" ErrorText="@GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Title))"
Disabled="Cuesheet?.IsRecording == false" MaxItems="null" CoerceText="false">
<ItemTemplate Context="autocompleteContext">
@if (autocompleteContext.Disambiguation != null)
@@ -82,39 +83,27 @@ along with Foobar. If not, see
[CascadingParameter]
public ViewMode CurrentViewMode { get; set; }
- public Cuesheet? Cuesheet
- {
- get
- {
- if (CurrentViewMode == ViewMode.ImportView)
- {
- return _sessionStateContainer.ImportCuesheet;
- }
- return _sessionStateContainer.Cuesheet;
- }
- }
+ public Cuesheet Cuesheet => _sessionStateContainer.Cuesheet;
+
+ Track _currentRecordingTrack = new();
+ MudAutocomplete<MusicBrainzArtist>? _artistInput;
+ MudAutocomplete<MusicBrainzTrack>? _titleInput;
+ ApplicationOptions? _applicationOptions;
- protected override void OnParametersSet()
+ protected override void OnInitialized()
{
- if (Cuesheet != null)
- {
- Cuesheet.IsRecordingChanged -= Cuesheet_IsRecordingChanged;
- }
- base.OnParametersSet();
- if (Cuesheet != null)
- {
- Cuesheet.IsRecordingChanged += Cuesheet_IsRecordingChanged;
- }
+ base.OnInitialized();
+ _cuesheetManager.IsRecordingChanged += CuesheetManager_IsRecordingChanged;
}
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
- applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
+ _applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
- currentRecordingTrack = new()
+ _currentRecordingTrack = new()
{
- IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
+ IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
};
}
@@ -123,16 +112,11 @@ along with Foobar. If not, see
base.Dispose(disposing);
if (Cuesheet != null)
{
- Cuesheet.IsRecordingChanged -= Cuesheet_IsRecordingChanged;
+ _cuesheetManager.IsRecordingChanged -= CuesheetManager_IsRecordingChanged;
}
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
}
- Track currentRecordingTrack = new();
- MudAutocomplete<MusicBrainzArtist>? artistInput;
- MudAutocomplete<MusicBrainzTrack>? titleInput;
- ApplicationOptions? applicationOptions;
-
String? GetValidationErrorMessage(object model, string propertyName)
{
String? validationErrorMessage = null;
@@ -146,32 +130,32 @@ along with Foobar. If not, see
async Task AddTrackAsync()
{
- if (Cuesheet?.IsRecording == true)
+ if (Cuesheet.IsRecording == true)
{
- Cuesheet?.AddTrack(currentRecordingTrack);
- currentRecordingTrack = new()
+ _cuesheetManager.AddTrack(_currentRecordingTrack);
+ _currentRecordingTrack = new()
{
- IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
+ IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
};
- if (artistInput != null)
+ if (_artistInput != null)
{
- await artistInput.FocusAsync();
+ await _artistInput.FocusAsync();
}
}
}
- void Cuesheet_IsRecordingChanged(object? sender, EventArgs args)
+ void CuesheetManager_IsRecordingChanged(object? sender, EventArgs args)
{
StateHasChanged();
- artistInput?.ClearAsync();
- titleInput?.ClearAsync();
+ _artistInput?.ClearAsync();
+ _titleInput?.ClearAsync();
}
void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions option)
{
if (option is ApplicationOptions applicationOption)
{
- applicationOptions = applicationOption;
+ _applicationOptions = applicationOption;
StateHasChanged();
}
}
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index 0d605db8..5346ce28 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -21,32 +21,29 @@ along with Foobar. If not, see
@inject IDialogService _dialogService
@inject IBlazorDownloadFileService _blazorDownloadFileService
@inject ISessionStateContainer _sessionStateContainer
+@inject ICuesheetManager _cuesheetManager
-@if (Cuesheet?.IsRecording == false)
+@if (Cuesheet.IsRecording == false)
{
- var recordingPossibleMessages = Cuesheet?.IsRecordingPossible;
- if (recordingPossibleMessages?.Any() == true)
+ if (String.IsNullOrEmpty(_errorMessage) == false)
{
<MudAlert Severity="Severity.Warning" Variant="Variant.Filled">
<MudText Typo="Typo.h4">@_localizer["Record not possible"]</MudText>
- @foreach (var recordingPossibleMessage in recordingPossibleMessages)
- {
- <MudText>@_localizer[recordingPossibleMessage]</MudText>
- }
+ <MudText>@_localizer[_errorMessage]</MudText>
</MudAlert>
}
}
<MudCard Outlined>
<MudCardContent>
- @if (Cuesheet?.IsRecording == true)
+ @if (Cuesheet.IsRecording == true)
{
<MudAlert Severity="Severity.Info" Variant="Variant.Filled" ContentAlignment="HorizontalAlignment.Center">@_localizer["Recording!"]</MudAlert>
<br />
}
- @if (startRecordTimer?.Enabled == true)
+ @if (_startRecordTimer?.Enabled == true)
{
- <MudAlert Severity="Severity.Warning" Variant="Variant.Filled" ContentAlignment="HorizontalAlignment.Center" ShowCloseIcon CloseIcon="@Icons.Material.Outlined.TimerOff" CloseIconClicked="() => startRecordTimer.Dispose()">
- @_localizer["Record will start in {0} seconds!", ((startRecordTimer.Interval / 1000) - (DateTime.Now - recordTimerStarted).Seconds)]
+ <MudAlert Severity="Severity.Warning" Variant="Variant.Filled" ContentAlignment="HorizontalAlignment.Center" ShowCloseIcon CloseIcon="@Icons.Material.Outlined.TimerOff" CloseIconClicked="() => _startRecordTimer.Dispose()">
+ @_localizer["Record will start in {0} seconds!", ((_startRecordTimer.Interval / 1000) - (DateTime.Now - _recordTimerStarted).Seconds)]
</MudAlert>
<br />
}
@@ -62,7 +59,7 @@ along with Foobar. If not, see
<MudMenuItem Disabled="StartRecordingDisabled" OnClick="DisplayStartCountdownDialog">@_localizer["Enter countdown timer"]</MudMenuItem>
</MudMenu>
</MudButtonGroup>
- @if (Cuesheet?.RecordingStart.HasValue == true)
+ @if ((Cuesheet.IsRecording) && (Cuesheet.RecordingStart.HasValue))
{
var recordingTime = DateTime.UtcNow - Cuesheet.RecordingStart;
recordingTime = recordingTime.Value.Subtract(new TimeSpan(0, 0, 0, 0, recordingTime.Value.Milliseconds));
@@ -73,66 +70,68 @@ along with Foobar. If not, see
<MudText Typo="Typo.h5">@String.Format("--{0}--{1}--", CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator, CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator)</MudText>
}
<MudHidden Breakpoint="Breakpoint.SmAndUp" Invert>
- <MudButton Color="Color.Warning" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]">@_localizer["Stop recording"]</MudButton>
+ <MudButton Color="Color.Warning" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]">@_localizer["Stop recording"]</MudButton>
</MudHidden>
<MudHidden Breakpoint="Breakpoint.SmAndUp">
- <MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]" />
+ <MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]" />
</MudHidden>
</MudStack>
</MudCardContent>
</MudCard>
@code {
- Timer updateGUITimer = new(500);
- Timer? startRecordTimer;
- DateTime recordTimerStarted;
+ Timer _updateGUITimer = new(500);
+ Timer? _startRecordTimer;
+ DateTime _recordTimerStarted;
+ string? _errorMessage = null;
- public Cuesheet? Cuesheet
- {
- get
- {
- if (CurrentViewMode == ViewMode.ImportView)
- {
- return _sessionStateContainer.ImportCuesheet;
- }
- return _sessionStateContainer.Cuesheet;
- }
- }
+ public Cuesheet Cuesheet => _sessionStateContainer.Cuesheet;
[CascadingParameter]
public ViewMode CurrentViewMode { get; set; }
- public Boolean StartRecordingDisabled => startRecordTimer?.Enabled == true || Cuesheet?.IsRecordingPossible.Any() == true;
+ public Boolean StartRecordingDisabled => _startRecordTimer?.Enabled == true || _cuesheetManager.IsRecordingPossible.IsSuccess == false;
protected override void OnInitialized()
{
base.OnInitialized();
- updateGUITimer.AutoReset = true;
- updateGUITimer.Elapsed += delegate
+ _updateGUITimer.AutoReset = true;
+ _updateGUITimer.Elapsed += delegate
{
StateHasChanged();
Boolean startRecordTimeEnabled = false;
- if (startRecordTimer != null)
+ if (_startRecordTimer != null)
{
- startRecordTimeEnabled = startRecordTimer.Enabled;
+ startRecordTimeEnabled = _startRecordTimer.Enabled;
}
- if ((startRecordTimeEnabled == false) && (Cuesheet?.IsRecording == false))
+ if ((startRecordTimeEnabled == false) && (Cuesheet.IsRecording == false))
{
- updateGUITimer.Stop();
+ _updateGUITimer.Stop();
}
};
+ var result = _cuesheetManager.IsRecordingPossible;
+ if (result.IsSuccess == false)
+ {
+ _errorMessage = result.Error!.Message;
+ }
}
void StartRecording()
{
- Cuesheet?.StartRecording();
- updateGUITimer.Start();
- Cuesheet!.Audiofile = null;
+ var result = _cuesheetManager.StartRecording();
+ if (result.IsSuccess)
+ {
+ _updateGUITimer.Start();
+ }
+ else
+ {
+ _errorMessage = result.Error!.Message;
+ }
}
void StopRecording()
{
- Cuesheet?.StopRecording();
+ _cuesheetManager.StopRecording();
}
async Task DisplayStartCountdownDialog()
@@ -143,16 +142,16 @@ along with Foobar. If not, see
var recordCountdownTimer = result?.Data as uint?;
if ((result?.Canceled == false) && (recordCountdownTimer.HasValue))
{
- startRecordTimer = new Timer(recordCountdownTimer.Value * 1000);
- startRecordTimer.Elapsed += delegate
+ _startRecordTimer = new Timer(recordCountdownTimer.Value * 1000);
+ _startRecordTimer.Elapsed += delegate
{
StartRecording();
- startRecordTimer.Stop();
- startRecordTimer.Dispose();
+ _startRecordTimer.Stop();
+ _startRecordTimer.Dispose();
};
- startRecordTimer.Start();
- updateGUITimer.Start();
- recordTimerStarted = DateTime.Now;
+ _startRecordTimer.Start();
+ _updateGUITimer.Start();
+ _recordTimerStarted = DateTime.Now;
}
}
}
diff --git a/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor b/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
index 6e949688..d8f4708d 100644
--- a/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
@@ -19,6 +19,7 @@ along with Foobar. If not, see
@inject AutocompleteManager _autocompleteManager
@inject ValidationService _validationService
+@inject ITrackManager _trackManager
<MudAutocomplete T="MusicBrainzArtist" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(MusicBrainzArtist? value) => value?.Name" @bind-Text="_artist"
Value="_autocompleteArtist" ValueChanged="ValueChanged" Clearable ShowProgressIndicator Validation="(string? newArtist) => _validationService.Validate(Track, nameof(Track.Artist))"
@@ -76,7 +77,7 @@ along with Foobar. If not, see
try
{
await Task.Delay(100, token);
- Track.Artist = _artist;
+ _trackManager.SetProperty(Track, x => x.Artist, _artist);
}
catch (TaskCanceledException)
{
diff --git a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
index 68b190ff..44842526 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
@@ -19,6 +19,7 @@ along with Foobar. If not, see
@inject AutocompleteManager _autocompleteManager
@inject ValidationService _validationService
+@inject ITrackManager _trackManager
<MudAutocomplete T="MusicBrainzTrack" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, Track.Artist, token)" ToStringFunc="(MusicBrainzTrack? value) => value?.Title"
@bind-Text="_title" Value="_autocompleteTrack" ValueChanged="TitleSelected" ResetValueOnEmptyText Clearable ShowProgressIndicator
@@ -81,18 +82,18 @@ along with Foobar. If not, see
{
await Task.Delay(100, token);
base.TraceChangeManager.BulkEdit = true;
- Track.Title = _title;
+ _trackManager.SetProperty(Track, x => x.Title, _title);
switch (CurrentViewMode)
{
case ViewMode.DetailView:
case ViewMode.ImportView:
if ((String.IsNullOrEmpty(Track.Artist)) && (String.IsNullOrEmpty(_autocompleteTrack?.Artist) == false))
{
- Track.Artist = _autocompleteTrack.Artist;
+ _trackManager.SetProperty(Track, x => x.Artist, _autocompleteTrack.Artist);
}
if ((Track.Length.HasValue == false) && (_autocompleteTrack?.Length.HasValue == true))
{
- Track.Length = _autocompleteTrack?.Length;
+ _trackManager.SetProperty(Track, x => x.Length, _autocompleteTrack.Length);
}
break;
}
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 912fc315..ecf47026 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -26,6 +26,9 @@ along with Foobar. If not, see
@inject PlaybackService _playbackService
@inject IDialogService _dialogService
@inject ISessionStateContainer _sessionStateContainer
+@inject ITrackManager _trackManager
+@inject ICuesheetManager _cuesheetManager
+@inject ITraceChangeManager _traceChangeManager
@switch (CurrentViewMode)
{
@@ -43,34 +46,29 @@ along with Foobar. If not, see
</MudAlert>
}
<div aria-label="@_localizer["Track table controls"]">
- <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="selectedTracks.Count == 0"
- DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="selectedTracks.Count == 0"
+ <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="_selectedTracks.Count == 0"
+ DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
- MoveTracksUpDisabled="!(Cuesheet?.MoveTracksPossible(selectedTracks, MoveDirection.Up) == true)" MoveTracksUpClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Up)"
- MoveTracksDownDisabled="!(Cuesheet?.MoveTracksPossible(selectedTracks, MoveDirection.Down) == true)" MoveTracksDownClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Down)"
- CopySelectedTracksDisabled="selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
- FixedHeader="applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !applicationOptions?.FixedTracksTableHeader)" />
+ MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUp(_selectedTracks)"
+ MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDown(_selectedTracks)"
+ CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
+ FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
</div>
break;
}
-<MudForm @ref="form">
- <MudDataGrid T="Track" Items="Cuesheet?.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
- EditMode="DataGridEditMode.Cell" ColumnResizeMode="ResizeMode.Column" RowContextMenuClick="OpenMenuContent" Height="@(applicationOptions?.FixedTracksTableHeader == true ? "600px" : null)"
- FixedHeader="applicationOptions?.FixedTracksTableHeader == true" Validator="form" Virtualize>
+<MudForm @ref="_form">
+ <MudDataGrid T="Track" Items="Cuesheet?.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="_selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
+ EditMode="DataGridEditMode.Cell" ColumnResizeMode="ResizeMode.Column" RowContextMenuClick="OpenMenuContent" Height="@(_applicationOptions?.FixedTracksTableHeader == true ? "600px" : null)"
+ FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" Validator="_form" Virtualize SortMode="SortMode.None">
<Columns>
<SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
<TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
<EditTemplate>
- <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => Cuesheet?.RemoveTrack(context.Item)" />
+ <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks([context.Item])" />
</EditTemplate>
</TemplateColumn>
- <PropertyColumn Property="x => x.Position" Title="#" Editable="CurrentViewMode != ViewMode.RecordView" HeaderStyle="width: 1px;">
- <EditTemplate>
- <MudNumericField Validation="(uint? newPosition) => _validationService.Validate(context.Item, nameof(Track.Position))" Value="context.Item.Position"
- ValueChanged="(uint? newPosition) => PositionChanged(context.Item, newPosition)" />
- </EditTemplate>
- </PropertyColumn>
+ <PropertyColumn Property="x => x.Position" Title="#" Editable="false" HeaderStyle="width: 1px;" />
<PropertyColumn Property="x => x.Artist" Title="@_localizer["Artist"]">
<EditTemplate>
<ArtistColumn Track="context.Item" />
@@ -113,7 +111,7 @@ along with Foobar. If not, see
@if (Cuesheet?.Tracks.FirstOrDefault() != context.Item)
{
<MudTooltip Text="@GetLinkedTrackTooltip(context.Item)">
- <MudChip Icon="@GetLinkedTrackIcon(context.Item)" Color="Color.Secondary" OnClick="() => context.Item.IsLinkedToPreviousTrack = !context.Item.IsLinkedToPreviousTrack" />
+ <MudChip Icon="@GetLinkedTrackIcon(context.Item)" Color="Color.Secondary" OnClick="() => _trackManager.SetProperty(context.Item, x => x.IsLinkedToPreviousTrack, !context.Item.IsLinkedToPreviousTrack)" />
</MudTooltip>
}
</EditTemplate>
@@ -122,20 +120,20 @@ along with Foobar. If not, see
</MudDataGrid>
</MudForm>
-<MudMenu PositionAtCursor @ref="trackContextMenu">
- @if (contextMenuTrack != null)
+<MudMenu PositionAtCursor @ref="_trackContextMenu">
+ @if (_contextMenuTrack != null)
{
- <MudMenuItem Icon="@Icons.Material.Outlined.PlayArrow" Disabled="_playbackService.PlaybackPossible == false" OnClick="() => _playbackService.PlayAsync(contextMenuTrack)">@_localizer["Start playback of this track"]</MudMenuItem>
- <MudMenuItem Icon="@Icons.Material.Outlined.CopyAll" OnClick="() => CopyTrackClicked(contextMenuTrack)">@_localizer["Duplicate this track"]</MudMenuItem>
+ <MudMenuItem Icon="@Icons.Material.Outlined.PlayArrow" Disabled="_playbackService.IsPlaybackPossible == false" OnClick="() => _playbackService.PlayAsync(_contextMenuTrack)">@_localizer["Start playback of this track"]</MudMenuItem>
+ <MudMenuItem Icon="@Icons.Material.Outlined.CopyAll" OnClick="() => CopyTrackClicked(_contextMenuTrack)">@_localizer["Duplicate this track"]</MudMenuItem>
}
</MudMenu>
@code {
- HashSet<Track> selectedTracks = new();
- MudMenu? trackContextMenu;
- Track? contextMenuTrack;
- ApplicationOptions? applicationOptions;
- MudForm? form;
+ HashSet<Track> _selectedTracks = new();
+ MudMenu? _trackContextMenu;
+ Track? _contextMenuTrack;
+ ApplicationOptions? _applicationOptions;
+ MudForm? _form;
public Cuesheet? Cuesheet
{
@@ -156,38 +154,37 @@ along with Foobar. If not, see
{
base.Dispose(disposing);
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
- _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
_sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
+ _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
}
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
- applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
+ _applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
- _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
_sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
+ _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
}
void AddTrackClicked()
{
var newTrack = new Track()
{
- IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
+ IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
};
- Cuesheet?.AddTrack(newTrack);
- TraceChangeManager.TraceChanges(newTrack);
+ _cuesheetManager.AddTrack(newTrack);
}
async Task EditSelectedTracksClicked()
{
- await _editTrackModalManager.ShowAndHandleModalEditDialogAsync(selectedTracks);
+ await _editTrackModalManager.ShowAndHandleModalEditDialogAsync(_selectedTracks);
}
void DeleteSelectedTracksClicked()
{
- Cuesheet?.RemoveTracks(selectedTracks.ToList());
- selectedTracks.Clear();
+ _cuesheetManager.RemoveTracks(_selectedTracks);
+ _selectedTracks.Clear();
}
async Task OnDeleteAllTracksClicked()
@@ -200,8 +197,8 @@ along with Foobar. If not, see
var result = await dialog.Result;
if (result?.Canceled == false)
{
- Cuesheet?.RemoveTracks(Cuesheet.Tracks);
- selectedTracks.Clear();
+ _cuesheetManager.RemoveTracks(Cuesheet!.Tracks);
+ _selectedTracks.Clear();
}
}
@@ -229,13 +226,15 @@ along with Foobar. If not, see
var trackThatWillBeCopied = trackToCopy;
if (trackThatWillBeCopied == null)
{
- trackThatWillBeCopied = selectedTracks.FirstOrDefault();
+ trackThatWillBeCopied = _selectedTracks.FirstOrDefault();
}
if (trackThatWillBeCopied != null)
{
- var copy = new Track(trackThatWillBeCopied);
- Cuesheet?.AddTrack(copy);
- TraceChangeManager.TraceChanges(copy);
+ var copy = _trackManager.Clone(trackThatWillBeCopied);
+ copy.Position = (ushort?)(trackThatWillBeCopied.Position + 1);
+ copy.Begin = trackThatWillBeCopied.End;
+ copy.End = null;
+ _cuesheetManager.AddTrack(copy);
await EditTrackModalClicked(copy);
}
}
@@ -247,10 +246,10 @@ along with Foobar. If not, see
async Task OpenMenuContent(DataGridRowClickEventArgs<Track> args)
{
- contextMenuTrack = args.Item;
- if (trackContextMenu != null)
+ _contextMenuTrack = args.Item;
+ if (_trackContextMenu != null)
{
- await trackContextMenu.OpenMenuAsync(args.MouseEventArgs);
+ await _trackContextMenu.OpenMenuAsync(args.MouseEventArgs);
}
}
@@ -282,35 +281,39 @@ along with Foobar. If not, see
{
if (option is ApplicationOptions applicationOption)
{
- applicationOptions = applicationOption;
+ _applicationOptions = applicationOption;
StateHasChanged();
}
}
- async Task PositionChanged(Track track, uint? newPosition)
+ async Task PositionChanged(Track track, ushort? newPosition)
{
track.Position = newPosition;
- if (form != null)
+ if (_form != null)
{
- await form.ValidateAsync();
+ await _form.ValidateAsync();
}
}
- async Task TimespanChanged<TProperty>(Track track, System.Linq.Expressions.Expression<Func<Track, TProperty>> expression, String value)
+ async Task TimespanChanged(Track track, System.Linq.Expressions.Expression<Func<Track, TimeSpan?>> expression, String value)
{
- await _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TProperty>(track, expression, value);
- if (form != null)
+ var timeSpan = await _applicationOptionsTimeSpanParser.GetTimespanAsync(value);
+ _traceChangeManager.BulkEdit = true;
+ _trackManager.SetProperty<TimeSpan?>(track, expression, timeSpan);
+ _trackManager.RecalculateLinkedTracksProperties(track);
+ _traceChangeManager.BulkEdit = false;
+ if (_form != null)
{
- await form.ValidateAsync();
+ await _form.ValidateAsync();
}
}
- void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
+ void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
{
StateHasChanged();
}
- void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
+ void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
{
StateHasChanged();
}
diff --git a/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx b/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx
index 11980259..03a8dac3 100644
--- a/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx
+++ b/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Analyze" xml:space="preserve">
- <value>Analysiere</value>
+ <value>Analysieren</value>
</data>
<data name="Back" xml:space="preserve">
<value>Zurück</value>
diff --git a/AudioCuesheetEditor/_Imports.razor b/AudioCuesheetEditor/_Imports.razor
index 911e475a..330acc5e 100644
--- a/AudioCuesheetEditor/_Imports.razor
+++ b/AudioCuesheetEditor/_Imports.razor
@@ -38,6 +38,7 @@
@using AudioCuesheetEditor.Services.UI
@using AudioCuesheetEditor.Services.Validation
@using AudioCuesheetEditor.Services.Audio
+@using AudioCuesheetEditor.Services.AudioCuesheet
@using Microsoft.Extensions.Logging
@using Microsoft.Extensions.Localization
@using BlazorDownloadFile
|