From 209d73b9fbee2bcd1cc42df04386bb16228ec44e Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 20 Dec 2022 18:55:27 +0100 Subject: [PATCH] Simplified search highlighting --- .../java/eu/faircode/email/HtmlHelper.java | 111 +++++++++--------- 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index 3ba93875b4..af03739bd9 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -2963,73 +2963,68 @@ public class HtmlHelper { static void highlightSearched(Context context, Document document, String query) { try { int color = Helper.resolveColor(context, R.attr.colorHighlight); - query = Fts4DbHelper.preprocessText(query); - // TODO breakText - // TODO: fix highlighting pre processed text + StringBuilder sb = new StringBuilder(); + for (String word : query.trim().split("\\s+")) { + if (word.startsWith("+") || word.startsWith("-")) + continue; + for (String w : Fts4DbHelper.breakText(word).split("\\s+")) { + if (sb.length() > 0) + sb.append("\\s*"); + sb.append(Pattern.quote(w)); + } + } + sb.insert(0, ".*?\\b("); + sb.append(")\\b.*?"); - List word = new ArrayList<>(); - List plus = new ArrayList<>(); - for (String w : query.trim().split("\\s+")) - if (w.length() > 1 && (w.startsWith("+") || w.startsWith("-"))) { - if (w.startsWith("+")) - plus.add(Pattern.quote(w.substring(1))); - } else - word.add(Pattern.quote(w)); + Pattern p = Pattern.compile(sb.toString(), Pattern.DOTALL); + + NodeTraversor.traverse(new NodeVisitor() { + @Override + public void head(Node node, int depth) { + if (node instanceof TextNode) + try { + TextNode tnode = (TextNode) node; + String text = Fts4DbHelper.preprocessText(tnode.getWholeText()); - int flags = Pattern.DOTALL | Pattern.CASE_INSENSITIVE; - List pat = new ArrayList<>(); - pat.add(Pattern.compile(".*?\\b(" + TextUtils.join("\\s+", word) + ")\\b.*?", flags)); - for (String w : plus) - pat.add(Pattern.compile(".*?\\b(" + w + ")\\b.*?", flags)); + Matcher result = p.matcher(text); - for (Pattern p : pat) - NodeTraversor.traverse(new NodeVisitor() { - @Override - public void head(Node node, int depth) { - if (node instanceof TextNode) - try { - TextNode tnode = (TextNode) node; - String text = Fts4DbHelper.preprocessText(tnode.getWholeText()); - - Matcher result = p.matcher(text); - - int prev = 0; - Element holder = document.createElement("span"); - while (result.find()) { - int start = result.start(1); - int end = result.end(1); - - holder.appendText(text.substring(prev, start)); - - Element span = document.createElement("span"); - span.attr("style", mergeStyles( - span.attr("style"), - "font-size:larger; background-color:" + encodeWebColor(color) - )); - span.text(text.substring(start, end)); - holder.appendChild(span); - - prev = end; - } + int prev = 0; + Element holder = document.createElement("span"); + while (result.find()) { + int start = result.start(1); + int end = result.end(1); - if (prev == 0) // No matches - return; + holder.appendText(text.substring(prev, start)); - if (prev < text.length()) - holder.appendText(text.substring(prev)); + Element span = document.createElement("span"); + span.attr("style", mergeStyles( + span.attr("style"), + "font-size:larger; background-color:" + encodeWebColor(color) + )); + span.text(text.substring(start, end)); + holder.appendChild(span); - tnode.before(holder); - tnode.text(""); - } catch (Throwable ex) { - Log.e(ex); + prev = end; } - } - @Override - public void tail(Node node, int depth) { - } - }, document); + if (prev == 0) // No matches + return; + + if (prev < text.length()) + holder.appendText(text.substring(prev)); + + tnode.before(holder); + tnode.text(""); + } catch (Throwable ex) { + Log.e(ex); + } + } + + @Override + public void tail(Node node, int depth) { + } + }, document); } catch (Throwable ex) { Log.e(ex); }