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

Cleanup siebling -> sibling mis-spellings

Browse Source
This commit is contained in:
Evan Harris
2019-06-24 20:59:04 -05:00
parent cdc38cb88d
commit 79b800656a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java
+6 -6
View File
@@ -129,9 +129,9 @@ public class MainController {
map.put("brand", settingsService.getBrand()); map.put("brand", settingsService.getBrand());
map.put("viewAsList", isViewAsList(request, userSettings)); map.put("viewAsList", isViewAsList(request, userSettings));
if (dir.isAlbum()) { if (dir.isAlbum()) {
List<MediaFile> sieblingAlbums = getSieblingAlbums(dir); List<MediaFile> siblingAlbums = getSiblingAlbums(dir);
thereIsMoreSAlbums = trimToSize(showAll, sieblingAlbums, userPaginationPreference); thereIsMoreSAlbums = trimToSize(showAll, siblingAlbums, userPaginationPreference);
map.put("sieblingAlbums", sieblingAlbums); map.put("siblingAlbums", siblingAlbums);
map.put("artist", guessArtist(children)); map.put("artist", guessArtist(children));
map.put("album", guessAlbum(children)); map.put("album", guessAlbum(children));
map.put("musicBrainzReleaseId", guessMusicBrainzReleaseId(children)); map.put("musicBrainzReleaseId", guessMusicBrainzReleaseId(children));
@@ -277,13 +277,13 @@ public class MainController {
return result; return result;
} }
private List<MediaFile> getSieblingAlbums(MediaFile dir) { private List<MediaFile> getSiblingAlbums(MediaFile dir) {
List<MediaFile> result = new ArrayList<>(); List<MediaFile> result = new ArrayList<>();
MediaFile parent = mediaFileService.getParentOf(dir); MediaFile parent = mediaFileService.getParentOf(dir);
if (!mediaFileService.isRoot(parent)) { if (!mediaFileService.isRoot(parent)) {
List<MediaFile> sieblings = mediaFileService.getChildrenOf(parent, false, true, true); List<MediaFile> siblings = mediaFileService.getChildrenOf(parent, false, true, true);
result.addAll(sieblings.stream().filter(siebling -> siebling.isAlbum() && !siebling.equals(dir)).collect(Collectors.toList())); result.addAll(siblings.stream().filter(sibling -> sibling.isAlbum() && !sibling.equals(dir)).collect(Collectors.toList()));
} }
return result; return result;
} }
airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+2 -2
View File
@@ -437,7 +437,7 @@
</tr> </tr>
</c:forEach> </c:forEach>
<c:if test="${model.viewAsList}"> <c:if test="${model.viewAsList}">
<c:forEach items="${model.sieblingAlbums}" var="album" varStatus="loopStatus"> <c:forEach items="${model.siblingAlbums}" var="album" varStatus="loopStatus">
<tr> <tr>
<c:import url="playButtons.jsp"> <c:import url="playButtons.jsp">
<c:param name="id" value="${album.id}"/> <c:param name="id" value="${album.id}"/>
@@ -461,7 +461,7 @@
<c:if test="${not model.viewAsList}"> <c:if test="${not model.viewAsList}">
<div style="float: left"> <div style="float: left">
<c:forEach items="${model.sieblingAlbums}" var="album" varStatus="loopStatus"> <c:forEach items="${model.siblingAlbums}" var="album" varStatus="loopStatus">
<div class="albumThumb"> <div class="albumThumb">
<c:import url="coverArt.jsp"> <c:import url="coverArt.jsp">
<c:param name="albumId" value="${album.id}"/> <c:param name="albumId" value="${album.id}"/>