Commit graph

6045 commits

Author SHA1 Message Date
Ghostkeeper
a1438e91d0
Merge branch '4.5'
Conflicts:
	cura_app.py -> Due to moving some imports around.
2020-02-25 12:07:47 +01:00
Tim Kuipers
70a95e68d6
Merge pull request #7122 from Ultimaker/CURA-7223/remove_crashHandler
CURA-7223/Removed the user input from the CrashHandler as we are not using it f…
2020-02-24 22:22:37 +01:00
Jaime van Kessel
9c0e6f9338
Apply suggestions from code review
Codestyle!
2020-02-24 16:57:37 +01:00
Nino van Hooff
94e9753b6c Update cura/CrashHandler.py
Import Any and re-order if-statements for efficiency

CURA-7245
2020-02-24 16:26:32 +01:00
Nino van Hooff
2cd6149ef0
Update cura/CrashHandler.py
Add typing to pruneSensitiveData

Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2020-02-24 16:14:12 +01:00
Nino van Hooff
62dfadecdf Prune all sensitive data before sending it to Sentry
CURA-7245
2020-02-24 15:27:17 +01:00
Jaime van Kessel
238dd733ea
Merge branch '4.5' of github.com:Ultimaker/Cura 2020-02-17 17:01:38 +01:00
Ghostkeeper
e52dc56a64
Prevent crashing on PermissionError when importing http.server (#7095)
* Fix PermissionError when importing http.server

Instead of crashing, now it'll just not start the server. This means that you won't be able to receive the response from the log-in so you won't be able to log in. The browser gives an error that it can't find the page on localhost. But at least it doesn't crash.

Fixes crash CURA-3Q.

* Log an error when the HTTP server can't be started

Contributes to crash CURA-3Q.

* Indicate that types are optional

Attempt to fix the typing issue with MyPy. I can't run this locally so the CI server will have to tell me if this fixed it.

Contributes to Sentry issue CURA-3Q.
2020-02-17 17:01:11 +01:00
Dimitriovski
a4a076ea5c
Removed the user input from the CrashHandler as we are not using it for sending that data to Sentry
CURA-7223
2020-02-17 12:02:52 +01:00
Jaime van Kessel
769fc8fd37
Fix crashing when material could not be found
See CURA-3M in sentry. It most commonly happens with the anycubic,
since it had some weird stuff with it suddenly supporting materials.

This change will make it so that no crash happens. Old profiles will still have
an empty material. This isn't really an issue, since the interface will mark this
as an error (prompting users to switch).
2020-02-17 10:57:24 +01:00
Ghostkeeper
d9ddb438f8
Merge branch '4.5' 2020-02-10 11:36:07 +01:00
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
2020-02-10 10:45:07 +01:00
Lipu Fei
b03f666bf5 WIP: Make it work with Python 3.7 packaing 2020-02-07 23:14:47 +01:00
Jaime van Kessel
9e94875733
Merge branch 'feature_value_from_container_function' of https://github.com/fieldOfView/Cura 2020-02-04 16:47:45 +01:00
Jaime van Kessel
0520f9a4bc
Ensure that setActiveExtruderCount correctly emits the extruderEnablechanged signal 2020-02-04 16:46:35 +01:00
konskarm
35903e7dd3
Merge pull request #6988 from Ultimaker/CURA-7071
CURA-7071/Added option to redirect to Web MP from Cura MP
2020-02-04 11:02:30 +01:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Jaime van Kessel
5e70d2c122
Merge branch 'WH_unzip_backups_security' of github.com:Ultimaker/Cura 2020-01-31 16:32:53 +01:00
Remco Burema
a03a2885b6
Check if main config file is in backup zip.
Prevent unpacking of possibly spoofed backups (as a last line of defence if other security has failed).
Zips with partially known content are a lot harder to spoof.
Thanks WhiteHats :-)
2020-01-31 16:26:30 +01:00
Jaime van Kessel
c167481e60
Add missing ignore 2020-01-31 16:24:46 +01:00
Jaime van Kessel
1269de744f
Use state in AuthorizationService
It's a paranoid safety precaution, but beter safe than sorry.
Reported by WhiteHats; F-1.1.1
2020-01-31 16:11:59 +01:00
Jaime van Kessel
ca25ec3dbc
Increase size of the verificationCode
It's mostly a theoretical problem, but 16 could theoretically be brute
forced. Bumping it up to 32 won't break anything, but it does make it
exteremely unlikely that it gets broken
2020-01-31 15:00:03 +01:00
fieldOfView
5f67331bac Fix "typo" caused by cleanup before push 2020-01-30 18:23:25 +01:00
Jaime van Kessel
e79b3beed1
Remove unused URL
CURA-7071
2020-01-30 09:42:23 +01:00
Nino van Hooff
8c250cfbbc Process review comments
CURA-7099
2020-01-29 11:28:29 +01:00
fieldOfView
5a4661db98 Add valueFromContainer() and extruderValueFromContainer() functions 2020-01-28 16:36:06 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
2020-01-28 13:08:57 +01:00
Ghostkeeper
ad2b8f140e
Make Marketplace link configurable from the build system
This way you could set it to marketplace-staging if you like.

Contributes to issue CURA-7071.
2020-01-28 11:52:46 +01:00
Jaime van Kessel
9a9e715e2f
Merge branch 'CURA-6914_Reset_print_sequence_when_reactivating_2nd_extruder' of github.com:Ultimaker/Cura 2020-01-28 09:36:29 +01:00
Ghostkeeper
305bce5a78
Enforce Cura API to be a singleton
If it's not used that way we want to know about it and fail.

If plug-ins use it this way, the plug-in won't get initialised so it'll be as if the plug-in is disabled or that function doesn't work.

Contributes to issue CURA-7135.
2020-01-27 16:28:26 +01:00
Kostas Karmas
9266c753c3 Reset print_sequence when reactivating extruder 2
The setting print_sequence was not being resetted to all at once
whenever the 2nd extruder was reactivated.
This commit fixes that by explicitly resetting print_sequence
when reenabling an extruder, if it has been changed by the user.

CURA-6914
2020-01-24 17:12:00 +01:00
Ghostkeeper
0e5654e44b
Guard against selection pass not existing yet
It could happen that the selection pass is not initialised because you're right clicking on the screen before the first render has happened.

Hopefully this fixes #6976.
2020-01-17 13:09:19 +01:00
Dimitriovski
51ec8a539f
Added a 'Marketplace' icon in the header of the Toolbox
CURA-7071
2020-01-16 16:30:11 +01:00
Ghostkeeper
d18c0703b4
Fix getting correct initial extruder number
As found in the discussion in #6847.

This was done as a 5 minute fix.
2020-01-16 13:59:02 +01:00
Ghostkeeper
6953c560af
Merge branch 'fix__init__typing' of https://github.com/fieldOfView/Cura into fieldOfView-fix__init__typing 2020-01-15 14:36:40 +01:00
Jaime van Kessel
f9433dba87
Merge branch 'master' of github.com:Ultimaker/Cura 2020-01-15 11:29:42 +01:00
Jaime van Kessel
290761fccd
Fix arranger crash 2020-01-15 11:29:27 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Kostas Karmas
d5cfca4df0 Fix loading machine specific materials
The container registry was incorrectly being searched with a
variant_name == None, which always returned an empty printer-specific
materials list. As a result, the generic material settings were always
being loaded if there was no variant specifically indicated inside
the fdm_material file. The printer specific values were consistently
being ignored.

This commit fixes that by removing the search with a variant_name==None
which correctly returns the printer-specific materials list while
loading the materials from the variant nodes.

CURA-7087
2020-01-13 13:44:51 +01:00
Kostas Karmas
601a765f73 Fix typo in comment 2020-01-13 13:44:36 +01:00
Jaime van Kessel
2a28321588
Fix some more typing
For some reaso the server is giving me different reuslts...
2020-01-10 18:03:20 +01:00
Jaime van Kessel
eaf8b3491e
Fix typing issue 2020-01-10 17:49:47 +01:00
Jaime van Kessel
e74f049142
Fix bunch of issues found by pylint 2020-01-10 16:37:46 +01:00
Jaime van Kessel
bb52ba6848
Codestyle fixes 2020-01-10 15:32:53 +01:00
Jaime van Kessel
49211d3233
remove unused import 2020-01-10 15:22:32 +01:00
Jaime van Kessel
81b33b8649
Add some missing typing 2020-01-10 14:58:53 +01:00
Lipu Fei
045f4c51fa Fix BaseMaterialsModel's QTimer lifecycle 2020-01-07 11:37:37 +01:00
Jaime van Kessel
5083a46c04
Merge branch 'master-sentry_sdk-try-except' of https://github.com/thopiekar/Cura 2020-01-06 15:10:06 +01:00
Jaime van Kessel
e46febfea4
Switch out number of getActiveExtruderStacks for extruderList
It's essentially the same, but reduces the dependency of MachineManager
on the ExtruderManager
2020-01-06 14:47:46 +01:00
Jaime van Kessel
55dacee45f
Simplify the numUserSettings count 2020-01-06 14:38:39 +01:00