Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(search) Fix broken !bang handling

Browse Source 
!bang query handling seems to have fallen victim to an overzealous refactoring effort, and broken.

It's now repaired, and a test is in place to ensure we know if it breaks again.
This commit is contained in:
Viktor Lofgren 2024-02-08 12:05:09 +01:00
parent 95d1bd98e4
commit f2b39ad055
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java
View File

@ -21,6 +21,7 @@ public class BangCommand implements SearchCommandInterface {
{ {
bangsToPattern.put("!g", "https://www.google.com/search?q=%s"); bangsToPattern.put("!g", "https://www.google.com/search?q=%s");
bangsToPattern.put("!ddg", "https://duckduckgo.com/search?q=%s"); bangsToPattern.put("!ddg", "https://duckduckgo.com/search?q=%s");
bangsToPattern.put("!w", "https://search.marginalia.nu/search?query=%s%20site:en.wikipedia.org&profile=wiki");
} }
@Override @Override
@ -41,18 +42,25 @@ public class BangCommand implements SearchCommandInterface {
return Optional.empty(); return Optional.empty();
} }
private Optional<String> matchBangPattern(String query, String bangKey) { /** If the query contains the bang pattern bangKey, return the query with the bang pattern removed. */
Optional<String> matchBangPattern(String query, String bangKey) {
var bm = new BangMatcher(query); var bm = new BangMatcher(query);
while (bm.findNext(bangKey)) { while (bm.findNext(bangKey)) {
if (bm.isRelativeSpaceOrInvalid(-1)) if (!bm.isRelativeSpaceOrInvalid(-1))
continue; continue;
if (bm.isRelativeSpaceOrInvalid(bangKey.length())) if (!bm.isRelativeSpaceOrInvalid(bangKey.length()))
continue; continue;
String queryWithoutBang = bm.prefix().trim() + " " + bm.suffix(bangKey.length()).trim(); StringBuilder ret = new StringBuilder(bm.prefix().trim());
return Optional.of(queryWithoutBang);
if (!ret.isEmpty())
ret.append(" ");
ret.append(bm.suffix(bangKey.length()).trim());
return Optional.of(ret.toString());
} }
return Optional.empty(); return Optional.empty();

37
code/services-application/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java Normal file
View File

@ -0,0 +1,37 @@
package nu.marginalia.search.command.commands;
import nu.marginalia.client.Context;
import nu.marginalia.search.command.SearchParameters;
import nu.marginalia.search.exceptions.RedirectException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
class BangCommandTest {
public BangCommand bangCommand = new BangCommand();
@Test
public void testG() {
try {
bangCommand.process(Context.internal(),
null,
new SearchParameters(" !g test",
null, null, null, null)
);
Assertions.fail("Should have thrown RedirectException");
}
catch (RedirectException ex) {
assertEquals("https://www.google.com/search?q=test", ex.newUrl);
}
}
@Test
public void testMatchPattern() {
var match = bangCommand.matchBangPattern("!g test", "!g");
assertTrue(match.isPresent());
assertEquals(match.get(), "test");
}
}