diff --git a/data/easyprint/brand.json b/data/easyprint/brand.json index 9e9b9a9fd8..2314eb2f95 100644 --- a/data/easyprint/brand.json +++ b/data/easyprint/brand.json @@ -3,5 +3,6 @@ "name": "EasyPrint", "website": "https://primacreator.com/", "logo": "logo.png", - "origin": "SW" + "origin": "SW", + "manufacturer": "primacreator" } diff --git a/data/fiberon/brand.json b/data/fiberon/brand.json index 3707e6f647..d5df75ca50 100644 --- a/data/fiberon/brand.json +++ b/data/fiberon/brand.json @@ -3,5 +3,6 @@ "name": "Fiberon", "website": "https://fiberon.polymaker.com/", "logo": "logo.svg", - "origin": "CN" + "origin": "CN", + "manufacturer": "polymaker" } diff --git a/data/jessie/brand.json b/data/jessie/brand.json index 15adb13a3c..b9034f0ec2 100644 --- a/data/jessie/brand.json +++ b/data/jessie/brand.json @@ -3,5 +3,6 @@ "name": "Jessie", "website": "https://www.printedsolid.com/", "logo": "logo.png", - "origin": "US" + "origin": "US", + "manufacturer": "printedsolid" } \ No newline at end of file diff --git a/data/panchroma/brand.json b/data/panchroma/brand.json index 1da1ff42d9..118e0d0201 100644 --- a/data/panchroma/brand.json +++ b/data/panchroma/brand.json @@ -3,5 +3,5 @@ "name": "Panchroma", "website": "https://polymaker.com/panchroma/", "logo": "logo.png", - "origin": "CN" -} + "origin": "CN", + "manufacturer": "polymaker" diff --git a/data/polyflex/brand.json b/data/polyflex/brand.json index 88541eee49..f6ff6f03d6 100644 --- a/data/polyflex/brand.json +++ b/data/polyflex/brand.json @@ -3,5 +3,6 @@ "name": "PolyFlex", "website": "https://polymaker.com/", "logo": "logo.svg", - "origin": "CN" + "origin": "CN", + "manufacturer": "polymaker" } diff --git a/data/polylite/brand.json b/data/polylite/brand.json index f31bdfcb4a..1be41632c2 100644 --- a/data/polylite/brand.json +++ b/data/polylite/brand.json @@ -3,5 +3,6 @@ "name": "PolyLite", "website": "https://polymaker.com/", "logo": "logo.svg", - "origin": "CN" + "origin": "CN", + "manufacturer": "polymaker" } diff --git a/data/polymax/brand.json b/data/polymax/brand.json index 090acacfe9..04424578fd 100644 --- a/data/polymax/brand.json +++ b/data/polymax/brand.json @@ -3,5 +3,6 @@ "name": "PolyMax", "website": "https://polymaker.com/", "logo": "logo.svg", - "origin": "CN" + "origin": "CN", + "manufacturer": "polymaker" } diff --git a/data/polymide/brand.json b/data/polymide/brand.json index 964595a231..7b38d69f18 100644 --- a/data/polymide/brand.json +++ b/data/polymide/brand.json @@ -3,5 +3,6 @@ "name": "PolyMide", "website": "https://polymaker.com/", "logo": "logo.svg", - "origin": "CN" + "origin": "CN", + "manufacturer": "polymaker" } diff --git a/data/polysonic/brand.json b/data/polysonic/brand.json index 3627c90f91..b97f3c24e8 100644 --- a/data/polysonic/brand.json +++ b/data/polysonic/brand.json @@ -3,5 +3,6 @@ "name": "PolySonic", "website": "https://polymaker.com/", "logo": "logo.svg", - "origin": "CN" + "origin": "CN", + "manufacturer": "polymaker" } diff --git a/data/primaselect/brand.json b/data/primaselect/brand.json index 7ece7cf4c2..245cd78583 100644 --- a/data/primaselect/brand.json +++ b/data/primaselect/brand.json @@ -3,5 +3,6 @@ "name": "PrimaSelect", "website": "https://primacreator.com/", "logo": "logo.png", - "origin": "SW" + "origin": "SW", + "manufacturer": "primacreator" } diff --git a/data/primavalue/brand.json b/data/primavalue/brand.json index 728dc94ac7..58392ad67a 100644 --- a/data/primavalue/brand.json +++ b/data/primavalue/brand.json @@ -3,5 +3,6 @@ "name": "PrimaValue", "website": "https://primacreator.com/", "logo": "logo.png", - "origin": "SW" + "origin": "SW", + "manufacturer": "primacreator" } diff --git a/data/professional_lab/brand.json b/data/professional_lab/brand.json index 1e3034cec9..6a3d73266b 100644 --- a/data/professional_lab/brand.json +++ b/data/professional_lab/brand.json @@ -3,5 +3,6 @@ "name": "Professional LAB", "website": "https://print-imagine.com/", "logo": "logo.png", - "origin": "PL" + "origin": "PL", + "manufacturer": "smartprint" } \ No newline at end of file diff --git a/data/the_filament/brand.json b/data/the_filament/brand.json index b8e31743e9..004c27c14a 100644 --- a/data/the_filament/brand.json +++ b/data/the_filament/brand.json @@ -3,5 +3,6 @@ "name": "The Filament", "website": "https://spectrumfilaments.com/en/brand/the-filament-en/", "logo": "logo.png", - "origin": "PL" + "origin": "PL", + "manufacturer": "spectrum" } diff --git a/ofd.sh b/ofd.sh old mode 100644 new mode 100755 diff --git a/schemas/brand_schema.json b/schemas/brand_schema.json index 6d216643bb..bed5ed6394 100644 --- a/schemas/brand_schema.json +++ b/schemas/brand_schema.json @@ -10,7 +10,8 @@ }, "id": { "maxLength": 1000, - "pattern": "^[a-z0-9+]+(_[a-z0-9+]+)*$" + "pattern": "^[a-z0-9+]+(_[a-z0-9+]+)*$", + "type": "string" }, "logo": { "pattern": "^logo\\.(png|jpg|svg)$" @@ -46,6 +47,11 @@ "type": "string", "description": "The source of the data, like another DB or company", "$ref": "#/definitions/string_limit" + }, + "manufacturer": { + "type": "string", + "description": "The brand id of the parent manufacturer, for product lines sold under a different name", + "$ref": "#/definitions/id" } }, "required": [