antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-02 02:13:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a lot of possible issues raised by a code inspection

Browse source
This commit is contained in:
CappielloAntonio 2021-09-04 16:14:10 +02:00
parent 39ff821aee
commit 042bf3077f
76 changed files with 148 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
View file

@ -17,9 +17,7 @@ import com.cappielloantonio.play.subsonic.models.Genre;
import com.cappielloantonio.play.subsonic.models.SimilarArtistID3;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
public class MappingUtil {
public static ArrayList<Song> mapSong(List<Child> children) {
@ -111,7 +109,7 @@ public class MappingUtil {
for (Download download : downloads) {
Song song = new Song(download);
if(!songs.contains(song)) {
if (!songs.contains(song)) {
songs.add(song);
}
}
@ -124,7 +122,7 @@ public class MappingUtil {
for (Download download : downloads) {
Album album = new Album(download);
if(!albums.contains(album)) {
if (!albums.contains(album)) {
albums.add(album);
}
}
@ -137,7 +135,7 @@ public class MappingUtil {
for (Download download : downloads) {
Artist artist = new Artist(download);
if(!artists.contains(artist)) {
if (!artists.contains(artist)) {
artists.add(artist);
}
}

6
app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
View file

@ -9,11 +9,9 @@ import com.cappielloantonio.play.model.Song;
import com.google.android.exoplayer2.MediaItem;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class MusicUtil {
@ -76,8 +74,8 @@ public class MusicUtil {
public static String normalizedArtistName(String string) {
if (string != null) {
if(string.toLowerCase().contains(" feat.")) return Pattern.compile(" feat.", Pattern.CASE_INSENSITIVE).split(string)[0].trim();
else if(string.toLowerCase().contains(" featuring")) return Pattern.compile(" featuring", Pattern.CASE_INSENSITIVE).split(string)[0].trim();
if (string.toLowerCase().contains(" feat.")) return Pattern.compile(" feat.", Pattern.CASE_INSENSITIVE).split(string)[0].trim();
else if (string.toLowerCase().contains(" featuring")) return Pattern.compile(" featuring", Pattern.CASE_INSENSITIVE).split(string)[0].trim();
else return string;
}