Implement Endless Zim Search Suggestions #1224

ShaopengLin · 2024-10-05T05:39:25Z

Fixes (pat of) #413

Changes:

Added a custom model to enable endless suggestions
Added basic UI elements such as the search header and icon of the zim for convenience.
Endless can be triggered by up/down/pagedown keypresses and mouse scrolls.

src/suggestionlistmodel.h

src/searchbar.cpp

veloman-yunkan · 2024-10-07T19:40:42Z

Also there is the following bug:

Open the Ray Charles ZIM file
Start typing beatles in the search box

As soon as you have typed the first three letters (bea) the text in the search box automatically changes to bea (Fulltext search).

ShaopengLin · 2024-10-09T06:51:01Z

@veloman-yunkan The bug is caused by the absence of the commits that prevent suggestion completer flickering. I added those and the bug should be solved.

src/searchbar.h

src/searchbar.cpp

src/searchbar.h

src/searchbar.cpp

src/suggestionlistmodel.cpp

veloman-yunkan

You can guess from the changed nature of most comments that we are now very close to merging this PR. The next iteration can be the final one.

src/suggestionlistworker.h

src/searchbar.cpp

src/searchbar.h

src/searchbar.cpp

src/searchbar.h

src/searchbar.cpp

Allow future customizing of suggestions.

More cohesive design to utilize new model's index data.

src/searchbar.cpp

veloman-yunkan

There are still a couple of bugs (one old and one new) so let's brush up the PR a bit more.

src/searchbar.cpp

Data required can be retrieved from model.

Remove unecessary checks and prevent misuse if openCompletion.

Refactor to simplify book icon retrieval

Add offset and fetch size, prepare for endless.

Automatically determine start and allow custom callback. Prepare for endless

veloman-yunkan

An issue was still left because of hasty conflict resolution. Since you have to fix it, please address a few other comments as well.

src/searchbar.cpp

veloman-yunkan · 2024-10-18T08:05:53Z

src/searchbar.cpp

+    if (!m_aboutToScrollPastEnd)
+        return false;
+
+    if (auto e = dynamic_cast<QKeyEvent *>(event))


This time I checked the documentation of QObject::eventFilter() as I was curious about the need for its first parameter). I saw in the example that a dynamic_cast is not used because there is a cheaper way - QEvent::type().

This won't work, as many key press events are not based on exactly keypress, such as QEvent::ShortcutOverride. This also explains some the same issue: https://forum.qt.io/topic/101176/casts-for-events

veloman-yunkan · 2024-10-18T08:09:31Z

src/searchbar.cpp

+
+    if (auto e = dynamic_cast<QKeyEvent *>(event))
+    {
+        if (e->key() == Qt::Key_PageDown && e->modifiers().testFlag(Qt::NoModifier))


Now I wonder if it's better to handle key down here too (instead of your previous fix for it). Won't it eliminate the need to undo the handling of wrapping from bottom to top? If yes then the final code will be simpler, and so let's do it.

So it seems the scrolling event from Key_down either reaches the popup first or isn't blocked from reaching the popup. I simply removed onScrollPastEnd and put the scrolling only inside the onScroll !m_completer.popup()->currentIndex().isValid() case.

src/searchbar.cpp

veloman-yunkan · 2024-10-18T08:31:37Z

src/searchbar.cpp

+void SearchBarLineEdit::fetchMoreSuggestions()
+{
+    fetchSuggestions(&SearchBarLineEdit::onAdditionalSuggestions);
+}


This encapsulates a performance bug. fetchSuggestions() creates a temporary SuggestionListWorker which creates zim::SuggestionSearcher that is discarded after a single use. In a more optimal implementation the zim::SuggestionSearcher should be reused for loading additional suggestions (since those incremental calls to zim::SuggestionSearcher::getResults() should be much cheaper compared to the first call). I am not implying that that optimization be implemented in this PR. I propose to do it myself after this PR is merged, but if you feel like becoming married to this suggestions feature and would like to take care of it to the end I will humbly stay away :)

Let's do this separately.

Trigger on scroll.

Down/Page_Down Key press correctly fetches.

Fetch offset and model removal requires this.

Before, view scroll to row based on prefix match

Focus event can happen more than once.

setCompleter call setCompletionPrefix on typing which flicker

ShaopengLin requested a review from veloman-yunkan October 5, 2024 05:39

kelson42 added this to the 2.4.0 milestone Oct 5, 2024

ShaopengLin mentioned this pull request Oct 7, 2024

Implement Fine-Tuned Zim Search #1189

Open

veloman-yunkan requested changes Oct 7, 2024

View reviewed changes

src/suggestionlistmodel.h Outdated Show resolved Hide resolved

src/searchbar.cpp Outdated Show resolved Hide resolved

src/searchbar.cpp Outdated Show resolved Hide resolved

src/searchbar.cpp Outdated Show resolved Hide resolved

src/searchbar.cpp Outdated Show resolved Hide resolved

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch 3 times, most recently from cc90069 to 1804f56 Compare October 9, 2024 06:40

ShaopengLin requested a review from veloman-yunkan October 9, 2024 06:42

veloman-yunkan requested changes Oct 9, 2024

View reviewed changes

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch 5 times, most recently from 02b297f to b4e5695 Compare October 11, 2024 01:10

ShaopengLin requested a review from veloman-yunkan October 11, 2024 01:11

veloman-yunkan requested changes Oct 11, 2024

View reviewed changes

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch from b4e5695 to fc5de3f Compare October 14, 2024 22:53

ShaopengLin added 2 commits October 14, 2024 19:35

Introduce suggestionlistmodel.{h, cpp}

93202b8

Allow future customizing of suggestions.

Move SearchBarLineEdit urlList to SuggestionListModel

568a8b6

More cohesive design to utilize new model's index data.

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch 2 times, most recently from aebe4db to 4fa9ab4 Compare October 15, 2024 02:05

ShaopengLin requested a review from veloman-yunkan October 15, 2024 02:06

veloman-yunkan requested changes Oct 15, 2024

View reviewed changes

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch from 4fa9ab4 to b6a6c06 Compare October 15, 2024 22:13

ShaopengLin requested a review from veloman-yunkan October 15, 2024 22:14

veloman-yunkan requested changes Oct 16, 2024

View reviewed changes

ShaopengLin added 2 commits October 18, 2024 01:08

Remove redundant openCompletion(str, int)

64deeb7

Data required can be retrieved from model.

Introduce SearchBarLineEdit::getDefaultSuggestionIndex

c08d8df

Remove unecessary checks and prevent misuse if openCompletion.

ShaopengLin added 4 commits October 18, 2024 01:08

Enter Library::getBookIcon()

5b2e534

Refactor to simplify book icon retrieval

Add Suggestion Icon Decoration Role

cda9159

Refactor SuggestionListWorker

de7522c

Add offset and fetch size, prepare for endless.

Refactor Launching SuggestionListWorker

0fdf8a7

Automatically determine start and allow custom callback. Prepare for endless

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch from b6a6c06 to 1bc6c82 Compare October 18, 2024 06:19

ShaopengLin requested a review from veloman-yunkan October 18, 2024 06:27

veloman-yunkan requested changes Oct 18, 2024

View reviewed changes

ShaopengLin added 9 commits October 18, 2024 15:14

Introduce Endless Suggestions

0afc596

Trigger on scroll.

Endless Suggestion Key Scrolling compatible

aac3c9c

Down/Page_Down Key press correctly fetches.

Correctly handle Endless w/Fulltext

d69c5c4

Fetch offset and model removal requires this.

Fetch Only When More Suggesion Exist

cc26023

Make First Row Visible on Suggestion Popup

e307add

Before, view scroll to row based on prefix match

Introduce Kiwix Search Header

954d7d6

Replace m_completer.popup() with m_suggestionView

b0437c9

BugFix openCompletion Connected Multiple Times

833d61b

Focus event can happen more than once.

Fix Suggestion Flickering when Typing

07aa791

setCompleter call setCompletionPrefix on typing which flicker

ShaopengLin force-pushed the Issue#413-endless-search-suggestuon branch from 1bc6c82 to 07aa791 Compare October 18, 2024 19:14

ShaopengLin requested a review from veloman-yunkan October 18, 2024 19:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement Endless Zim Search Suggestions #1224

Implement Endless Zim Search Suggestions #1224

ShaopengLin commented Oct 5, 2024

veloman-yunkan commented Oct 7, 2024

ShaopengLin commented Oct 9, 2024

veloman-yunkan left a comment

veloman-yunkan left a comment

veloman-yunkan left a comment

veloman-yunkan Oct 18, 2024

ShaopengLin Oct 18, 2024

veloman-yunkan Oct 18, 2024

ShaopengLin Oct 18, 2024

veloman-yunkan Oct 18, 2024

ShaopengLin Oct 18, 2024

Implement Endless Zim Search Suggestions #1224

Are you sure you want to change the base?

Implement Endless Zim Search Suggestions #1224

Conversation

ShaopengLin commented Oct 5, 2024

veloman-yunkan commented Oct 7, 2024

ShaopengLin commented Oct 9, 2024

veloman-yunkan left a comment

Choose a reason for hiding this comment

veloman-yunkan left a comment

Choose a reason for hiding this comment

veloman-yunkan left a comment

Choose a reason for hiding this comment

veloman-yunkan Oct 18, 2024

Choose a reason for hiding this comment

ShaopengLin Oct 18, 2024

Choose a reason for hiding this comment

veloman-yunkan Oct 18, 2024

Choose a reason for hiding this comment

ShaopengLin Oct 18, 2024

Choose a reason for hiding this comment

veloman-yunkan Oct 18, 2024

Choose a reason for hiding this comment

ShaopengLin Oct 18, 2024

Choose a reason for hiding this comment