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

Merge remote-tracking branch 'origin/pr/1466'

Browse Source
This commit is contained in:
Andrew DeMaria
2020-01-27 21:00:48 -07:00
parent 81bb6af9d8 d4002ef6ce
commit 165701bcdc
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
+3 -1
View File
@@ -95,7 +95,9 @@ public class CoverArtController implements LastModified {
public long getLastModified(HttpServletRequest request) { public long getLastModified(HttpServletRequest request) {
CoverArtRequest coverArtRequest = createCoverArtRequest(request); CoverArtRequest coverArtRequest = createCoverArtRequest(request);
// LOG.info("getLastModified - " + coverArtRequest + ": " + new Date(result)); if (null == coverArtRequest) {
return -1L;
}
return coverArtRequest.lastModified(); return coverArtRequest.lastModified();
} }
airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java
+4 -1
View File
@@ -2115,7 +2115,10 @@ public class SubsonicRESTController {
command.setShareRole(getBooleanParameter(request, "shareRole", u.isShareRole())); command.setShareRole(getBooleanParameter(request, "shareRole", u.isShareRole()));
int maxBitRate = getIntParameter(request, "maxBitRate", s.getTranscodeScheme().getMaxBitRate()); int maxBitRate = getIntParameter(request, "maxBitRate", s.getTranscodeScheme().getMaxBitRate());
command.setTranscodeSchemeName(TranscodeScheme.fromMaxBitRate(maxBitRate).name()); TranscodeScheme transcodeScheme = TranscodeScheme.fromMaxBitRate(maxBitRate);
if (transcodeScheme != null) {
command.setTranscodeSchemeName(transcodeScheme.name());
}
if (hasParameter(request, "password")) { if (hasParameter(request, "password")) {
command.setPassword(decrypt(getRequiredStringParameter(request, "password"))); command.setPassword(decrypt(getRequiredStringParameter(request, "password")));