Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Use lambdas in OfflineMusicService

This commit is contained in:
tzugen 2021-05-21 22:39:21 +02:00
parent 1b5db9da1f
commit 00e64cdddc
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
1 changed files with 53 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java
View File

@ -21,9 +21,6 @@ package org.moire.ultrasonic.service;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.media.MediaMetadataRetriever; import android.media.MediaMetadataRetriever;
import kotlin.Pair;
import timber.log.Timber;
import org.moire.ultrasonic.data.ActiveServerProvider; import org.moire.ultrasonic.data.ActiveServerProvider;
import org.moire.ultrasonic.domain.Artist; import org.moire.ultrasonic.domain.Artist;
import org.moire.ultrasonic.domain.Bookmark; import org.moire.ultrasonic.domain.Bookmark;
@ -54,7 +51,6 @@ import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -64,6 +60,8 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import kotlin.Lazy; import kotlin.Lazy;
import kotlin.Pair;
import timber.log.Timber;
import static org.koin.java.KoinJavaComponent.inject; import static org.koin.java.KoinJavaComponent.inject;
@ -95,49 +93,44 @@ public class OfflineMusicService implements MusicService
String ignoredArticlesString = "The El La Los Las Le Les"; String ignoredArticlesString = "The El La Los Las Le Les";
final String[] ignoredArticles = COMPILE.split(ignoredArticlesString); final String[] ignoredArticles = COMPILE.split(ignoredArticlesString);
Collections.sort(artists, new Comparator<Artist>() Collections.sort(artists, (lhsArtist, rhsArtist) -> {
{ String lhs = lhsArtist.getName().toLowerCase();
@Override String rhs = rhsArtist.getName().toLowerCase();
public int compare(Artist lhsArtist, Artist rhsArtist)
char lhs1 = lhs.charAt(0);
char rhs1 = rhs.charAt(0);
if (Character.isDigit(lhs1) && !Character.isDigit(rhs1))
{ {
String lhs = lhsArtist.getName().toLowerCase(); return 1;
String rhs = rhsArtist.getName().toLowerCase();
char lhs1 = lhs.charAt(0);
char rhs1 = rhs.charAt(0);
if (Character.isDigit(lhs1) && !Character.isDigit(rhs1))
{
return 1;
}
if (Character.isDigit(rhs1) && !Character.isDigit(lhs1))
{
return -1;
}
for (String article : ignoredArticles)
{
int index = lhs.indexOf(String.format("%s ", article.toLowerCase()));
if (index == 0)
{
lhs = lhs.substring(article.length() + 1);
}
index = rhs.indexOf(String.format("%s ", article.toLowerCase()));
if (index == 0)
{
rhs = rhs.substring(article.length() + 1);
}
}
return lhs.compareTo(rhs);
} }
if (Character.isDigit(rhs1) && !Character.isDigit(lhs1))
{
return -1;
}
for (String article : ignoredArticles)
{
int index = lhs.indexOf(String.format("%s ", article.toLowerCase()));
if (index == 0)
{
lhs = lhs.substring(article.length() + 1);
}
index = rhs.indexOf(String.format("%s ", article.toLowerCase()));
if (index == 0)
{
rhs = rhs.substring(article.length() + 1);
}
}
return lhs.compareTo(rhs);
}); });
return new Indexes(0L, ignoredArticlesString, Collections.<Artist>emptyList(), artists); return new Indexes(0L, ignoredArticlesString, Collections.emptyList(), artists);
} }
@Override @Override
@ -387,44 +380,31 @@ public class OfflineMusicService implements MusicService
} }
} }
Collections.sort(artists, new Comparator<Artist>() Collections.sort(artists, (lhs, rhs) -> {
{ if (lhs.getCloseness() == rhs.getCloseness())
@Override
public int compare(Artist lhs, Artist rhs)
{ {
if (lhs.getCloseness() == rhs.getCloseness()) return 0;
{
return 0;
}
else return lhs.getCloseness() > rhs.getCloseness() ? -1 : 1;
} }
else return lhs.getCloseness() > rhs.getCloseness() ? -1 : 1;
}); });
Collections.sort(albums, new Comparator<MusicDirectory.Entry>()
{
@Override
public int compare(MusicDirectory.Entry lhs, MusicDirectory.Entry rhs)
{
if (lhs.getCloseness() == rhs.getCloseness())
{
return 0;
}
else return lhs.getCloseness() > rhs.getCloseness() ? -1 : 1; Collections.sort(albums, (lhs, rhs) -> {
if (lhs.getCloseness() == rhs.getCloseness())
{
return 0;
} }
else return lhs.getCloseness() > rhs.getCloseness() ? -1 : 1;
}); });
Collections.sort(songs, new Comparator<MusicDirectory.Entry>()
{
@Override
public int compare(MusicDirectory.Entry lhs, MusicDirectory.Entry rhs)
{
if (lhs.getCloseness() == rhs.getCloseness())
{
return 0;
}
else return lhs.getCloseness() > rhs.getCloseness() ? -1 : 1; Collections.sort(songs, (lhs, rhs) -> {
if (lhs.getCloseness() == rhs.getCloseness())
{
return 0;
} }
else return lhs.getCloseness() > rhs.getCloseness() ? -1 : 1;
}); });
return new SearchResult(artists, albums, songs); return new SearchResult(artists, albums, songs);