eric: comparison eric7/PipInterface/PipPackagesWidget.py

-:723f61499a79
+:bc0b38405b6a
 from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
 from PyQt6.QtGui import QIcon
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt6.QtWidgets import (
 QWidget, QToolButton, QApplication, QHeaderView, QTreeWidgetItem,
-QMenu, QDialog
+QMenu, QDialog, QAbstractItemView
 )
 from EricWidgets.EricApplication import ericApp
 from EricWidgets import EricMessageBox
 from EricGui.EricOverrideCursor import EricOverrideCursor
 UI.PixmapCache.getIcon("info"))
 self.searchToggleButton.setIcon(
 UI.PixmapCache.getIcon("find"))
 self.searchButton.setIcon(
 UI.PixmapCache.getIcon("findNext"))
+self.searchMoreButton.setIcon(
+UI.PixmapCache.getIcon("plus"))
 self.installButton.setIcon(
 UI.PixmapCache.getIcon("plus"))
 self.installUserSiteButton.setIcon(
 UI.PixmapCache.getIcon("addUser"))
 self.showDetailsButton.setIcon(
 self.__updateActionButtons()
 self.__updateDepActionButtons()
 self.statusLabel.hide()
 self.searchWidget.hide()
+self.__lastSearchPage = 0
 self.__queryName = []
 self.__querySummary = []
 self.__replies = []
 self.statusLabel.hide()
 self.__updateActionButtons()
 self.__updateSearchActionButtons()
 self.__updateSearchButton()
+self.__updateSearchMoreButton(False)
 @pyqtSlot(str)
 def on_environmentsComboBox_currentTextChanged(self, name):
 """
 Private slot handling the selection of a Python environment.
 self.searchButton.setEnabled(
 bool(self.searchEditName.text()) and
 self.__isPipAvailable()
 )
+def __updateSearchMoreButton(self, enable):
+"""
+Private method to update the state of the search more button.
+@param enable flag indicating the desired enable state
+@type bool
+"""
+self.searchMoreButton.setEnabled(
+enable and
+bool(self.searchEditName.text()) and
+self.__isPipAvailable()
+)
 @pyqtSlot(bool)
 def on_searchToggleButton_toggled(self, checked):
 """
 Private slot to togle the search widget.
 self.searchEditName.setFocus(Qt.FocusReason.OtherFocusReason)
 self.searchEditName.selectAll()
 self.__updateSearchActionButtons()
 self.__updateSearchButton()
+self.__updateSearchMoreButton(False)
 @pyqtSlot(str)
 def on_searchEditName_textChanged(self, txt):
 """
 Private slot handling a change of the search term.
 """
 if (
 bool(self.searchEditName.text()) and
 self.__isPipAvailable()
 ):
-self.__search()
+self.__searchFirst()
 @pyqtSlot()
 def on_searchButton_clicked(self):
 """
 Private slot handling a press of the search button.
 """
-self.__search()
+self.__searchFirst()
+@pyqtSlot()
+def on_searchMoreButton_clicked(self):
+"""
+Private slot handling a press of the search more button.
+"""
+self.__search(self.__lastSearchPage + 1)
 @pyqtSlot()
 def on_searchResultList_itemSelectionChanged(self):
 """
 Private slot handling changes of the search result selection.
 """
 self.__updateSearchActionButtons()
-def __search(self):
+def __searchFirst(self):
 """
-Private method to perform the search by calling the PyPI search URL.
+Private method to perform the search for packages.
 """
 self.searchResultList.clear()
 self.searchInfoLabel.clear()
+self.__updateSearchMoreButton(False)
+self.__search()
+def __search(self, page=1):
+"""
+Private method to perform the search by calling the PyPI search URL.
+@param page search page to retrieve (defaults to 1)
+@type int (optional)
+"""
+self.__lastSearchPage = page
 self.searchButton.setEnabled(False)
 searchTerm = self.searchEditName.text().strip()
 searchTerm = bytes(QUrl.toPercentEncoding(searchTerm)).decode()
 urlQuery = QUrlQuery()
 urlQuery.addQueryItem("q", searchTerm)
+urlQuery.addQueryItem("page", str(page))
 url = QUrl(self.__pip.getIndexUrlSearch())
 url.setQuery(urlQuery)
 request = QNetworkRequest(QUrl(url))
 request.setAttribute(
 data = bytes(reply.readAll()).decode()
 reply.deleteLater()
 results = PypiSearchResultsParser(data).getResults()
 if results:
+# PyPI returns max. 20 entries per page
 if len(results) < 20:
-msg = self.tr("%n package(s) found.", "", len(results))
+msg = self.tr("%n package(s) found.", "",
+(self.__lastSearchPage - 1) * 20 + len(results))
+self.__updateSearchMoreButton(False)
 else:
-msg = self.tr("Showing first 20 packages found.")
+msg = self.tr("Showing first {0} packages found.").format(
+self.__lastSearchPage * 20)
+self.__updateSearchMoreButton(True)
 self.searchInfoLabel.setText(msg)
+lastItem = self.searchResultList.topLevelItem(
+self.searchResultList.topLevelItemCount() - 1)
 else:
-EricMessageBox.warning(
+self.__updateSearchMoreButton(False)
-self,
+if self.__lastSearchPage == 1:
-self.tr("Search PyPI"),
+EricMessageBox.warning(
-self.tr("""<p>There were no results for <b>{0}</b>.</p>"""))
+self,
-self.searchInfoLabel.setText(
+self.tr("Search PyPI"),
-self.tr("""<p>There were no results for <b>{0}</b>.</p>"""))
+self.tr("""<p>There were no results for <b>{0}</b>.</p>""")
+.format(searchTerm)
+)
+self.searchInfoLabel.setText(
+self.tr("""<p>There were no results for <b>{0}</b>.</p>""")
+.format(searchTerm)
+)
+else:
+EricMessageBox.warning(
+self,
+self.tr("Search PyPI"),
+self.tr("""<p>There were no more results for"""
+""" <b>{0}</b>.</p>""").format(searchTerm)
+)
+lastItem = None
 wrapper = textwrap.TextWrapper(width=80)
 for result in results:
 try:
 description = "\n".join([
 result['version'],
 result["released"].strip(),
 description,
 ])
 itm.setData(0, self.SearchVersionRole, result['version'])
+if lastItem:
+self.searchResultList.scrollToItem(
+lastItem,
+QAbstractItemView.ScrollHint.PositionAtTop)
 header = self.searchResultList.header()
 header.setStretchLastSection(False)
 header.resizeSections(QHeaderView.ResizeMode.ResizeToContents)
 headerSize = 0

Mercurial Repositories > eric / file comparison

comparison: eric7/PipInterface/PipPackagesWidget.py

eric7/PipInterface/PipPackagesWidget.py