Skip to content

Reset of cuesheet not working #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeoCoderMatrix86 merged 7 commits into from
Sep 18, 2026
Merged

Reset of cuesheet not working #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6c1ab2
switch active cuesheet handling
NeoCoderMatrix86 Sep 17, 2026
921056d
fix tests
NeoCoderMatrix86 Sep 17, 2026
21d6a33
fix tests
NeoCoderMatrix86 Sep 18, 2026
0b77052
fix resetimport
NeoCoderMatrix86 Sep 18, 2026
86b7479
Update DisplayAnalyzedResult.razor
NeoCoderMatrix86 Sep 18, 2026
083e3eb
standardise audiofiles component
NeoCoderMatrix86 Sep 18, 2026
083eab1
standardise cuesheetdata component
NeoCoderMatrix86 Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions AudioCuesheetEditor.Tests/Services/AudioCuesheet/AudiofileManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public void AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties()
{
Audiofiles = [audiofile]
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
var track = new Track();
// Act
_audiofileManager.AddTrack(audiofile, track);
Expand Down Expand Up @@ -302,7 +302,7 @@ public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertie
{
Audiofiles = [audiofile]
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
var track = new Track()
{
IsLinkedToPreviousTrack = true
Expand Down Expand Up @@ -343,7 +343,7 @@ public void AddTrack_DuringRecording_AddsNewTrackWithCalulatedTrackProperties()
RecordingStart = DateTime.UtcNow,
Audiofiles = [audiofile]
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
var track = new Track()
{
IsLinkedToPreviousTrack = true
Expand Down Expand Up @@ -372,7 +372,7 @@ public void AddTrack_FirstTrackImporting_AddsNewTrackWithCalulatedTrackPropertie
{
Audiofiles = [audiofile]
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(importCuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(importCuesheet);
var track = new Track();
// Act
_audiofileManager.AddTrack(audiofile, track);
Expand Down Expand Up @@ -441,7 +441,7 @@ public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainin
track3.Cuesheet = cuesheet;
track4.Cuesheet = cuesheet;
track5.Cuesheet = cuesheet;
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
_audiofileManager.RemoveTracks(audiofile, [track2, track4]);
// Assert
Expand Down Expand Up @@ -519,7 +519,7 @@ public void RemoveTracks_DuringImport_RemovesTracksAndRecalculatesRemainingTrack
track3.Audiofile = audiofile;
track4.Audiofile = audiofile;
track5.Audiofile = audiofile;
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(importCuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(importCuesheet);
// Act
_audiofileManager.RemoveTracks(audiofile, [track2, track4]);
// Assert
Expand Down
42 changes: 20 additions & 22 deletions AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void SetProperty_NewValue_ChangesPropertyAndSetsTracedChange()
{
// Arrange
var cuesheet = new Cuesheet();
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
_cuesheetManager.SetProperty(x => x.Artist, "Artist");
// Assert
Expand All @@ -80,7 +80,7 @@ public void SetProperty_EqualValue_DoesntChangeProperty()
{
Artist = "Artist"
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
_cuesheetManager.SetProperty(x => x.Artist, cuesheet.Artist);
// Assert
Expand All @@ -107,7 +107,7 @@ public void SetProperty_DeletedAudiofile_RevokesObjectURLs()
{
Audiofiles = [audiofile1, audiofile2]
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
var files = new List<Audiofile>(cuesheet.Audiofiles);
files.Remove(audiofile2);
// Act
Expand Down Expand Up @@ -390,7 +390,7 @@ public void IsMoveUpPossible_AudiofilesAbove_ReturnsTrue()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.IsMoveUpPossible([file2, file3]);
// Assert
Expand All @@ -408,7 +408,7 @@ public void IsMoveUpPossible_NoAudiofilesAbove_ReturnsFalse()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.IsMoveUpPossible([file1, file2]);
// Assert
Expand Down Expand Up @@ -461,7 +461,7 @@ public void IsMoveDownPossible_TracksBelow_ReturnsTrue()
track1.Cuesheet = cuesheet;
track2.Cuesheet = cuesheet;
track3.Cuesheet = cuesheet;
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.IsMoveDownPossible([track2, track1]);
// Assert
Expand Down Expand Up @@ -531,7 +531,7 @@ public void IsMoveDownPossible_AudiofilesBelow_ReturnsTrue()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.IsMoveDownPossible([file2, file1]);
// Assert
Expand All @@ -549,7 +549,7 @@ public void IsMoveDownPossible_NoAudiofilesBelow_ReturnsFalse()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.IsMoveDownPossible([file3, file2]);
// Assert
Expand Down Expand Up @@ -610,7 +610,7 @@ public void MoveUp_TracksSwitchingAudiofile_ReturnsSuccess()
track1.Audiofile = cuesheet.Audiofiles.First();
track2.Audiofile = cuesheet.Audiofiles.Last();
track3.Audiofile = cuesheet.Audiofiles.Last();
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveUp([track2, track3]);
// Assert
Expand Down Expand Up @@ -672,7 +672,7 @@ public void MoveUp_TracksAbove_ReturnsSuccess()
track1.Audiofile = cuesheet.Audiofiles.First();
track2.Audiofile = cuesheet.Audiofiles.First();
track3.Audiofile = cuesheet.Audiofiles.First();
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveUp([track2, track3]);
// Assert
Expand Down Expand Up @@ -850,19 +850,18 @@ public void MoveUp_AudiofilesAbove_ReturnsSuccess()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
track1.Cuesheet = cuesheet;
track2.Cuesheet = cuesheet;
track3.Cuesheet = cuesheet;
track1.Audiofile = file2;
track2.Audiofile = file2;
track3.Audiofile = file3;
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveUp([file2, file3]);
// Assert
Assert.IsTrue(result.IsSuccess);
CollectionAssert.AreEquivalent(new List<Audiofile>([file2, file3, file1]), cuesheet.Audiofiles.ToList());
Assert.AreSequenceEqual(new List<Audiofile>([file2, file3, file1]), cuesheet.Audiofiles);
Assert.IsEmpty(file1.Tracks);
Assert.AreEqual((ushort?)1, track1.Position);
Assert.AreEqual(TimeSpan.Zero, track1.Begin);
Expand Down Expand Up @@ -890,7 +889,7 @@ public void MoveUp_NoAudiofilesAbove_ReturnsFailure()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveUp([file1, file2]);
// Assert
Expand All @@ -911,7 +910,7 @@ public void MoveUp_NoAudiofilesSelected_ReturnsFailure()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveUp(new HashSet<Audiofile>());
// Assert
Expand Down Expand Up @@ -965,7 +964,7 @@ public void MoveDown_TracksSwitchingAudiofile_ReturnsSuccess()
track1.Audiofile = cuesheet.Audiofiles.First();
track2.Audiofile = cuesheet.Audiofiles.First();
track3.Audiofile = cuesheet.Audiofiles.Last();
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveDown([track2, track1]);
// Assert
Expand Down Expand Up @@ -1027,7 +1026,7 @@ public void MoveDown_TracksBelow_ReturnsSuccess()
track1.Audiofile = cuesheet.Audiofiles.First();
track2.Audiofile = cuesheet.Audiofiles.First();
track3.Audiofile = cuesheet.Audiofiles.First();
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveDown([track2, track1]);
// Assert
Expand Down Expand Up @@ -1205,19 +1204,18 @@ public void MoveDown_AudiofilesBelow_ReturnsSuccess()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
track1.Cuesheet = cuesheet;
track2.Cuesheet = cuesheet;
track3.Cuesheet = cuesheet;
track1.Audiofile = file2;
track2.Audiofile = file2;
track3.Audiofile = file3;
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveDown([file2, file1]);
// Assert
Assert.IsTrue(result.IsSuccess);
CollectionAssert.AreEquivalent(new List<Audiofile>([file3, file2, file1]), cuesheet.Audiofiles.ToList());
Assert.AreSequenceEqual(new List<Audiofile>([file3, file1, file2]), cuesheet.Audiofiles);
Assert.AreEqual((ushort?)1, track1.Position);
Assert.AreEqual(TimeSpan.Zero, track1.Begin);
Assert.AreEqual(track1End, track1.End);
Expand All @@ -1244,7 +1242,7 @@ public void MoveDown_NoAudiofilesBelow_ReturnsFailure()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveDown([file2, file3]);
// Assert
Expand All @@ -1265,7 +1263,7 @@ public void MoveDown_NoAudiofilesSelected_ReturnsFailure()
{
Audiofiles = [file1, file2, file3],
};
_sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
// Act
var result = _cuesheetManager.MoveDown(new HashSet<Audiofile>());
// Assert
Expand Down
Loading
Loading