3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CURA-5296 Don't crash if no CuraVersion

Browse source
This commit is contained in:
Ian Paschal 2018-05-09 17:09:21 +02:00
parent dff36da895
commit 20a2ea4f2c
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/Toolbox/src/Toolbox.py
View file

@ -18,7 +18,7 @@ from UM.Extension import Extension
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Version import Version from UM.Version import Version
import cura.CuraVersion import cura
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from .AuthorsModel import AuthorsModel from .AuthorsModel import AuthorsModel
from .PackagesModel import PackagesModel from .PackagesModel import PackagesModel
@ -35,7 +35,15 @@ class Toolbox(QObject, Extension):
self._application = Application.getInstance() self._application = Application.getInstance()
self._package_manager = None self._package_manager = None
self._plugin_registry = Application.getInstance().getPluginRegistry() self._plugin_registry = Application.getInstance().getPluginRegistry()
self._packages_version = cura.CuraVersion.CuraPackagesVersion if hasattr(cura.CuraVersion, "CuraPackagesVersion") else self._plugin_registry.APIVersion # type:ignore
if hasattr(cura, "CuraVersion"):
if hasattr(cura.CuraVersion, "CuraPackagesVersion"):
self._packages_version = cura.CuraVersion.CuraPackagesVersion
else:
self._packages_version = self._plugin_registry.APIVersion
else:
self._packages_version = self._plugin_registry.APIVersion
self._api_version = 1 self._api_version = 1
self._api_url = "https://api-staging.ultimaker.com/cura-packages/v{api_version}/cura/v{package_version}".format( api_version = self._api_version, package_version = self._packages_version) self._api_url = "https://api-staging.ultimaker.com/cura-packages/v{api_version}/cura/v{package_version}".format( api_version = self._api_version, package_version = self._packages_version)