Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload

This commit is contained in:
Daniel Schiavini 2018-12-14 16:17:36 +01:00
commit 3194a6d0bb
109 changed files with 2008 additions and 689 deletions

View file

@ -8,6 +8,7 @@ from PyQt5.QtCore import QUrl
from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager
from UM.Logger import Logger
from cura import CuraConstants
from cura.API import Account
from .MeshUploader import MeshUploader
from ..Models import BaseModel
@ -24,8 +25,7 @@ from .Models.CloudPrintJobResponse import CloudPrintJobResponse
class CloudApiClient:
# The cloud URL to use for this remote cluster.
# TODO: Make sure that this URL goes to the live api before release
ROOT_PATH = "https://api-staging.ultimaker.com"
ROOT_PATH = CuraConstants.CuraCloudAPIRoot
CLUSTER_API_ROOT = "{}/connect/v1".format(ROOT_PATH)
CURA_API_ROOT = "{}/cura/v1".format(ROOT_PATH)