From 68dfc20b8f8d8ff583c4e06ddb61a9986ccb7df7 Mon Sep 17 00:00:00 2001 From: megabigbug Date: Tue, 20 Jul 2010 22:07:04 +0200 Subject: history review: - remove AwesomeUrlCompletion class - add an QHash to the history manager: each url have a visit counter - sort history urls by visit count TODO: - reintroduce bookmark item in url resolver (broken when AwesomeUrlCompletion was removed) --- src/bookmarks/bookmarksmanager.cpp | 17 ----- src/bookmarks/bookmarksmanager.h | 6 -- src/history/historymanager.cpp | 98 +++++++++++++++++--------- src/history/historymanager.h | 39 ++++++++--- src/urlbar/urlresolver.cpp | 138 ++++--------------------------------- src/urlbar/urlresolver.h | 50 +------------- 6 files changed, 110 insertions(+), 238 deletions(-) diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 57a29907..b5c90616 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -185,8 +185,6 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) } else { - UrlSearchItem urlSearchItem(UrlSearchItem::Bookmark, bookmark.url().prettyUrl() , bookmark.fullText(), QDateTime(), 1, bookmark.description(), QString()); - Application::bookmarkProvider()->completionObject()->addItem(urlSearchItem); return new KBookmarkAction(bookmark, owner(), this); } } @@ -250,13 +248,9 @@ BookmarkProvider::BookmarkProvider(QObject *parent) , m_manager(0) , m_owner(0) , m_actionCollection(new KActionCollection(this)) - , m_completion(0) , _bookmarkActionMenu(0) { kDebug() << "Loading Bookmarks Manager..."; - // take care of the completion object - m_completion = new AwesomeUrlCompletion; - m_completion->setOrder(KCompletion::Weighted); KUrl bookfile = KUrl("~/.kde/share/apps/konqueror/bookmarks.xml"); // share konqueror bookmarks @@ -296,8 +290,6 @@ BookmarkProvider::~BookmarkProvider() delete m_actionCollection; delete m_owner; delete m_manager; - - delete m_completion; } @@ -324,8 +316,6 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString Q_UNUSED(group) Q_UNUSED(caller) - m_completion->clear(); - foreach(KToolBar *bookmarkToolBar, m_bookmarkToolBars) { if (bookmarkToolBar) @@ -334,7 +324,6 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString fillBookmarkBar(bookmarkToolBar); } } - //TODO: also change completion object } @@ -429,12 +418,6 @@ KBookmarkGroup BookmarkProvider::rootGroup() } -AwesomeUrlCompletion *BookmarkProvider::completionObject() const -{ - return m_completion; -} - - QString BookmarkProvider::titleForBookmarkUrl(QString url) { QString title = ""; diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index 0915e894..d2465e77 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -228,11 +228,6 @@ public: inline BookmarkOwner *bookmarkOwner() { return m_owner; } - /** - * @returns the AwesomeUrlCompletion object. - */ - AwesomeUrlCompletion *completionObject() const; - QString titleForBookmarkUrl(QString url); void registerBookmarkPanel(BookmarksPanel *panel); @@ -278,7 +273,6 @@ private: KActionCollection *m_actionCollection; QList m_bookmarkToolBars; QList m_bookmarkPanels; - AwesomeUrlCompletion *m_completion; KActionMenu *_bookmarkActionMenu; }; diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index d531c189..a56045a7 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -69,11 +69,8 @@ HistoryManager::HistoryManager(QObject *parent) , m_historyModel(0) , m_historyFilterModel(0) , m_historyTreeModel(0) - , m_completion(new AwesomeUrlCompletion) { kDebug() << "Loading HistoryManager..."; - // take care of the completion object - m_completion->setOrder(KCompletion::Weighted); m_expiredTimer.setSingleShot(true); connect(&m_expiredTimer, SIGNAL(timeout()), this, SLOT(checkForExpired())); @@ -95,7 +92,6 @@ HistoryManager::HistoryManager(QObject *parent) HistoryManager::~HistoryManager() { m_saveTimer->saveIfNeccessary(); - delete m_completion; delete m_saveTimer; @@ -113,7 +109,7 @@ QList HistoryManager::history() const bool HistoryManager::historyContains(const QString &url) const { - return m_historyFilterModel->historyContains(url); + return m_hash.contains(url) && m_hash[url].savedCount>0; } @@ -129,12 +125,6 @@ void HistoryManager::addHistoryEntry(const QString &url) cleanUrl.setHost(cleanUrl.host().toLower()); HistoryItem item(cleanUrl.toString(), QDateTime::currentDateTime()); addHistoryEntry(item); - - // Add item to completion object - QString _url(url); - _url.remove(QRegExp("^http://|/$")); - UrlSearchItem urlSearchItem(UrlSearchItem::History, _url, QString(), item.dateTime, 1, QString(), QString()); - m_completion->addItem(urlSearchItem); } @@ -142,6 +132,13 @@ void HistoryManager::setHistory(const QList &history, bool loadedAn { m_history = history; + //TODO: is there a way to really memorize the visitCount instead of recount it at startup ? + m_hash.clear(); + foreach(HistoryItem i, m_history) + { + addHistoryHashEntry(i); + } + // verify that it is sorted by date if (!loadedAndSorted) qSort(m_history.begin(), m_history.end()); @@ -220,12 +217,31 @@ void HistoryManager::addHistoryEntry(const HistoryItem &item) return; m_history.prepend(item); + addHistoryHashEntry(item); emit entryAdded(item); if (m_history.count() == 1) checkForExpired(); } +void HistoryManager::addHistoryHashEntry(const HistoryItem &item) +{ + if (m_hash.contains(item.url)) + { + m_hash[item.url].visitCount++; + m_hash[item.url].dateTime = item.dateTime; //store last visit date + if (!item.title.isEmpty()) + { + m_hash[item.url].title = item.title; //store last title if not empty + } + } + else + { + m_hash[item.url] = HistoryHashItem(item.url, item.dateTime, item.title); + } + m_hash[item.url].savedCount++; +} + void HistoryManager::updateHistoryEntry(const KUrl &url, const QString &title) { @@ -237,6 +253,11 @@ void HistoryManager::updateHistoryEntry(const KUrl &url, const QString &title) m_saveTimer->changeOccurred(); if (m_lastSavedUrl.isEmpty()) m_lastSavedUrl = m_history.at(i).url; + + if (m_hash.contains(url.url()) && !title.isEmpty()) + { + m_hash[url.url()].title = title; + } emit entryUpdated(i); break; } @@ -248,6 +269,10 @@ void HistoryManager::removeHistoryEntry(const HistoryItem &item) { m_lastSavedUrl.clear(); m_history.removeOne(item); + if (m_hash.contains(item.url) && m_hash[item.url].savedCount>0) + { + m_hash[item.url].savedCount--; //this counter is used for expired urls + } emit entryRemoved(item); } @@ -265,10 +290,37 @@ void HistoryManager::removeHistoryEntry(const KUrl &url, const QString &title) break; } } +} + + +HistoryHashItem HistoryManager::get(const QString &url) +{ + return m_hash[url]; +} + + +QList HistoryManager::find(const QString &text) +{ + QList list; + + QString url; + foreach(url, m_hash.keys()) + { + if (url.contains(text) || m_hash[url].title.contains(text)) + { + list << m_hash[url]; + } + } + + return list; +} + - // Remove item from completion object - UrlSearchItem urlSearchItem(UrlSearchItem::History, item.url, item.title, item.dateTime, 0, QString(), QString()); - m_completion->removeItem(urlSearchItem); +QList HistoryManager::findMostVisited(const QString &text) +{ + QList list = find(text); + qSort(list); + return list; } @@ -369,12 +421,6 @@ void HistoryManager::load() list.prepend(item); lastInsertedItem = item; - - // Add item to completion object - //QString _url = item.url; - //_url.remove(QRegExp("^http://|/$")); - UrlSearchItem urlSearchItem(UrlSearchItem::History, item.url, item.title, item.dateTime, 1, QString(), QString()); - m_completion->addItem(urlSearchItem); } if (needToSort) qSort(list.begin(), list.end()); @@ -458,12 +504,6 @@ void HistoryManager::save() } -AwesomeUrlCompletion * HistoryManager::completionObject() const -{ - return m_completion; -} - - void HistoryManager::addDownload(const QString &srcUrl, const QString &destUrl) { QWebSettings *globalSettings = QWebSettings::globalSettings(); @@ -519,9 +559,3 @@ bool HistoryManager::clearDownloadsHistory() return downloadFile.remove(); } - -QString HistoryManager::titleForHistoryUrl(QString url) -{ - return history().at(m_historyFilterModel->historyLocation(url)).title; -} - diff --git a/src/history/historymanager.h b/src/history/historymanager.h index 7b82579d..b91eec60 100644 --- a/src/history/historymanager.h +++ b/src/history/historymanager.h @@ -84,6 +84,31 @@ public: // --------------------------------------------------------------------------------------------------------------- +class HistoryHashItem : public HistoryItem +{ +public: + HistoryHashItem() {} + explicit HistoryHashItem(const QString &u + ,const QDateTime &d = QDateTime() + ,const QString &t = QString() + ) + : HistoryItem(u, d, t) + ,visitCount(1) + ,savedCount(0) + {} + + inline bool operator <(const HistoryHashItem &other) const + { + return visitCount > other.visitCount; + } + + int visitCount; + int savedCount; +}; + +// --------------------------------------------------------------------------------------------------------------- + + class DownloadItem { public: @@ -139,7 +164,9 @@ public: void updateHistoryEntry(const KUrl &url, const QString &title); void removeHistoryEntry(const KUrl &url, const QString &title = QString()); - QString titleForHistoryUrl(QString url); + HistoryHashItem get(const QString &url); + QList find(const QString &text); + QList findMostVisited(const QString &text); int historyLimit() const; void setHistoryLimit(int limit); @@ -152,11 +179,6 @@ public: HistoryFilterModel *historyFilterModel() const; HistoryTreeModel *historyTreeModel() const; - /** - * @returns the AwesomeUrlCompletion object. - */ - AwesomeUrlCompletion *completionObject() const; - void addDownload(const QString &srcUrl, const QString &destUrl); DownloadList downloads(); bool clearDownloadsHistory(); @@ -172,6 +194,7 @@ private slots: protected: void addHistoryEntry(const HistoryItem &item); void removeHistoryEntry(const HistoryItem &item); + void addHistoryHashEntry(const HistoryItem &item); private: void load(); @@ -180,14 +203,12 @@ private: int m_historyLimit; QTimer m_expiredTimer; QList m_history; + QHash m_hash; QString m_lastSavedUrl; HistoryModel *m_historyModel; HistoryFilterModel *m_historyFilterModel; HistoryTreeModel *m_historyTreeModel; - - // the completion object we sync with - AwesomeUrlCompletion *m_completion; }; diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index d457e1fb..50f1692f 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -162,7 +162,7 @@ UrlSearchList UrlResolver::orderedSearchItems() UrlSearchList commonList; int commonResutls = 0; - + //prefer items which are history items als well bookmarks item //if there are more than 1000 bookmark results, the performance impact is noticeable if(bookmarksResults < 1000) @@ -300,16 +300,23 @@ UrlSearchList UrlResolver::webSearchesResolution() // STEP 3 = history completion UrlSearchList UrlResolver::historyResolution() { - AwesomeUrlCompletion *historyCompletion = Application::historyManager()->completionObject(); - return historyCompletion->substringCompletion(_typedString); + QList mostVisited = Application::historyManager()->findMostVisited(_typedString); + UrlSearchList list; + foreach (HistoryHashItem i, mostVisited) + { + UrlSearchItem gItem(UrlSearchItem::History, i.url, i.title); + list << gItem; + } + return list; } // STEP 4 = bookmarks completion UrlSearchList UrlResolver::bookmarksResolution() { - AwesomeUrlCompletion *bookmarkCompletion = Application::bookmarkProvider()->completionObject(); - return bookmarkCompletion->substringCompletion(_typedString); + UrlSearchList list; + //AwesomeUrlCompletion *bookmarkCompletion = Application::bookmarkProvider()->completionObject(); + return list; } @@ -333,124 +340,3 @@ UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list) } return UrlSearchItem(); } - -// ------------------------------------------------------------------------------------------------------ - - -AwesomeUrlCompletion::AwesomeUrlCompletion() -{ - m_resetCompletion = true; -} - - -AwesomeUrlCompletion::~AwesomeUrlCompletion() -{ - -} - - -void AwesomeUrlCompletion::addItem(const UrlSearchItem& itemToAdd) -{ - bool match = false; - QTime myTime; - myTime.start(); - for(int i = 0; i < m_items.count(); i++) - { - //check if item is already in list; the items are equal if the url and the title are equal - if(m_items[i] == itemToAdd) - { - match = true; - //TODO: check what to do if comment or bookmarkPath are different - if(m_items[i] < itemToAdd) - { - m_items[i].visitDateTime = itemToAdd.visitDateTime; - } - m_items[i].visitCount += itemToAdd.visitCount; - } - } - if(!match) - { - m_items.append(itemToAdd); - } - m_resetCompletion = true; -} - - -void AwesomeUrlCompletion::removeItem(const UrlSearchItem& item) -{ - m_resetCompletion = m_items.removeOne(item); -} - - -void AwesomeUrlCompletion::setOrder(KCompletion::CompOrder) -{ - //TODO -} - - -void AwesomeUrlCompletion::updateTitle(const UrlSearchItem& item, const QString& newTitle) -{ - foreach(UrlSearchItem i, m_items) - { - if(i == item) - { - i.title = newTitle; - } - } - m_resetCompletion = true; -} - - -void AwesomeUrlCompletion::clear() -{ - m_items.clear(); - m_resetCompletion = true; -} - - -UrlSearchList AwesomeUrlCompletion::substringCompletion(const QString& completionString) -{ - UrlSearchList* searchList; - UrlSearchList tempList; - - if(!m_resetCompletion) - { - if(completionString.length() <= 1) - { - m_resetCompletion = true; - } - if(!m_resetCompletion && completionString.length() < m_lastCompletionString.length()) - { - m_resetCompletion = true; - } - if(!m_resetCompletion && !completionString.startsWith(m_lastCompletionString, Qt::CaseInsensitive)) - { - m_resetCompletion = true; - } - } - - if(m_resetCompletion) - { - searchList = &m_items; - m_resetCompletion = false; - } - else - { - searchList = &m_filteredItems; - } - - Q_FOREACH(const UrlSearchItem &i, *searchList) - { - //TODO: split string and also search for each word if the are more than one word separated with space - if( i.url.contains(completionString, Qt::CaseInsensitive) - || i.title.contains(completionString, Qt::CaseInsensitive) - || i.description.contains(completionString, Qt::CaseInsensitive) - ) - { - tempList.append(i); - } - } - m_lastCompletionString = completionString; - m_filteredItems = tempList; - return m_filteredItems; -} diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h index 83228140..0ba93921 100644 --- a/src/urlbar/urlresolver.h +++ b/src/urlbar/urlresolver.h @@ -33,14 +33,11 @@ // KDE Includes #include -#include + // Qt Includes #include #include -#include - -class AwesomeUrlCompletion; class UrlSearchItem { @@ -58,25 +55,19 @@ public: int type; QString url; QString title; - QDateTime visitDateTime; - int visitCount; QString description; QString bookmarkPath; UrlSearchItem(const UrlSearchItem &item) : type(item.type), url(item.url), title(item.title), - visitDateTime(item.visitDateTime), - visitCount(item.visitCount), description(item.description), bookmarkPath(item.bookmarkPath) {}; - + UrlSearchItem() : type(UrlSearchItem::Undefined), url(QString()), title(QString()), - visitDateTime(QDateTime()), - visitCount(0), description(QString()), bookmarkPath(QString()) {}; @@ -84,16 +75,12 @@ public: UrlSearchItem(const int &_type, const QString &_url, const QString &_title = QString(), - const QDateTime &visitDateTime = QDateTime(), - const int &visitCount = 0, const QString &description = QString(), const QString &bookmarkPath = QString() ) : type(_type), url(_url), title(_title), - visitDateTime(visitDateTime), - visitCount(visitCount), description(description), bookmarkPath(bookmarkPath) {}; @@ -102,16 +89,6 @@ public: { return i.url == url;//TODO && i.title == title; } - - inline bool operator <(const UrlSearchItem &i) const - { - return visitDateTime < i.visitDateTime; - } - - inline bool operator >(const UrlSearchItem &i) const - { - return visitDateTime > i.visitDateTime; - } }; typedef QList UrlSearchList; @@ -141,27 +118,4 @@ private: // ------------------------------------------------------------------------------ - -/** - * This class represents all searchable item for the awesomebar. - */ -class AwesomeUrlCompletion// : public KCompletion -{ -public: - AwesomeUrlCompletion(); - ~AwesomeUrlCompletion(); - void addItem(const UrlSearchItem& item); - void removeItem(const UrlSearchItem& item); - void setOrder(KCompletion::CompOrder); - void updateTitle(const UrlSearchItem& item, const QString& newTitle); - void clear(); - UrlSearchList substringCompletion(const QString& completionString); - -private: - UrlSearchList m_items; - UrlSearchList m_filteredItems; - bool m_resetCompletion; - QString m_lastCompletionString; -}; - #endif // URL_RESOLVER_H -- cgit v1.2.1