Skip to content

Commit 46cbab4

Browse files
move tracks down several positions
1 parent 7376799 commit 46cbab4

6 files changed

Lines changed: 133 additions & 24 deletions

File tree

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,6 +1129,78 @@ public void MoveDown_TracksBelow_ReturnsSuccess()
11291129
_traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
11301130
}
11311131

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+
11321204
[TestMethod]
11331205
public void MoveDown_NoTracksBelow_ReturnsFailure()
11341206
{

‎AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -225,40 +225,49 @@ public Result MoveUp(HashSet<Audiofile> selectedAudiofiles)
225225
}
226226

227227
/// <inheritdoc/>
228-
public Result MoveDown(HashSet<Track> selectedTracks)
228+
public Result MoveDown(HashSet<Track> selectedTracks, uint positions = 1)
229229
{
230230
if (IsMoveDownPossible(selectedTracks) == false)
231231
{
232232
return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
233233
}
234234
_traceChangeManager.BulkEdit = true;
235-
var cuesheet = _sessionStateContainer.ActiveCuesheet;
236-
foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
235+
while (positions > 0)
237236
{
238-
var nextTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
239-
if (nextTrack?.Audiofile != null && nextTrack.Audiofile != selectedTrack.Audiofile)
237+
if (IsMoveDownPossible(selectedTracks) == false)
240238
{
241-
SwitchAudiofile(selectedTrack, nextTrack.Audiofile);
239+
positions = 0;
240+
break;
242241
}
243-
else
242+
var cuesheet = _sessionStateContainer.ActiveCuesheet;
243+
foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
244244
{
245-
var newBegin = nextTrack?.Begin;
246-
var newEnd = nextTrack?.End;
247-
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)
248247
{
249-
_trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
250-
_trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
251-
_trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
248+
SwitchAudiofile(selectedTrack, nextTrack.Audiofile);
249+
}
250+
else
251+
{
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);
252263
}
253-
_trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
254-
_trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
255-
_trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
256264
}
257-
}
258-
foreach (var audiofile in cuesheet!.Audiofiles)
259-
{
260-
var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
261-
_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--;
262271
}
263272
_traceChangeManager.BulkEdit = false;
264273
return Result.Success();

‎AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ public interface ICuesheetManager
9191
/// Moves selected tracks down
9292
/// </summary>
9393
/// <param name="selectedTracks"></param>
94+
/// <param name="positions"></param>
9495
/// <returns></returns>
95-
Result MoveDown(HashSet<Track> selectedTracks);
96+
Result MoveDown(HashSet<Track> selectedTracks, uint positions = 1);
9697
/// <summary>
9798
/// Moves selected audiofiles down
9899
/// </summary>

‎AudioCuesheetEditor/Shared/TrackList/TrackList.de.resx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,13 @@
168168
<data name="Enter positions to move up" xml:space="preserve">
169169
<value>Anzahl der Positionen angeben</value>
170170
</data>
171+
<data name="Move tracks down" xml:space="preserve">
172+
<value>Titel nach unten bewegen</value>
173+
</data>
174+
<data name="Number of positions to move down" xml:space="preserve">
175+
<value>Anzahl der Positionen die nach unten bewegt werden soll</value>
176+
</data>
177+
<data name="Enter positions to move down" xml:space="preserve">
178+
<value>Anzahl der Positionen angeben</value>
179+
</data>
171180
</root>

‎AudioCuesheetEditor/Shared/TrackList/TrackList.razor‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ along with Foobar. If not, see
4242
MoveTracksUpDisabled="!_cuesheetManager.IsMoveUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveUp(_selectedTracks)"
4343
MoveTracksDownDisabled="!_cuesheetManager.IsMoveDownPossible(_selectedTracks)" MoveTracksDownClicked="() => _cuesheetManager.MoveDown(_selectedTracks)"
4444
CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
45-
FixedHeader="_fixedTableHeader" FixedHeaderClicked="() => _fixedTableHeader = !_fixedTableHeader" MoveTracksUpSeveralClicked="MoveTracksUpSeveralClicked" />
45+
FixedHeader="_fixedTableHeader" FixedHeaderClicked="() => _fixedTableHeader = !_fixedTableHeader" MoveTracksUpSeveralClicked="MoveTracksUpSeveralClicked"
46+
MoveTracksDownSeveralClicked="MoveTracksDownSeveralClicked" />
4647
</div>
4748
break;
4849
}
@@ -119,7 +120,6 @@ along with Foobar. If not, see
119120
</MudMenu>
120121

121122
@code {
122-
//TODO: Add handlers for multiple moves
123123
HashSet<Track> _selectedTracks = new();
124124
MudMenu? _trackContextMenu;
125125
Track? _contextMenuTrack;
@@ -297,4 +297,13 @@ along with Foobar. If not, see
297297
_cuesheetManager.MoveUp(_selectedTracks, result.Value);
298298
}
299299
}
300+
301+
async Task MoveTracksDownSeveralClicked()
302+
{
303+
var result = await _dialogManager.ShowInputDialogAsync<uint>(@_localizer["Move tracks down"], @_localizer["Number of positions to move down"], @_localizer["Enter positions to move down"], 1);
304+
if (result.IsSuccess)
305+
{
306+
_cuesheetManager.MoveDown(_selectedTracks, result.Value);
307+
}
308+
}
300309
}

‎AudioCuesheetEditor/Shared/TrackList/TrackList.resx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,13 @@
168168
<data name="Enter positions to move up" xml:space="preserve">
169169
<value>Enter positions to move up</value>
170170
</data>
171+
<data name="Move tracks down" xml:space="preserve">
172+
<value>Move tracks down</value>
173+
</data>
174+
<data name="Number of positions to move down" xml:space="preserve">
175+
<value>Number of positions to move down</value>
176+
</data>
177+
<data name="Enter positions to move down" xml:space="preserve">
178+
<value>Enter positions to move down</value>
179+
</data>
171180
</root>

0 commit comments

Comments
 (0)