3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Ensure that local list has update URL

Browse source 
CURA-8587
This commit is contained in:
Jaime van Kessel 2021-12-22 14:27:24 +01:00
parent 532c7a2109
commit cf7772a40a
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/Marketplace/LocalPackageList.py
View file

@ -119,5 +119,9 @@ class LocalPackageList(PackageList):
packages = response_data["data"] packages = response_data["data"]
for package in packages: for package in packages:
self._package_manager.addAvailablePackageVersion(package["package_id"], Version(package["package_version"])) self._package_manager.addAvailablePackageVersion(package["package_id"], Version(package["package_version"]))
package_model = self.getPackageModel(package["package_id"])
if package_model:
# Also make sure that the local list knows where to get an update
package_model.setDownloadUrl(package["download_url"])
self._ongoing_requests["check_updates"] = None self._ongoing_requests["check_updates"] = None

1
plugins/Marketplace/PackageList.py
View file

@ -237,7 +237,6 @@ class PackageList(ListModel):
self._ongoing_requests["download_package"] = None self._ongoing_requests["download_package"] = None
self._requestInstall(package_id, update) self._requestInstall(package_id, update)
def _downloadError(self, package_id: str, update: bool = False, reply: Optional["QNetworkReply"] = None, error: Optional["QNetworkReply.NetworkError"] = None) -> None: def _downloadError(self, package_id: str, update: bool = False, reply: Optional["QNetworkReply"] = None, error: Optional["QNetworkReply.NetworkError"] = None) -> None:
if reply: if reply:
reply_string = bytes(reply.readAll()).decode() reply_string = bytes(reply.readAll()).decode()

9
plugins/Marketplace/PackageModel.py
View file

@ -290,9 +290,8 @@ class PackageModel(QObject):
def isBundled(self) -> bool: def isBundled(self) -> bool:
return self._is_bundled return self._is_bundled
@pyqtProperty(str, constant = True) def setDownloadUrl(self, download_url):
def downloadURL(self) -> str: self._download_url = download_url
return self._download_url
# --- manage buttons signals --- # --- manage buttons signals ---
@ -313,12 +312,12 @@ class PackageModel(QObject):
@pyqtSlot() @pyqtSlot()
def install(self): def install(self):
self.setBusy(True) self.setBusy(True)
self.installPackageTriggered.emit(self.packageId, self.downloadURL) self.installPackageTriggered.emit(self.packageId, self._download_url)
@pyqtSlot() @pyqtSlot()
def update(self): def update(self):
self.setBusy(True) self.setBusy(True)
self.updatePackageTriggered.emit(self.packageId, self.downloadURL) self.updatePackageTriggered.emit(self.packageId, self._download_url)
@pyqtSlot() @pyqtSlot()
def uninstall(self): def uninstall(self):