Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve search feature by using keywords instead of full match (#4478)

This commit is contained in:
Bo Jacobs 2020-10-01 23:49:34 +02:00 committed by GitHub
parent 92fc091b16
commit 923be5bfdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
View File

@ -20,7 +20,6 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@ -1207,12 +1206,17 @@ public class PodDBAdapter {
* Uses DatabaseUtils to escape a search query and removes ' at the
* beginning and the end of the string returned by the escape method.
*/
private String prepareSearchQuery(String query) {
StringBuilder builder = new StringBuilder();
DatabaseUtils.appendEscapedSQLString(builder, query);
builder.deleteCharAt(0);
builder.deleteCharAt(builder.length() - 1);
return builder.toString();
private String[] prepareSearchQuery(String query) {
String[] queryWords = query.split("\\s+");
for (int i = 0; i < queryWords.length; ++i) {
StringBuilder builder = new StringBuilder();
DatabaseUtils.appendEscapedSQLString(builder, queryWords[i]);
builder.deleteCharAt(0);
builder.deleteCharAt(builder.length() - 1);
queryWords[i] = builder.toString();
}
return queryWords;
}
/**
@ -1222,7 +1226,7 @@ public class PodDBAdapter {
* @return A cursor with all search results in SEL_FI_EXTRA selection.
*/
public Cursor searchItems(long feedID, String searchQuery) {
String preparedQuery = prepareSearchQuery(searchQuery);
String[] queryWords = prepareSearchQuery(searchQuery);
String queryFeedId;
if (feedID != 0) {
@ -1233,14 +1237,28 @@ public class PodDBAdapter {
queryFeedId = "1 = 1";
}
String query = SELECT_FEED_ITEMS_AND_MEDIA_WITH_DESCRIPTION
+ " WHERE " + queryFeedId + " AND ("
+ KEY_DESCRIPTION + " LIKE '%" + preparedQuery + "%' OR "
+ KEY_CONTENT_ENCODED + " LIKE '%" + preparedQuery + "%' OR "
+ KEY_TITLE + " LIKE '%" + preparedQuery + "%'"
+ ") ORDER BY " + KEY_PUBDATE + " DESC "
+ "LIMIT 300";
return db.rawQuery(query, null);
String queryStart = SELECT_FEED_ITEMS_AND_MEDIA_WITH_DESCRIPTION
+ " WHERE " + queryFeedId + " AND (";
StringBuilder sb = new StringBuilder(queryStart);
for (int i = 0; i < queryWords.length; i++) {
sb
.append("(")
.append(KEY_DESCRIPTION + " LIKE '%").append(queryWords[i])
.append("%' OR ")
.append(KEY_CONTENT_ENCODED).append(" LIKE '%").append(queryWords[i])
.append("%' OR ")
.append(KEY_TITLE).append(" LIKE '%").append(queryWords[i])
.append("%') ");
if (i != queryWords.length - 1) {
sb.append("AND ");
}
}
sb.append(") ORDER BY " + KEY_PUBDATE + " DESC LIMIT 300");
return db.rawQuery(sb.toString(), null);
}
/**
@ -1249,15 +1267,31 @@ public class PodDBAdapter {
* @return A cursor with all search results in SEL_FI_EXTRA selection.
*/
public Cursor searchFeeds(String searchQuery) {
String preparedQuery = prepareSearchQuery(searchQuery);
String query = "SELECT * FROM " + TABLE_NAME_FEEDS + " WHERE "
+ KEY_TITLE + " LIKE '%" + preparedQuery + "%' OR "
+ KEY_CUSTOM_TITLE + " LIKE '%" + preparedQuery + "%' OR "
+ KEY_AUTHOR + " LIKE '%" + preparedQuery + "%' OR "
+ KEY_DESCRIPTION + " LIKE '%" + preparedQuery + "%' "
+ "ORDER BY " + KEY_TITLE + " ASC "
+ "LIMIT 300";
return db.rawQuery(query, null);
String[] queryWords = prepareSearchQuery(searchQuery);
String queryStart = "SELECT * FROM " + TABLE_NAME_FEEDS + " WHERE ";
StringBuilder sb = new StringBuilder(queryStart);
for (int i = 0; i < queryWords.length; i++) {
sb
.append("(")
.append(KEY_TITLE).append(" LIKE '%").append(queryWords[i])
.append("%' OR ")
.append(KEY_CUSTOM_TITLE).append(" LIKE '%").append(queryWords[i])
.append("%' OR ")
.append(KEY_AUTHOR).append(" LIKE '%").append(queryWords[i])
.append("%' OR ")
.append(KEY_DESCRIPTION).append(" LIKE '%").append(queryWords[i])
.append("%') ");
if (i != queryWords.length - 1) {
sb.append("AND ");
}
}
sb.append("ORDER BY " + KEY_TITLE + " ASC LIMIT 300");
return db.rawQuery(sb.toString(), null);
}
/**