Skip to content

Commit 3429f4f

Browse files
Merge pull request #613 from NeoCoderMatrix86/569-add-buttons-for-moving-to-position
Add buttons for moving to position
2 parents 8bfbb36 + a68f4db commit 3429f4f

27 files changed

Lines changed: 470 additions & 465 deletions

‎AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,75 @@ public void MoveUp_TracksAbove_ReturnsSuccess()
706706
_traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
707707
}
708708

709+
[TestMethod]
710+
public void MoveUp_Move2Positions_ReturnsSuccess()
711+
{
712+
// Arrange
713+
var track1End = new TimeSpan(0, 3, 12);
714+
var track1 = new Track()
715+
{
716+
Position = 1,
717+
Begin = TimeSpan.Zero,
718+
End = track1End,
719+
IsLinkedToPreviousTrack = true
720+
};
721+
var track2End = new TimeSpan(0, 7, 34);
722+
var track2 = new Track()
723+
{
724+
Position = 2,
725+
Begin = track1End,
726+
End = track2End,
727+
IsLinkedToPreviousTrack = true
728+
};
729+
var track3End = new TimeSpan(0, 10, 4);
730+
var track3 = new Track()
731+
{
732+
Position = 3,
733+
Begin = track2End,
734+
End = track3End,
735+
IsLinkedToPreviousTrack = true
736+
};
737+
var track4 = new Track()
738+
{
739+
Position = 4,
740+
Begin = track3End,
741+
End = new TimeSpan(0, 13, 45),
742+
IsLinkedToPreviousTrack = true
743+
};
744+
var cuesheet = new Cuesheet()
745+
{
746+
Audiofiles = [
747+
new() {
748+
Tracks = [track4, track3, track2, track1]
749+
}
750+
],
751+
};
752+
track1.Cuesheet = cuesheet;
753+
track2.Cuesheet = cuesheet;
754+
track3.Cuesheet = cuesheet;
755+
track4.Cuesheet = cuesheet;
756+
track1.Audiofile = cuesheet.Audiofiles.First();
757+
track2.Audiofile = cuesheet.Audiofiles.First();
758+
track3.Audiofile = cuesheet.Audiofiles.First();
759+
track4.Audiofile = cuesheet.Audiofiles.First();
760+
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
761+
// Act
762+
var result = _cuesheetManager.MoveUp([track2, track3], 2);
763+
// Assert
764+
Assert.IsTrue(result.IsSuccess);
765+
Assert.AreEqual((ushort?)1, track2.Position);
766+
Assert.AreEqual(TimeSpan.Zero, track2.Begin);
767+
Assert.AreEqual(track1End, track2.End);
768+
Assert.AreEqual((ushort?)2, track3.Position);
769+
Assert.AreEqual(track1End, track3.Begin);
770+
Assert.AreEqual(track2End, track3.End);
771+
Assert.AreEqual((ushort?)3, track1.Position);
772+
Assert.AreEqual(track2End, track1.Begin);
773+
_traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet.Audiofiles.First() && y.TraceableChange.PropertyName == nameof(Audiofile.Tracks))), Times.Never);
774+
_traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Once);
775+
_traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
776+
}
777+
709778
[TestMethod]
710779
public void MoveUp_NoTracksAbove_ReturnsFailure()
711780
{
@@ -1060,6 +1129,78 @@ public void MoveDown_TracksBelow_ReturnsSuccess()
10601129
_traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
10611130
}
10621131

1132+
[TestMethod]
1133+
public void MoveDown_Move2Positions_ReturnsSuccess()
1134+
{
1135+
// Arrange
1136+
var track1End = new TimeSpan(0, 3, 12);
1137+
var track1 = new Track()
1138+
{
1139+
Position = 1,
1140+
Begin = TimeSpan.Zero,
1141+
End = track1End,
1142+
IsLinkedToPreviousTrack = true
1143+
};
1144+
var track2End = new TimeSpan(0, 7, 34);
1145+
var track2 = new Track()
1146+
{
1147+
Position = 2,
1148+
Begin = track1End,
1149+
End = track2End,
1150+
IsLinkedToPreviousTrack = true
1151+
};
1152+
var track3End = new TimeSpan(0, 10, 4);
1153+
var track3 = new Track()
1154+
{
1155+
Position = 3,
1156+
Begin = track2End,
1157+
End = track3End,
1158+
IsLinkedToPreviousTrack = true
1159+
};
1160+
var track4 = new Track()
1161+
{
1162+
Position = 4,
1163+
Begin = track3End,
1164+
End = new TimeSpan(0, 13, 45),
1165+
IsLinkedToPreviousTrack = true
1166+
};
1167+
var cuesheet = new Cuesheet()
1168+
{
1169+
Audiofiles = [
1170+
new() {
1171+
Tracks = [track4, track3, track2, track1]
1172+
}
1173+
]
1174+
};
1175+
track1.Cuesheet = cuesheet;
1176+
track2.Cuesheet = cuesheet;
1177+
track3.Cuesheet = cuesheet;
1178+
track4.Cuesheet = cuesheet;
1179+
track1.Audiofile = cuesheet.Audiofiles.First();
1180+
track2.Audiofile = cuesheet.Audiofiles.First();
1181+
track3.Audiofile = cuesheet.Audiofiles.First();
1182+
track4.Audiofile = cuesheet.Audiofiles.First();
1183+
_sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
1184+
// Act
1185+
var result = _cuesheetManager.MoveDown([track2, track1], 2);
1186+
// Assert
1187+
Assert.IsTrue(result.IsSuccess);
1188+
Assert.AreEqual((ushort?)1, track3.Position);
1189+
Assert.AreEqual(TimeSpan.Zero, track3.Begin);
1190+
Assert.AreEqual(track1End, track3.End);
1191+
Assert.AreEqual((ushort?)2, track4.Position);
1192+
Assert.AreEqual(track1End, track4.Begin);
1193+
Assert.AreEqual(track2End, track4.End);
1194+
Assert.AreEqual((ushort?)3, track1.Position);
1195+
Assert.AreEqual(track2End, track1.Begin);
1196+
Assert.AreEqual(track3End, track1.End);
1197+
Assert.AreEqual((ushort?)4, track2.Position);
1198+
Assert.AreEqual(track3End, track2.Begin);
1199+
_traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet.Audiofiles.First() && y.TraceableChange.PropertyName == nameof(Audiofile.Tracks))), Times.Never);
1200+
_traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Once);
1201+
_traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
1202+
}
1203+
10631204
[TestMethod]
10641205
public void MoveDown_NoTracksBelow_ReturnsFailure()
10651206
{

‎AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using AudioCuesheetEditor.Tests.Utility;
2020
using Microsoft.VisualStudio.TestTools.UnitTesting;
2121
using System;
22+
using System.Collections.Generic;
2223
using System.Linq;
2324

2425
namespace AudioCuesheetEditor.Tests.Services.UI
@@ -112,6 +113,40 @@ public void BulkEdit_AlreadyEnabledBulkEdit_DoesntDropPreviousEdits()
112113
Assert.IsTrue(_traceChangeManager.CanRedo);
113114
}
114115

116+
117+
[TestMethod()]
118+
public void BulkEditFalse_AfterBulkEditAndUndo_ResetsRedoStack()
119+
{
120+
// Arrange
121+
var audiofile = new Audiofile();
122+
var track1 = new Track();
123+
var track2 = new Track();
124+
var track3 = new Track();
125+
_traceChangeManager.BulkEdit = true;
126+
_traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1 }, nameof(Audiofile.Tracks))));
127+
track1.Audiofile = audiofile;
128+
_traceChangeManager.BulkEdit = false;
129+
_traceChangeManager.BulkEdit = true;
130+
_traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1, track2 }, nameof(Audiofile.Tracks))));
131+
track1.Audiofile = audiofile;
132+
track2.Audiofile = audiofile;
133+
_traceChangeManager.BulkEdit = false;
134+
_traceChangeManager.Undo();
135+
_traceChangeManager.BulkEdit = true;
136+
_traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1, track2, track3 }, nameof(Audiofile.Tracks))));
137+
track1.Audiofile = audiofile;
138+
track2.Audiofile = audiofile;
139+
track3.Audiofile = audiofile;
140+
_traceChangeManager.BulkEdit = false;
141+
_traceChangeManager.BulkEdit = true;
142+
_traceChangeManager.AddChange(new(track2, new("Testartist", nameof(Track.Artist))));
143+
// Act
144+
_traceChangeManager.BulkEdit = false;
145+
// Assert
146+
Assert.IsTrue(_traceChangeManager.CanUndo);
147+
Assert.IsFalse(_traceChangeManager.CanRedo);
148+
}
149+
115150
[TestMethod()]
116151
public void Undo_SingleChange_UndoesChange()
117152
{

‎AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs‎

Lines changed: 61 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -141,41 +141,50 @@ public bool IsMoveDownPossible(HashSet<Audiofile> selectedAudiofiles)
141141
}
142142

143143
/// <inheritdoc/>
144-
public Result MoveUp(HashSet<Track> selectedTracks)
144+
public Result MoveUp(HashSet<Track> selectedTracks, uint positions = 1)
145145
{
146146
if (IsMoveUpPossible(selectedTracks) == false)
147147
{
148148
return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks up is not possible!"));
149149
}
150150
_traceChangeManager.BulkEdit = true;
151-
var cuesheet = _sessionStateContainer.ActiveCuesheet;
152-
foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
151+
while (positions > 0)
153152
{
154-
var previousTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
155-
if (previousTrack?.Audiofile != null && previousTrack.Audiofile != selectedTrack.Audiofile)
153+
if (IsMoveUpPossible(selectedTracks) == false)
156154
{
157-
SwitchAudiofile(selectedTrack, previousTrack.Audiofile);
155+
positions = 0;
156+
break;
158157
}
159-
else
158+
var cuesheet = _sessionStateContainer.ActiveCuesheet;
159+
foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
160160
{
161-
var newBegin = previousTrack?.Begin;
162-
var newEnd = previousTrack?.End;
163-
if (previousTrack != null)
161+
var previousTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
162+
if (previousTrack?.Audiofile != null && previousTrack.Audiofile != selectedTrack.Audiofile)
163+
{
164+
SwitchAudiofile(selectedTrack, previousTrack.Audiofile);
165+
}
166+
else
164167
{
165-
_trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
166-
_trackManager.SetProperty(previousTrack, x => x.Begin, selectedTrack.Begin);
167-
_trackManager.SetProperty(previousTrack, x => x.End, selectedTrack.End);
168+
var newBegin = previousTrack?.Begin;
169+
var newEnd = previousTrack?.End;
170+
if (previousTrack != null)
171+
{
172+
_trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
173+
_trackManager.SetProperty(previousTrack, x => x.Begin, selectedTrack.Begin);
174+
_trackManager.SetProperty(previousTrack, x => x.End, selectedTrack.End);
175+
}
176+
_trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
177+
_trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
178+
_trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
168179
}
169-
_trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
170-
_trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
171-
_trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
180+
172181
}
173-
174-
}
175-
foreach (var audiofile in cuesheet!.Audiofiles)
176-
{
177-
var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
178-
_audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
182+
foreach (var audiofile in cuesheet!.Audiofiles)
183+
{
184+
var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
185+
_audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
186+
}
187+
positions--;
179188
}
180189
_traceChangeManager.BulkEdit = false;
181190
return Result.Success();
@@ -216,40 +225,49 @@ public Result MoveUp(HashSet<Audiofile> selectedAudiofiles)
216225
}
217226

218227
/// <inheritdoc/>
219-
public Result MoveDown(HashSet<Track> selectedTracks)
228+
public Result MoveDown(HashSet<Track> selectedTracks, uint positions = 1)
220229
{
221230
if (IsMoveDownPossible(selectedTracks) == false)
222231
{
223232
return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
224233
}
225234
_traceChangeManager.BulkEdit = true;
226-
var cuesheet = _sessionStateContainer.ActiveCuesheet;
227-
foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
235+
while (positions > 0)
228236
{
229-
var nextTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
230-
if (nextTrack?.Audiofile != null && nextTrack.Audiofile != selectedTrack.Audiofile)
237+
if (IsMoveDownPossible(selectedTracks) == false)
231238
{
232-
SwitchAudiofile(selectedTrack, nextTrack.Audiofile);
239+
positions = 0;
240+
break;
233241
}
234-
else
242+
var cuesheet = _sessionStateContainer.ActiveCuesheet;
243+
foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
235244
{
236-
var newBegin = nextTrack?.Begin;
237-
var newEnd = nextTrack?.End;
238-
if (nextTrack != null)
245+
var nextTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
246+
if (nextTrack?.Audiofile != null && nextTrack.Audiofile != selectedTrack.Audiofile)
247+
{
248+
SwitchAudiofile(selectedTrack, nextTrack.Audiofile);
249+
}
250+
else
239251
{
240-
_trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
241-
_trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
242-
_trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
252+
var newBegin = nextTrack?.Begin;
253+
var newEnd = nextTrack?.End;
254+
if (nextTrack != null)
255+
{
256+
_trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
257+
_trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
258+
_trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
259+
}
260+
_trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
261+
_trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
262+
_trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
243263
}
244-
_trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
245-
_trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
246-
_trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
247264
}
248-
}
249-
foreach (var audiofile in cuesheet!.Audiofiles)
250-
{
251-
var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
252-
_audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
265+
foreach (var audiofile in cuesheet!.Audiofiles)
266+
{
267+
var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
268+
_audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
269+
}
270+
positions--;
253271
}
254272
_traceChangeManager.BulkEdit = false;
255273
return Result.Success();

‎AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ public interface ICuesheetManager
7878
/// Moves selected tracks up
7979
/// </summary>
8080
/// <param name="selectedTracks"></param>
81-
Result MoveUp(HashSet<Track> selectedTracks);
81+
/// <param name="positions"></param>
82+
/// <returns></returns>
83+
Result MoveUp(HashSet<Track> selectedTracks, uint positions = 1);
8284
/// <summary>
8385
/// Moves selected audiofiles up
8486
/// </summary>
@@ -89,8 +91,9 @@ public interface ICuesheetManager
8991
/// Moves selected tracks down
9092
/// </summary>
9193
/// <param name="selectedTracks"></param>
94+
/// <param name="positions"></param>
9295
/// <returns></returns>
93-
Result MoveDown(HashSet<Track> selectedTracks);
96+
Result MoveDown(HashSet<Track> selectedTracks, uint positions = 1);
9497
/// <summary>
9598
/// Moves selected audiofiles down
9699
/// </summary>

‎AudioCuesheetEditor/Services/Result.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ public enum ErrorType
3131
/// <summary>
3232
/// Current action is not possible
3333
/// </summary>
34-
NotPossible
34+
NotPossible,
35+
/// <summary>
36+
/// Action was aborted
37+
/// </summary>
38+
Aborted,
3539
}
3640

3741
/// <summary>

0 commit comments

Comments
 (0)