Implement Fine-Tuned Zim Search

src/searchbar.cpp

@@ -112,7 +112,7 @@ void SearchBarLineEdit::hideSuggestions()
 void SearchBarLineEdit::clearSuggestions()
 {
  m_suggestionModel.resetSuggestions();
- m_urlList.clear();
+ m_suggestionModel.resetUrlList();
 }
 
 void SearchBarLineEdit::on_currentTitleChanged(const QString& title)
@@ -169,9 +169,9 @@ void SearchBarLineEdit::updateCompletion()
  if (token != m_token) {
  return;
  }
- m_urlList = urlList;
+ m_suggestionModel.resetUrlList(urlList);
  if (m_returnPressed) {
- openCompletion(suggestions.first(), 0);
+ openCompletion(m_suggestionModel.index(0));
  return;
  }
  m_suggestionModel.resetSuggestions(suggestions);
@@ -183,20 +183,17 @@ void SearchBarLineEdit::updateCompletion()
 
 void SearchBarLineEdit::openCompletion(const QModelIndex &index)
 {
- if (m_urlList.size() != 0) {
- openCompletion(index.data().toString(), index.row());
- }
-}
-
-void SearchBarLineEdit::openCompletion(const QString& text, int index)
-{
- QUrl url;
- if (this->text().compare(text, Qt::CaseInsensitive) == 0) {
- url = m_urlList.at(index);
- } else {
- url = m_urlList.last();
+ if (m_suggestionModel.rowCount() != 0) 
+ {
+ QUrl url;
+ auto editText = index.data().toString();
+ if (this->text().compare(editText, Qt::CaseInsensitive) == 0) {
+ url = index.data(Qt::UserRole).toUrl();
+ } else {
+ url = m_suggestionModel.index(m_suggestionModel.rowCount() - 1).data(Qt::UserRole).toUrl();
+ }
+ QTimer::singleShot(0, [=](){KiwixApp::instance()->openUrl(url, false);});
  }
- QTimer::singleShot(0, [=](){KiwixApp::instance()->openUrl(url, false);});
 }
 
 SearchBar::SearchBar(QWidget *parent) :

src/searchbar.h

@@ -39,7 +39,6 @@ public slots:
 private:
  SuggestionListModel m_suggestionModel;
  QCompleter m_completer;
- QVector<QUrl> m_urlList;
  QString m_title;
  QString m_searchbarInput;
  bool m_returnPressed = false;
@@ -49,7 +48,6 @@ public slots:
 private slots:
  void updateCompletion();
  void openCompletion(const QModelIndex& index);
- void openCompletion(const QString& text, int index);
 };
 
 

src/suggestionlistmodel.cpp

@@ -13,7 +13,10 @@ int SuggestionListModel::rowCount(const QModelIndex &parent) const
 {
  Q_UNUSED(parent);
 
- return m_suggestions.size();
+ /* From SearchBarLineEdit::updateCompletion, urlList can be set before 
+ the display texts of the suggestions.
+ */
+ return m_urlList.size();
 }
 
 QVariant SuggestionListModel::data(const QModelIndex &index, int role) const
@@ -26,6 +29,10 @@ QVariant SuggestionListModel::data(const QModelIndex &index, int role) const
  if (row < m_suggestions.size())
  return m_suggestions.at(row);
  break;
+ case Qt::UserRole:
+ if (row < m_urlList.size())
+ return m_urlList.at(row);
+ break;
  }
  return QVariant();
 }
@@ -38,3 +45,10 @@ void SuggestionListModel::resetSuggestions(const QStringList &suggestions)
  m_suggestions.append(suggestion);
  endResetModel();
 }
+
+void SuggestionListModel::resetUrlList(const QVector<QUrl> &urlList)
+{
+ beginResetModel();
+ m_urlList = urlList;
+ endResetModel();
+}

src/suggestionlistmodel.h

@@ -2,6 +2,7 @@
 #define SUGGESTIONLISTMODEL_H
 
 #include <QAbstractListModel>
+#include <QUrl>
 
 class SuggestionListModel : public QAbstractListModel
 {
@@ -15,9 +16,11 @@ class SuggestionListModel : public QAbstractListModel
  QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
  void resetSuggestions(const QStringList& suggestions = QStringList{});
+ void resetUrlList(const QVector<QUrl>& urlList = QVector<QUrl>{});
 
 private:
  QStringList m_suggestions;
+ QVector<QUrl> m_urlList;
 };
 
 #endif // SUGGESTIONLISTMODEL_H