fix: plugin WebSearchPy

samsonwang · samsonwang · commit 8fb4ebb04024 · 2023-12-07T19:31:02.000+08:00
diff --git a/src/PluginPy/ExportPy.cpp b/src/PluginPy/ExportPy.cpp
@@ -84,12 +84,10 @@ void objectReceiver(py::object obj) {
 
     else if (py::isinstance<exportpy::Plugin*>(obj)) {
         std::cout << "objectReceiver, got Plugin ptr" << std::endl;
-
     }
 
     else if (py::isinstance<exportpy::Plugin>(obj)) {
         std::cout << "objectReceiver, got Plugin" << std::endl;
-
     }
 
     else {
diff --git a/src/Plugins/WebSearchPy/WebSearch/WebSearchGui.py b/src/Plugins/WebSearchPy/WebSearch/WebSearchGui.py
@@ -1,14 +1,15 @@
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import QVariant
-from PyQt5.QtWidgets import QApplication, QWidget, QDialog, QFileDialog
+import logging as log
+
+from PySide6 import QtCore, QtGui, QtWidgets
+from PySide6.QtWidgets import QApplication
+from PySide6.QtWidgets import QWidget, QTableWidgetItem
 
 from .ui_websearch import *
-#from .ui_pydiry_new_entry import *
 
 import launchy
 
-class WebSearchUi(QWidget):
+class WebSearchGui(QWidget):
     def __init__(self, parent=None, settingName=None):
         QtWidgets.QWidget.__init__(self, parent)
         self.settingName = settingName
@@ -20,24 +21,24 @@ def __init__(self, parent=None, settingName=None):
 
         size = settings.beginReadArray(self.settingName)
         if size <= 0:
-            print("WebSearchUi, load default setting")
+            log.debug("WebSearchGui, load default setting")
             from .Defaults import defaultSetting as defSet
             table.setRowCount(len(defSet.keys()))
             for i, item in enumerate(defSet):
-                print("i:", i, "item:", item)
-                keyItem = QtWidgets.QTableWidgetItem( item )
-                nameItem = QtWidgets.QTableWidgetItem( defSet[item]['name'] )
-                urlItem = QtWidgets.QTableWidgetItem( defSet[item]['url'] )
+                log.debug("WebSearchGui, i: %s, item: %s" % (i, item))
+                keyItem = QTableWidgetItem( item )
+                nameItem = QTableWidgetItem( defSet[item]['name'] )
+                urlItem = QTableWidgetItem( defSet[item]['url'] )
                 table.setItem(i, 0, keyItem)
                 table.setItem(i, 1, nameItem)
                 table.setItem(i, 2, urlItem)
         else:
             table.setRowCount(size)
             for i in range(0, size):
                 settings.setArrayIndex(i);
-                keyItem = QtWidgets.QTableWidgetItem( settings.value("key") )
-                nameItem = QtWidgets.QTableWidgetItem( settings.value("name") )
-                urlItem = QtWidgets.QTableWidgetItem( settings.value("url") )
+                keyItem = QTableWidgetItem( settings.value("key") )
+                nameItem = QTableWidgetItem( settings.value("name") )
+                urlItem = QTableWidgetItem( settings.value("url") )
                 table.setItem(i, 0, keyItem)
                 table.setItem(i, 1, nameItem)
                 table.setItem(i, 2, urlItem)
@@ -64,16 +65,16 @@ def removeEntry_clicked(self):
             self.ui.entriesTable.removeRow(currentRow)
 
     def writeSettings(self):
-        print("WebSearchUi, writeSettings")
+        log.debug("WebSearchGui, writeSettings")
         settings = launchy.settings
         table = self.ui.entriesTable
 
         # Remove all empty rows
         itemsToRemove = []
         for i in range(0, table.rowCount()):
-            keyItem = table.item(i,0)
-            nameItem = table.item(i,1)
-            urlItem = table.item(i,2)
+            keyItem = table.item(i, 0)
+            nameItem = table.item(i, 1)
+            urlItem = table.item(i, 2)
             if keyItem == None or nameItem == None or urlItem == None:
                 itemsToRemove.append(i)
             elif keyItem.text() == "" or nameItem.text() == "" or urlItem == "":
@@ -84,11 +85,11 @@ def writeSettings(self):
 
         # Add all rows to the dirs array
         settings.remove(self.settingName)
-        print("WebSearchUi, settingName", self.settingName)
+        log.debug("WebSearchUi, settingName: %s" % self.settingName)
         settings.beginWriteArray(self.settingName)
         for i in range(0, table.rowCount()):
             settings.setArrayIndex(i)
-            settings.setValue("key", QVariant(table.item(i,0).text().lower()))
-            settings.setValue("name", QVariant(table.item(i,1).text()))
-            settings.setValue("url", QVariant(table.item(i,2).text()))
+            settings.setValue("key", (table.item(i,0).text().lower()))
+            settings.setValue("name", (table.item(i,1).text()))
+            settings.setValue("url", (table.item(i,2).text()))
         settings.endArray()
diff --git a/src/Plugins/WebSearchPy/WebSearch/ui_websearch.py b/src/Plugins/WebSearchPy/WebSearch/ui_websearch.py
@@ -1,69 +1,101 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'websearch.ui'
-#
-# Created by: PyQt5 UI code generator 5.11.2
-#
-# WARNING! All changes made in this file will be lost!
+################################################################################
+## Form generated from reading UI file 'websearch.ui'
+##
+## Created by: Qt User Interface Compiler version 6.5.3
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QHeaderView, QPushButton,
+    QSizePolicy, QSpacerItem, QTableWidget, QTableWidgetItem,
+    QVBoxLayout, QWidget)
 
 class Ui_WebSearchWidget(object):
     def setupUi(self, WebSearchWidget):
-        WebSearchWidget.setObjectName("WebSearchWidget")
+        if not WebSearchWidget.objectName():
+            WebSearchWidget.setObjectName(u"WebSearchWidget")
         WebSearchWidget.resize(647, 360)
-        self.verticalLayout = QtWidgets.QVBoxLayout(WebSearchWidget)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.entriesTable = QtWidgets.QTableWidget(WebSearchWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout = QVBoxLayout(WebSearchWidget)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.entriesTable = QTableWidget(WebSearchWidget)
+        if (self.entriesTable.columnCount() < 3):
+            self.entriesTable.setColumnCount(3)
+        __qtablewidgetitem = QTableWidgetItem()
+        self.entriesTable.setHorizontalHeaderItem(0, __qtablewidgetitem)
+        __qtablewidgetitem1 = QTableWidgetItem()
+        self.entriesTable.setHorizontalHeaderItem(1, __qtablewidgetitem1)
+        __qtablewidgetitem2 = QTableWidgetItem()
+        self.entriesTable.setHorizontalHeaderItem(2, __qtablewidgetitem2)
+        self.entriesTable.setObjectName(u"entriesTable")
+        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.entriesTable.sizePolicy().hasHeightForWidth())
         self.entriesTable.setSizePolicy(sizePolicy)
-        self.entriesTable.setObjectName("entriesTable")
-        self.entriesTable.setColumnCount(3)
-        self.entriesTable.setRowCount(0)
-        item = QtWidgets.QTableWidgetItem()
-        self.entriesTable.setHorizontalHeaderItem(0, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.entriesTable.setHorizontalHeaderItem(1, item)
-        item = QtWidgets.QTableWidgetItem()
-        self.entriesTable.setHorizontalHeaderItem(2, item)
         self.entriesTable.horizontalHeader().setStretchLastSection(True)
         self.entriesTable.verticalHeader().setStretchLastSection(False)
+
         self.verticalLayout.addWidget(self.entriesTable)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.addEntryButton = QtWidgets.QPushButton(WebSearchWidget)
-        self.addEntryButton.setObjectName("addEntryButton")
+
+        self.horizontalLayout = QHBoxLayout()
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.horizontalSpacer_4 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+
+        self.horizontalLayout.addItem(self.horizontalSpacer_4)
+
+        self.addEntryButton = QPushButton(WebSearchWidget)
+        self.addEntryButton.setObjectName(u"addEntryButton")
+
         self.horizontalLayout.addWidget(self.addEntryButton)
-        spacerItem1 = QtWidgets.QSpacerItem(58, 17, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.removeEntryButton = QtWidgets.QPushButton(WebSearchWidget)
-        self.removeEntryButton.setObjectName("removeEntryButton")
+
+        self.horizontalSpacer = QSpacerItem(58, 17, QSizePolicy.Expanding, QSizePolicy.Minimum)
+
+        self.horizontalLayout.addItem(self.horizontalSpacer)
+
+        self.removeEntryButton = QPushButton(WebSearchWidget)
+        self.removeEntryButton.setObjectName(u"removeEntryButton")
+
         self.horizontalLayout.addWidget(self.removeEntryButton)
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem2)
+
+        self.horizontalSpacer_5 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+
+        self.horizontalLayout.addItem(self.horizontalSpacer_5)
+
+
         self.verticalLayout.addLayout(self.horizontalLayout)
 
+
         self.retranslateUi(WebSearchWidget)
         self.addEntryButton.clicked.connect(WebSearchWidget.addEntry_clicked)
         self.removeEntryButton.clicked.connect(WebSearchWidget.removeEntry_clicked)
-        QtCore.QMetaObject.connectSlotsByName(WebSearchWidget)
+
+        QMetaObject.connectSlotsByName(WebSearchWidget)
+    # setupUi
 
     def retranslateUi(self, WebSearchWidget):
-        _translate = QtCore.QCoreApplication.translate
-        WebSearchWidget.setWindowTitle(_translate("WebSearchWidget", "WebSearchPy - Search items from web"))
-        item = self.entriesTable.horizontalHeaderItem(0)
-        item.setText(_translate("WebSearchWidget", "Key"))
-        item = self.entriesTable.horizontalHeaderItem(1)
-        item.setText(_translate("WebSearchWidget", "Name"))
-        item = self.entriesTable.horizontalHeaderItem(2)
-        item.setText(_translate("WebSearchWidget", "Url"))
-        self.addEntryButton.setToolTip(_translate("WebSearchWidget", "Add a new entry"))
-        self.addEntryButton.setText(_translate("WebSearchWidget", "+"))
-        self.removeEntryButton.setToolTip(_translate("WebSearchWidget", "Remove the selected entry"))
-        self.removeEntryButton.setText(_translate("WebSearchWidget", "-"))
+        WebSearchWidget.setWindowTitle(QCoreApplication.translate("WebSearchWidget", u"WebSearchPy - Search items from web", None))
+        ___qtablewidgetitem = self.entriesTable.horizontalHeaderItem(0)
+        ___qtablewidgetitem.setText(QCoreApplication.translate("WebSearchWidget", u"Key", None));
+        ___qtablewidgetitem1 = self.entriesTable.horizontalHeaderItem(1)
+        ___qtablewidgetitem1.setText(QCoreApplication.translate("WebSearchWidget", u"Name", None));
+        ___qtablewidgetitem2 = self.entriesTable.horizontalHeaderItem(2)
+        ___qtablewidgetitem2.setText(QCoreApplication.translate("WebSearchWidget", u"Url", None));
+#if QT_CONFIG(tooltip)
+        self.addEntryButton.setToolTip(QCoreApplication.translate("WebSearchWidget", u"Add a new entry", None))
+#endif // QT_CONFIG(tooltip)
+        self.addEntryButton.setText(QCoreApplication.translate("WebSearchWidget", u"+", None))
+#if QT_CONFIG(tooltip)
+        self.removeEntryButton.setToolTip(QCoreApplication.translate("WebSearchWidget", u"Remove the selected entry", None))
+#endif // QT_CONFIG(tooltip)
+        self.removeEntryButton.setText(QCoreApplication.translate("WebSearchWidget", u"-", None))
+    # retranslateUi
 
diff --git a/src/Plugins/WebSearchPy/WebSearchPy.py b/src/Plugins/WebSearchPy/WebSearchPy.py
@@ -1,29 +1,28 @@
 
 import urllib
-import urllib.parse
-#import subprocess
 import webbrowser
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import QVariant
-from sip import wrapinstance, unwrapinstance
+import logging as log
 
-import launchy
-from WebSearch import WebSearchGui
+from PySide6 import QtCore, QtGui, QtWidgets
+from PySide6.QtWidgets import QWidget, QApplication
+from shiboken6 import wrapInstance, getCppPointer
 
-class WebSearchPy(launchy.Plugin):
+from launchy import Plugin, CatItem
+from launchy import settings as lSettings
+
+import WebSearch
+from WebSearch.WebSearchGui import WebSearchGui
+
+class WebSearchPy(Plugin):
     settingName = "WebSearchPy"
     searchEngine = {}
     def __init__(self):
-        launchy.Plugin.__init__(self)
-        self.hash = launchy.hash(self.getName())
+        Plugin.__init__(self)
 
     def init(self):
         self.__readConfig()
 
-    def getID(self):
-        return int(self.hash)
-
     def getName(self):
         return "WebSearchPy"
 
@@ -36,38 +35,37 @@ def getIcon(self):
     def getLabels(self, inputDataList):
         query = inputDataList[0].getText()
         if query in self.searchEngine.keys():
-            inputDataList[-1].setLabel(self.hash);
+            inputDataList[-1].setPlugin(self.getName())
 
     def getResults(self, inputDataList, resultsList):
-        if not inputDataList[-1].hasLabel(self.hash):
+        if inputDataList[-1].getPlugin() != self.getName():
             return
         query = inputDataList[0].getText()
         keyword = inputDataList[-1].getText()
         if query in self.searchEngine.keys():
             resultsList.push_front(
-                launchy.CatItem("%s: %s search"
-                                % (self.getName(),
-                                   self.searchEngine.get(query).get("name")),
-                                keyword,
-                                self.getID(),
-                                self.getIcon()))
+                CatItem("%s: %s search" % (self.getName(), self.searchEngine.get(query).get("name")),
+                        keyword, self.getName(), self.getIcon()))
 
     def launchItem(self, inputDataList, catItem):
         if len(inputDataList) == 2:
             key = inputDataList[0].getText()
             query = inputDataList[-1].getText()
             url = self.getUrl(key, query)
-            print('WebSerach, launchyItem:', key, query, url)
+            log.debug('WebSerachPy::launchyItem, key: %s, query: %s url: %s'
+                      % (key, query, url))
             webbrowser.open(url)
         return True
 
     def doDialog(self, parentWidgetPtr):
-        parentWidget = wrapinstance(parentWidgetPtr, QtWidgets.QWidget)
-        self.widget = WebSearchGui.WebSearchUi(parentWidget, self.settingName)
+        log.debug('WebSearchPy::doDialog ...')
+        parentWidget = wrapInstance(parentWidgetPtr, QWidget)
+        self.widget = WebSearchGui(parentWidget, self.settingName)
         self.widget.show()
-        return unwrapinstance(self.widget);
+        return getCppPointer(self.widget)[0]
 
     def endDialog(self, accept):
+        log.debug('WebSearchPy::endDialog ...')
         self.widget.hide()
         if accept:
             self.widget.writeSettings()
@@ -76,25 +74,25 @@ def endDialog(self, accept):
         self.widget = None
 
     def __readConfig(self):
-        settings = launchy.settings
+        settings = lSettings
         self.searchEngine.clear()
 
         # Read directories from the settings file
         size = settings.beginReadArray(self.settingName)
         if size <= 0:
-            print("WebSearchPy, __readConfig, load defaults")
+            log.debug("WebSearchPy::__readConfig, load defaults")
             from WebSearch import Defaults
             self.searchEngine.update(Defaults.defaultSetting)
         else:
-            print("WebSearchPy, __readConfig, read from config, count:", size)
+            log.debug("WebSearchPy::__readConfig, read from config, count: %s" % size)
             for i in range(0, size):
                 settings.setArrayIndex(i)
                 key = settings.value("key")
                 name = settings.value("name")
                 url = settings.value("url")
                 self.searchEngine[key] = {"name":name, "url": url}
         settings.endArray()
-        print("WebSearchPy, __readConfig:", self.searchEngine)
+        log.debug("WebSearchPy::__readConfig: %s" % self.searchEngine)
 
     @classmethod
     def encodeQuery(cls, query):
@@ -105,7 +103,7 @@ def getUrl(cls, key, query):
         url =  eval('"%s" %% "%s"'
                     % (WebSearchPy.searchEngine.get(key).get('url'),
                        WebSearchPy.encodeQuery(query)))
-        print("WebSearchPy, getUrl:", url)
+        log.debug("WebSearchPy::getUrl: %s" % url)
         return url
 
 

Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,10 @@ void objectReceiver(py::object obj) {`
`84`	`84`
`85`	`85`	`else if (py::isinstance<exportpy::Plugin*>(obj)) {`
`86`	`86`	`std::cout << "objectReceiver, got Plugin ptr" << std::endl;`
`87`		`-`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`else if (py::isinstance<exportpy::Plugin>(obj)) {`
`91`	`90`	`std::cout << "objectReceiver, got Plugin" << std::endl;`
`92`		`-`
`93`	`91`	`}`
`94`	`92`
`95`	`93`	`else {`