GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 06:45:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into CURA-10415_main_based_update_tree

Browse Source
This commit is contained in:
Jelle Spijker 2023-04-18 10:36:56 +02:00
commit 5002d3695c
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/PostProcessingPlugin/PostProcessingPlugin.py
View File

@ -139,22 +139,28 @@ class PostProcessingPlugin(QObject, Extension):
if self._loaded_scripts: # Already loaded. if self._loaded_scripts: # Already loaded.
return return
# The PostProcessingPlugin path is for built-in scripts. # Make sure a "scripts" folder exists in the main configuration folder and the preferences folder.
# The Resources path is where the user should store custom scripts. # On some platforms the resources and preferences folders resolve to the same folder,
# The Preferences path is legacy, where the user may previously have stored scripts. # but on Linux they can be different.
resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)] for path in set([os.path.join(Resources.getStoragePath(r), "scripts") for r in [Resources.Resources, Resources.Preferences]]):
resource_folders.extend(Resources.getAllPathsForType(Resources.Resources))
for root in resource_folders:
if root is None:
continue
path = os.path.join(root, "scripts")
if not os.path.isdir(path): if not os.path.isdir(path):
try: try:
os.makedirs(path) os.makedirs(path)
except OSError: except OSError:
Logger.log("w", "Unable to create a folder for scripts: " + path) Logger.log("w", "Unable to create a folder for scripts: " + path)
continue
# The PostProcessingPlugin path is for built-in scripts.
# The Resources path is where the user should store custom scripts.
# The Preferences path is legacy, where the user may previously have stored scripts.
resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)]
resource_folders.extend(Resources.getAllPathsForType(Resources.Resources))
for root in resource_folders:
if root is None:
continue
path = os.path.join(root, "scripts")
if not os.path.isdir(path):
continue
self.loadScripts(path) self.loadScripts(path)
def loadScripts(self, path: str) -> None: def loadScripts(self, path: str) -> None:

6
resources/definitions/ultimaker_s3.def.json
View File

@ -9,7 +9,11 @@
"manufacturer": "Ultimaker B.V.", "manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-ufp;text/x-gcode", "file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s3_platform.obj", "platform": "ultimaker_s3_platform.obj",
"bom_numbers": [213482, 213483], "bom_numbers": [
213482,
213483,
213484
],
"exclude_materials": [ "exclude_materials": [
"generic_hips", "generic_hips",
"generic_petg", "generic_petg",

3
resources/definitions/ultimaker_s5.def.json
View File

@ -12,7 +12,8 @@
"bom_numbers": [ "bom_numbers": [
9051, 9051,
214475, 214475,
214476 214476,
214477
], ],
"firmware_update_info": "firmware_update_info":
{ {

6
resources/definitions/ultimaker_s7.def.json
View File

@ -9,12 +9,10 @@
"manufacturer": "Ultimaker B.V.", "manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-ufp;text/x-gcode", "file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s7_platform.obj", "platform": "ultimaker_s7_platform.obj",
"bom_numbers": [ "bom_numbers": [5078167, 5078168],
5078167
],
"firmware_update_info": "firmware_update_info":
{ {
"check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], "check_urls": [ "https://software.ultimaker.com/releases/firmware/5078167/stable/um-update.swu.version" ],
"id": 5078167, "id": 5078167,
"update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update"
}, },