MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove an unused/unuseable/half-done cache

Browse Source
This commit is contained in:
jvoisin
2019-09-01 18:11:48 +02:00
parent 46d806df1d
commit 6f57c6e313
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java
-18
View File
@@ -33,7 +33,6 @@ import org.airsonic.player.domain.PlayQueue;
import org.airsonic.player.i18n.LocaleResolver; import org.airsonic.player.i18n.LocaleResolver;
import org.airsonic.player.service.*; import org.airsonic.player.service.*;
import org.airsonic.player.service.search.IndexType; import org.airsonic.player.service.search.IndexType;
import org.airsonic.player.util.Pair;
import org.airsonic.player.util.StringUtil; import org.airsonic.player.util.StringUtil;
import org.airsonic.player.util.Util; import org.airsonic.player.util.Util;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@@ -56,7 +55,6 @@ import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import static org.airsonic.player.security.RESTRequestParameterProcessingFilter.decrypt; import static org.airsonic.player.security.RESTRequestParameterProcessingFilter.decrypt;
import static org.springframework.web.bind.ServletRequestUtils.*; import static org.springframework.web.bind.ServletRequestUtils.*;
@@ -139,7 +137,6 @@ public class SubsonicRESTController {
@Autowired @Autowired
private LocaleResolver localeResolver; private LocaleResolver localeResolver;
private final Map<BookmarkKey, org.airsonic.player.domain.Bookmark> bookmarkCache = new ConcurrentHashMap<BookmarkKey, org.airsonic.player.domain.Bookmark>();
private final JAXBWriter jaxbWriter = new JAXBWriter(); private final JAXBWriter jaxbWriter = new JAXBWriter();
private static final String NOT_YET_IMPLEMENTED = "Not yet implemented"; private static final String NOT_YET_IMPLEMENTED = "Not yet implemented";
@@ -1276,11 +1273,6 @@ public class SubsonicRESTController {
child.setIsVideo(mediaFile.isVideo()); child.setIsVideo(mediaFile.isVideo());
child.setPath(getRelativePath(mediaFile, settingsService)); child.setPath(getRelativePath(mediaFile, settingsService));
org.airsonic.player.domain.Bookmark bookmark = bookmarkCache.get(new BookmarkKey(username, mediaFile.getId()));
if (bookmark != null) {
child.setBookmarkPosition(bookmark.getPositionMillis());
}
if (mediaFile.getAlbumArtist() != null && mediaFile.getAlbumName() != null) { if (mediaFile.getAlbumArtist() != null && mediaFile.getAlbumName() != null) {
Album album = albumDao.getAlbum(mediaFile.getAlbumArtist(), mediaFile.getAlbumName()); Album album = albumDao.getAlbum(mediaFile.getAlbumArtist(), mediaFile.getAlbumName());
if (album != null) { if (album != null) {
@@ -2394,14 +2386,4 @@ public class SubsonicRESTController {
return message; return message;
} }
} }
private static class BookmarkKey extends Pair<String, Integer> {
private BookmarkKey(String username, int mediaFileId) {
super(username, mediaFileId);
}
static BookmarkKey forBookmark(org.airsonic.player.domain.Bookmark b) {
return new BookmarkKey(b.getUsername(), b.getMediaFileId());
}
}
} }