1 files changed, 15 insertions, 14 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java b/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
index b8633624..a1657f39 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -307,7 +307,15 @@ public class OfflineMusicService implements MusicService {
 				}
 			}
 		});
-		
+
+		// Respect counts in search criteria
+		int artistCount = Math.min(artists.size(), criteria.getArtistCount());
+		int albumCount = Math.min(albums.size(), criteria.getAlbumCount());
+		int songCount = Math.min(songs.size(), criteria.getSongCount());
+		artists = artists.subList(0, artistCount);
+		albums = albums.subList(0, albumCount);
+		songs = songs.subList(0, songCount);
+
 		return new SearchResult(artists, albums, songs);
     }
 
@@ -359,20 +367,13 @@ public class OfflineMusicService implements MusicService {
 		}
 	}
 	private int matchCriteria(SearchCritera criteria, String name) {
-		String query = criteria.getQuery().toLowerCase();
-		String[] queryParts = query.split(" ");
-		String[] nameParts = name.toLowerCase().split(" ");
-		
-		int closeness = 0;
-		for(String queryPart : queryParts) {
-			for(String namePart : nameParts) {
-				if(namePart.equals(queryPart)) {
-					closeness++;
-				}
-			}
+		if (criteria.getPattern().matcher(name).matches()) {
+			return Util.getStringDistance(
+				criteria.getQuery().toLowerCase(),
+				name.toLowerCase());
+		} else {
+			return 0;
 		}
-		
-		return closeness;
 	}
 
     @Override