Add to playlist feature in the 'shuffle' section

master
François-Xavier Thomas 8 years ago
parent 71b17a8588
commit 1311e0220a
No known key found for this signature in database
GPG Key ID: 64337406D2DD45CE
  1. 5
      libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java
  2. 2
      libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
  3. 6
      libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp

@ -166,6 +166,9 @@ public class RandomPlayQueueController extends ParameterizableViewController {
// Handle the music folder filter
List<MusicFolder> musicFolders = getMusicFolders(request);
// Do we add to the current playlist or do we replace it?
boolean shouldAddToPlayList = ServletRequestUtils.getBooleanParameter(request, "addToPlaylist", false);
// Search the database using these criteria
RandomSearchCriteria criteria = new RandomSearchCriteria(
size,
@ -184,7 +187,7 @@ public class RandomPlayQueueController extends ParameterizableViewController {
User user = securityService.getCurrentUser(request);
Player player = playerService.getPlayer(request, response);
PlayQueue playQueue = player.getPlayQueue();
playQueue.addFiles(false, mediaFileService.getRandomSongs(criteria, user.getUsername()));
playQueue.addFiles(shouldAddToPlayList, mediaFileService.getRandomSongs(criteria, user.getUsername()));
if (request.getParameter("autoRandom") != null) {
playQueue.setRandomSearchCriteria(criteria);

@ -233,7 +233,7 @@ more.random.text = Shuffle play
more.random.songs = {0} songs
more.random.auto = Play more random songs when end of play queue is reached.
more.random.ok = OK
more.random.add = Add
more.random.add = Add to current playlist
more.random.any = Any
more.random.format = Format
more.random.before = Before

@ -172,9 +172,9 @@
</td>
</tr>
<tr>
<td>
<input type="submit" name="actionOk" value="<fmt:message key="more.random.ok"/>">
<input type="submit" name="actionAdd" value="<fmt:message key="more.random.add"/>">
<td colspan="2">
<input type="submit" value="<fmt:message key="more.random.ok"/>">
<input type="checkbox" name="addToPlaylist" value="true"/> <fmt:message key="more.random.add"/>
</td>
</tr>
<c:if test="${not model.clientSidePlaylist}">

Loading…
Cancel
Save