From 4db213c55a6b5bca31412c7cffc488e51231b37b Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 17 Sep 2018 16:24:10 +0200 Subject: [PATCH 1/3] Fix missing import --- plugins/Toolbox/src/Toolbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index ceb27542c1..f24184439d 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -5,7 +5,7 @@ import json import os import tempfile import platform -from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional +from typing import cast, Any, Dict, List, Set, TYPE_CHECKING, Tuple, Optional, Union from PyQt5.QtCore import QUrl, QObject, pyqtProperty, pyqtSignal, pyqtSlot from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply From 15657f4cfce62c6c7baf950e62845eca69ceb3e3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 17 Sep 2018 17:26:19 +0200 Subject: [PATCH 2/3] Remove unneeded code --- plugins/Toolbox/src/Toolbox.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index f24184439d..2c252748fa 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -498,10 +498,6 @@ class Toolbox(QObject, Extension): local_version = Version(local_package["package_version"]) remote_version = Version(remote_package["package_version"]) - if self._getSDKVersion() == "dev": - sdk_version = self._plugin_registry.APIVersion - else: - sdk_version = self._getSDKVersion() can_upgrade = False if remote_version > local_version: can_upgrade = True From da047ea6740ddd0d9eb973984510051391823b84 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 17 Sep 2018 17:26:36 +0200 Subject: [PATCH 3/3] isInstalled() should check old plugins as a fallback --- plugins/Toolbox/src/Toolbox.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 2c252748fa..91984aa148 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -527,7 +527,11 @@ class Toolbox(QObject, Extension): @pyqtSlot(str, result = bool) def isInstalled(self, package_id: str) -> bool: - return self._package_manager.isPackageInstalled(package_id) + result = self._package_manager.isPackageInstalled(package_id) + # Also check the old plugins list if it's not found in the package manager. + if not result: + result = self.isOldPlugin(package_id) + return result @pyqtSlot(str, result = int) def getNumberOfInstalledPackagesByAuthor(self, author_id: str) -> int: