1758 Commits

Author SHA1 Message Date
Kostas Karmas
b9956f2ae2 Fix failing tests
CURA-7454
2020-06-09 17:51:06 +02:00
Remco Burema
ac36aeb831
Merge pull request #7903 from Ultimaker/CURA-7493_prefer_online_cloud_printers
Sort new_devices on online status first, name second
2020-06-09 17:46:05 +02:00
Kostas Karmas
2442371c2f Hide the message if a manual check is initiated
This has to be done in order to avoid weird actions taking place, such
as the user pressing to remove the printers while another sync is
happening.

CURA-7454
2020-06-09 17:42:53 +02:00
Remco Burema
a38fac9e67
Fix typing. 2020-06-09 17:34:23 +02:00
Remco Burema
29442e29e4
Make printer name sorting case insensitive again.
part of CURA-7493
2020-06-09 17:28:02 +02:00
Kostas Karmas
1c9ce25614 Change lifetime of the removed_printers_message to 30 seconds
After 30 seconds a new sync will be initiated, which will alter the
conents of self.reported_device_ids, thus making the current message
deprecated. Therefore, it is best to have a maximum lifetime of 30
seconds.

CURA-7454
2020-06-09 17:24:36 +02:00
Nino van Hooff
b734830fcf Sort new_devices on online status first, name second
Since the first device might be activated in case there is no active printer yet,
it would be nice to prioritize online devices

CURA-7493
2020-06-09 17:02:21 +02:00
Kostas Karmas
567f6dabdc Add option to remove all printers not linked to the account
When the "Printers removed from account" message pops up, it will give
the option to the user to remove all the printers that are not linked
to his/her account from Cura. Since this action removes all
configurations, it first pops a confirmation question box, and if the
user insists, these printers are purged from Cura.

Note: In order to properly delete all the files, the printers have to
be activated first before they are removed, or else some extruder
files in %appdata%/cura/<version>/user and %appdata%/cura/<version>/
extruders remain.

CURA-7454
2020-06-09 15:40:30 +02:00
Kostas Karmas
f0dda6553b Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:04:54 +02:00
Kostas Karmas
01230cff00 Merge branch 'CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account' into CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account 2020-06-09 15:04:41 +02:00
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Jaime van Kessel
b6b3646f32
Merge branch 'CURA-7437_no_internet_cloud_bugs' of github.com:Ultimaker/Cura 2020-06-09 13:45:21 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
2020-06-09 13:41:30 +02:00
Nino van Hooff
32f57b8770 Merge remote-tracking branch 'origin/master' into CURA-7437_no_internet_cloud_bugs 2020-06-09 10:47:53 +02:00
Ghostkeeper
c6af6565a3
More descriptive and appropriate logging
Contributes to issue CURA-7488.
2020-06-08 17:58:42 +02:00
Ghostkeeper
7e10e74e9e
Don't send print job in chunks
Previously the print job was sent with multiple PUT requests. This was necessary since the request was made with the Python Requests library, which freezes the interface while it's running. By breaking the upload up in chunks, it would at least periodically keep updating the interface (4 times per second or so, depending on your internet speed and Ultimaker's). Later on, this was replaced by a QNetworkRequest which doesn't freeze the interface in a refactor, but it was still broken up in chunks.
Recently that was again refactored to use Uranium's HttpRequestManager, which under the covers also uses QNetworkRequest. This also doesn't freeze while uploading, which is good. However for some reason the second chunk would always give a QNetworkReply::ProtocolUnknownError, which is a bit of a catch-all error for any HTTP status codes not supported by Qt. I was not able to figure out what was really going wrong there, but it has something to do with the content-range header and making multiple requests.
Instead of fixing that, I've removed the chunking. This simplifies the code a lot and doesn't have any implications for the user, since it still doesn't freeze the interface while the network request is ongoing. It should be slightly faster to upload, and reduce load on the server too.

However the disadvantage is that the original bug is probably still there if it was a bug in the HttpRequestManager. If it was a bug in the ToolPathUploader I probably deleted the bug here.

Contributes to issue CURA-7488.
2020-06-08 17:55:07 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Kostas Karmas
42daef0a75 Remove spam info message 2020-06-05 13:20:38 +02:00
Kostas Karmas
27b733fe3d Add "Keep printer configurations" button in removed printers message
Since keeping the printers as local ones is the default action, this
button behaves the same way as the "X" button, hiding the message.

CURA-7455
2020-06-05 11:39:26 +02:00
Kostas Karmas
167a4c1f58 Make reported_device_ids a class variable
So that the actions that can be performed by the message buttons
can properly access the list and take the necessary steps to achieve
their purpose.

CURA-7438
2020-06-05 11:25:44 +02:00
Kostas Karmas
458b439a9a Rename META_REMOVED_FROM_ACCOUNT to META_LINKED_TO_ACCOUNT
The meta data entry was rename to be more representative of its
function. In addition, the bool metadata entry is now properly
handled using the parseBool function.

CURA-7438
2020-06-04 16:14:09 +02:00
Kostas Karmas
9e891c201b Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 15:25:43 +02:00
Kostas Karmas
ee7f2d4b38 Handle the case when a cloud printer is removed from the account
When a cloud printer is no longer received from mycloud, it is safe to
assume that the printer is removed from the account. In such a case,
the new function _devicesRemovedFromAccount(..) will retrieve all the
devices that are to be removed (i.e. they are added in Cura but they
do not exist in the clusters received from mycloud) and will remove
their output device. In addition the function will generate a message
that mentions all the devices that were no longer linked to the
account.

In order to achieve that, the Cloud/CloudOutputDeviceManager is
enriched with the dictionary self._um_cloud_printers that contains all
the currently existing cloud-enabled devices that were previously added
in Cura. In addition, the meta-data field "removed_from_account" is
added to all the cloud-enabled Cura devices to distinguish the ones
actually linked to the current account.

With these additions, the cloud devices that are removed from the
account will be automagically re-linked to it once the devices are once
again retrieved from mycloud for the specific account.

CURA-7438
2020-06-04 14:56:58 +02:00
Gabriel Vogel
2ebf32831a remove duplicate updates for model properties 2020-06-04 13:50:24 +02:00
Ghostkeeper
b2ce1419cf
Don't crash when syncing material that has no colour code
Use the colour code for Generic PLA then.
2020-06-03 17:48:28 +02:00
Nino van Hooff
80a5b53aad Store the printer cluster size as a metadata entry on the machine
This makes the cluster size also available when the machine is offline.
Also fixes an issue where the cluster size is improperly restored
once the internet connection comes back online, resulting in the printer
showing as a single printer until next sync

CURA-7347
2020-06-03 13:59:51 +02:00
Kostas Karmas
be9aec624a Use the um_cloud_cluster_id metadata when removing the cloud printer
CURA-7457
2020-06-03 11:13:21 +02:00
Kostas Karmas
d0534c0476 Update _remote_clusters dict when cloud printer is removed from Cura
CURA-7457
2020-06-02 15:23:35 +02:00
Nino van Hooff
ba705176fe Remove extraneous logging 2020-06-02 14:13:04 +02:00
Jaime van Kessel
f1d3c2272e
Merge branch 'CURA-7458_Add_offline_cloud_printers_in_Cura' of github.com:Ultimaker/Cura 2020-06-02 10:55:21 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
1e33360c35 Fix merge mistake in ToolPathUploader 2020-05-29 14:12:47 +02:00
Kostas Karmas
5aff6218d5 Add the offline cloud printers in Cura when they are discovered
CURA-7458
2020-05-29 14:02:36 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status
CURA-7437_no_internet_cloud_status
2020-05-28 10:02:15 +02:00
Nino van Hooff
ca333b4e8a Revert commented lines
CURA-7437
2020-05-26 16:45:17 +02:00
Jaime van Kessel
280d3f07a6
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura 2020-05-26 11:52:14 +02:00
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon
CURA-7437
2020-05-20 17:20:40 +02:00
Kostas Karmas
b5e971f9ec Update remove cloud printer pop-up message
CURA-7436
2020-05-20 15:21:57 +02:00
Nino van Hooff
e7af27ff80
Add type hint to plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-05-19 14:14:59 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager
CURA-7436
2020-05-18 16:22:55 +02:00
Jaime van Kessel
8f22e62675
Fix typing issues
CURA-7290
2020-05-18 13:47:03 +02:00
Nino van Hooff
5eb5ffd916 Convert doxygen to rst for UM3NetworkPrinting 2020-05-15 15:05:38 +02:00
Nino van Hooff
9acf8b6122 Revert "Add a sync timeout to CloudOutputDeviceManager"
Stopgap solution is not necessary anymore after CloudOutputDeviceManager
after implementing timeouts on the http-level.

This reverts commit 15f813a4
2020-05-15 11:32:49 +02:00
Nino van Hooff
f3c66c3189 Refactor CloudApiClient (and ToolpathUploader) to use HttpRequestManager
Has the benefit of a more unified Http request management + timeouts

CURA-7290
2020-05-15 11:28:17 +02:00
Nino van Hooff
15f813a4ff Add a sync timeout to CloudOutputDeviceManager
Fixes an issue where printer syncing breaks when switching networks etc.

CURA-7290
2020-05-14 15:47:45 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
# Conflicts:
#	cura/API/Account.py
2020-05-12 14:59:01 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML
Provides a single source of truth

CURA-7290
2020-05-08 11:09:48 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
2020-05-06 16:03:37 +02:00
Nino van Hooff
bfae7e9fb1 Replace some hard-coded sync states
CURA-7290
2020-05-06 12:54:07 +02:00