GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Freshly installed plugins can't be downloaded again anymore

Browse Source 
CURA-3856
This commit is contained in:
Jaime van Kessel 2017-06-23 13:32:19 +02:00
parent 68663b2789
commit 83b3dcbb2f
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/PluginBrowser/PluginBrowser.py
View File

@ -43,6 +43,10 @@ class PluginBrowser(QObject, Extension):
self._is_downloading = False self._is_downloading = False
# Installed plugins are really installed after reboot. In order to prevent the user from downloading the
# same file over and over again, we keep track of the upgraded plugins.
self._newly_installed_plugin_ids = []
pluginsMetadataChanged = pyqtSignal() pluginsMetadataChanged = pyqtSignal()
onDownloadProgressChanged = pyqtSignal() onDownloadProgressChanged = pyqtSignal()
@ -97,6 +101,12 @@ class PluginBrowser(QObject, Extension):
self._temp_plugin_file = tempfile.NamedTemporaryFile(suffix = ".curaplugin") self._temp_plugin_file = tempfile.NamedTemporaryFile(suffix = ".curaplugin")
self._temp_plugin_file.write(self._download_plugin_reply.readAll()) self._temp_plugin_file.write(self._download_plugin_reply.readAll())
result = PluginRegistry.getInstance().installPlugin("file://" + self._temp_plugin_file.name) result = PluginRegistry.getInstance().installPlugin("file://" + self._temp_plugin_file.name)
if result["status"] == "ok":
self._newly_installed_plugin_ids.append(result["id"])
self.pluginsMetadataChanged.emit()
else:
# TODO; Handle cases where, for some reason, we could not install the plugin
pass
self._temp_plugin_file.close() # Plugin was installed, delete temp file self._temp_plugin_file.close() # Plugin was installed, delete temp file
@pyqtProperty(int, notify = onDownloadProgressChanged) @pyqtProperty(int, notify = onDownloadProgressChanged)
@ -134,11 +144,10 @@ class PluginBrowser(QObject, Extension):
"version": metadata["version"], "version": metadata["version"],
"short_description": metadata["short_description"], "short_description": metadata["short_description"],
"author": metadata["author"], "author": metadata["author"],
"already_installed": self._checkAlreadyInstalled(metadata["id"], metadata["version"]), "already_installed": self._checkAlreadyInstalled(metadata["id"]),
"file_location": metadata["file_location"], "file_location": metadata["file_location"],
"can_upgrade": self._checkCanUpgrade(metadata["id"], metadata["version"]) "can_upgrade": self._checkCanUpgrade(metadata["id"], metadata["version"])
}) })
print(items)
self._plugins_model.setItems(items) self._plugins_model.setItems(items)
return self._plugins_model return self._plugins_model
@ -146,18 +155,22 @@ class PluginBrowser(QObject, Extension):
plugin_registry = PluginRegistry.getInstance() plugin_registry = PluginRegistry.getInstance()
metadata = plugin_registry.getMetaData(id) metadata = plugin_registry.getMetaData(id)
if metadata != {}: if metadata != {}:
if id in self._newly_installed_plugin_ids:
return False # We already updated this plugin.
current_version = Version(metadata["plugin"]["version"]) current_version = Version(metadata["plugin"]["version"])
new_version = Version(version) new_version = Version(version)
if new_version > current_version: if new_version > current_version:
return True return True
return False return False
def _checkAlreadyInstalled(self, id, version): def _checkAlreadyInstalled(self, id):
plugin_registry = PluginRegistry.getInstance() plugin_registry = PluginRegistry.getInstance()
metadata = plugin_registry.getMetaData(id) metadata = plugin_registry.getMetaData(id)
if metadata != {}: if metadata != {}:
return True return True
else: else:
if id in self._newly_installed_plugin_ids:
return True # We already installed this plugin, but the registry just doesn't know it yet.
return False return False
def _onRequestFinished(self, reply): def _onRequestFinished(self, reply):