From d8b950387e97b4bb5d4616f4b56504aad1541be0 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Tue, 24 Dec 2024 14:36:45 +0100 Subject: [PATCH] fix(device_icon): remove jpg provider --- src/components/device-image/index.tsx | 3 --- src/components/settings-page/image-localiser.tsx | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/device-image/index.tsx b/src/components/device-image/index.tsx index 5e6f4ba49..b0fd05748 100644 --- a/src/components/device-image/index.tsx +++ b/src/components/device-image/index.tsx @@ -6,15 +6,12 @@ type ImageGeneratorFn = (device: Device) => string | undefined; const z2mBasePath = 'https://www.zigbee2mqtt.io/images/devices/'; export const getZ2mDeviceImage = (device: Device): string => - `${z2mBasePath}${sanitizeZ2MDeviceName(device?.definition?.model)}.jpg`; -export const getZ2mDeviceImagePng = (device: Device): string => `${z2mBasePath}${sanitizeZ2MDeviceName(device?.definition?.model)}.png`; const getConverterDeviceImage = (device: Device): string | undefined => device.definition?.icon; /* prettier-ignore */ export const AVAILABLE_GENERATORS: ImageGeneratorFn[] = [ getConverterDeviceImage, - getZ2mDeviceImagePng, getZ2mDeviceImage, () => genericDevice, ]; diff --git a/src/components/settings-page/image-localiser.tsx b/src/components/settings-page/image-localiser.tsx index 75692d76d..6080b0ac1 100644 --- a/src/components/settings-page/image-localiser.tsx +++ b/src/components/settings-page/image-localiser.tsx @@ -5,7 +5,7 @@ import Button from '../button'; import { Device, IEEEEAddress } from '../../types'; import { WithDevices } from '../../store'; import { DeviceApi } from '../../actions/DeviceApi'; -import { getZ2mDeviceImage, getZ2mDeviceImagePng } from '../device-image'; +import { getZ2mDeviceImage } from '../device-image'; type LocaliserState = 'none' | 'start' | 'inprogress' | 'done'; @@ -52,7 +52,7 @@ function ImageLocaliser(props: Props): JSX.Element { setLocalisationStatus((curr) => { return { ...curr, [device.ieee_address]: 'init' }; }); - const success = await asyncSome([getZ2mDeviceImagePng, getZ2mDeviceImage], async (generator) => { + const success = await asyncSome([getZ2mDeviceImage], async (generator) => { const imageUrl = generator(device); const imageContent = await downloadImage(imageUrl); await setDeviceOptions(device.ieee_address, { icon: imageContent });