Skip to content
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

#212 Replace PlayQueueDao to Repository #342

Merged
merged 4 commits into from
Jan 24, 2024
Merged

#212 Replace PlayQueueDao to Repository #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ee1110
#212 replaced PlayQueueDao to SavedPlayQueueRepository
kagemomiji Jan 2, 2024
c521d89
#212 removed AbstractDao
kagemomiji Jan 2, 2024
1da9558
Merge branch 'issue336-hikari-pool-problem' into issue212-play-queue-…
kagemomiji Jan 22, 2024
6b926b0
Merge branch 'main' into issue212-play-queue-repository
kagemomiji Jan 24, 2024
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
14 changes: 5 additions & 9 deletions airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.airsonic.player.ajax.LyricsInfo;
import org.airsonic.player.ajax.LyricsWSController;
import org.airsonic.player.command.UserSettingsCommand;
import org.airsonic.player.dao.PlayQueueDao;
import org.airsonic.player.domain.*;
import org.airsonic.player.domain.Bookmark;
import org.airsonic.player.domain.CoverArt.EntityType;
Expand Down Expand Up @@ -147,8 +146,6 @@ public class SubsonicRESTController {
@Autowired
private BookmarkService bookmarkService;
@Autowired
private PlayQueueDao playQueueDao;
@Autowired
private MediaScannerService mediaScannerService;
@Autowired
private MediaFolderService mediaFolderService;
Expand Down Expand Up @@ -1779,21 +1776,20 @@ public void getPlayQueue(HttpServletRequest request, HttpServletResponse respons
String username = securityService.getCurrentUsername(request);
Player player = playerService.getPlayer(request, response, username);

SavedPlayQueue playQueue = playQueueDao.getPlayQueue(username);
SavedPlayQueue playQueue = playQueueService.loadSavedPlayQueueForRest(username);
if (playQueue == null) {
writeEmptyResponse(request, response);
return;
}

org.subsonic.restapi.PlayQueue restPlayQueue = new org.subsonic.restapi.PlayQueue();
restPlayQueue.setUsername(playQueue.getUsername());
restPlayQueue.setCurrent(playQueue.getCurrentMediaFileId());
restPlayQueue.setCurrent(Optional.ofNullable(playQueue.getCurrentMediaFile()).map(MediaFile::getId).orElse(null));
restPlayQueue.setPosition(playQueue.getPositionMillis());
restPlayQueue.setChanged(jaxbWriter.convertDate(playQueue.getChanged()));
restPlayQueue.setChangedBy(playQueue.getChangedBy());

for (Integer mediaFileId : playQueue.getMediaFileIds()) {
MediaFile mediaFile = mediaFileService.getMediaFile(mediaFileId);
for (MediaFile mediaFile : playQueue.getMediaFiles()) {
if (mediaFile != null) {
restPlayQueue.getEntry().add(createJaxbChild(player, mediaFile, username));
}
Expand All @@ -1818,8 +1814,8 @@ public void savePlayQueue(HttpServletRequest request, HttpServletResponse respon
return;
}

SavedPlayQueue playQueue = new SavedPlayQueue(null, username, mediaFileIds, current, position, Instant.now(), changedBy);
playQueueDao.savePlayQueue(playQueue);
playQueueService.savePlayQueue(username, mediaFileIds, current, position, changedBy);

writeEmptyResponse(request, response);
}

Expand Down
308 changes: 0 additions & 308 deletions airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion airsonic-main/src/main/java/org/airsonic/player/dao/DatabaseDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
import org.airsonic.player.util.LambdaUtils.ThrowingBiFunction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Repository;

import java.nio.file.Path;
import java.sql.Connection;
import java.util.function.Consumer;

@Repository
public class DatabaseDao extends AbstractDao {
public class DatabaseDao {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseDao.class);

@Autowired
private JdbcTemplate jdbcTemplate;

public boolean exportDB(Path tempWorkingDir, ThrowingBiFunction<Path, Connection, Boolean, Exception> exportFunction) throws Exception {
try (Connection con = jdbcTemplate.getDataSource().getConnection()) {
return exportFunction.apply(tempWorkingDir, con);
Expand Down
Loading