From 538937ab843a0adb83c072d98302085c5d15e635 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 23 Dec 2018 15:56:38 +0000 Subject: [PATCH] 10_MQTT2_DEVICE.pm: Better devices parsing for graphvis (Forum #91394) git-svn-id: https://svn.fhem.de/fhem/trunk@18039 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_MQTT2_DEVICE.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm index e4b76cd0f..2d9a309c8 100644 --- a/fhem/FHEM/10_MQTT2_DEVICE.pm +++ b/fhem/FHEM/10_MQTT2_DEVICE.pm @@ -511,12 +511,11 @@ MQTT2_DEVICE_nlData($) # Needed for the image links my $dv = ReadingsVal($d, ".devices", ReadingsVal($d, "devices", "")); - for my $l (split(/[\r\n]/, $dv)) { - next if($l !~ m/ieeeAddr":"([^"]+)".*model":"([^"]+)"/); - my $img = $2; - $img =~ s,[/: ],-,g; # Forum #91394, supported-devices.js - $img{$1} = "$pref$img.jpg"; - } + $dv =~ s@ieeeAddr":"([^"]+)"[^}]+model":"([^"]+)"@ + my $img = $2; + $img =~ s+[/: ]+-+g; # Forum #91394: supported-devices.js + $img{$1} = "$pref$img.jpg"; + @xeg; # Name translation for my $n (devspec2array("TYPE=MQTT2_DEVICE")) {