github/zigbee-OTA
2
0
Fork 0
mirror of https://github.com/Koenkk/zigbee-OTA.git synced 2026-06-24 12:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow non Gledopto manuf name for images with Gledopto manuf code

Browse Source
This commit is contained in:
Koen Kanters
2025-11-12 21:02:54 +01:00
parent 7c08796604
commit 0adbe018df
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ghw_process_ota_files.ts
View File

@@ -149,7 +149,11 @@ export async function processOtaFiles(
const statusToBase = getParsedImageStatus(parsedImage, baseMatch); const statusToBase = getParsedImageStatus(parsedImage, baseMatch);
// Manufacturer specific checks // Manufacturer specific checks
if (parsedImage.manufacturerCode === GLEDOPTO_MANUFACTURER_CODE && !fileExtraMetas.modelId) { if (
parsedImage.manufacturerCode === GLEDOPTO_MANUFACTURER_CODE &&
!fileExtraMetas.modelId &&
(fileExtraMetas.manufacturerName == null || fileExtraMetas.manufacturerName.some((name) => name.toLowerCase().includes("gledopto")))
) {
// Gledopto uses the same imageType for every device, force modelId to be present. // Gledopto uses the same imageType for every device, force modelId to be present.
// https://github.com/Koenkk/zigbee-OTA/pull/864 // https://github.com/Koenkk/zigbee-OTA/pull/864
throw new Error("Gledopto image requires extra `modelId` metadata"); throw new Error("Gledopto image requires extra `modelId` metadata");

2
tests/ghw_check_ota_pr.test.ts
View File

@@ -634,6 +634,8 @@ Text after end tag`);
["", IMAGE_TUYA, "Tuya image requires extra `manufacturerName` metadata"], ["", IMAGE_TUYA, "Tuya image requires extra `manufacturerName` metadata"],
['"modelId": "GL-C-008"', IMAGE_GLEDOPTO, undefined], ['"modelId": "GL-C-008"', IMAGE_GLEDOPTO, undefined],
["", IMAGE_GLEDOPTO, "Gledopto image requires extra `modelId` metadata"], ["", IMAGE_GLEDOPTO, "Gledopto image requires extra `modelId` metadata"],
['"manufacturerName": ["GleDopto"]', IMAGE_GLEDOPTO, "Gledopto image requires extra `modelId` metadata"],
['"manufacturerName": ["OtherManuf"]', IMAGE_GLEDOPTO, undefined],
])("manufacturer specific checks", async (body: string, image: string, error: string | undefined) => { ])("manufacturer specific checks", async (body: string, image: string, error: string | undefined) => {
filePaths = [useImage(image)]; filePaths = [useImage(image)];
const newContext = withBody(`\`\`\`json const newContext = withBody(`\`\`\`json