From f99c8dfde5e67ee86e2a337543ac83eb6ec97c61 Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Fri, 21 Jan 2022 14:57:31 +0000
Subject: [PATCH] 30_HUEBridge.pm: ignore recyclable groups in autocreate,
 better display ignored groups and sensors in get groups/sensors

git-svn-id: https://svn.fhem.de/fhem/trunk@25535 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/30_HUEBridge.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fhem/FHEM/30_HUEBridge.pm b/fhem/FHEM/30_HUEBridge.pm
index cd6ef2610..ae2321601 100644
--- a/fhem/FHEM/30_HUEBridge.pm
+++ b/fhem/FHEM/30_HUEBridge.pm
@@ -1288,12 +1288,12 @@ HUEBridge_Get($@)
       my $code = $name ."-G". $key;
       my $fhem_name = '';
          $fhem_name = $modules{HUEDevice}{defptr}{$code}->{NAME} if( defined($modules{HUEDevice}{defptr}{$code}) );
+         $fhem_name = ' (ignored)' if( !$fhem_name && $hash->{helper}{ignored}{$code} );
       $fhem_name = "" if( !$fhem_name );
       $result->{$key}{type} = '' if( !defined($result->{$key}{type}) );     #deCONZ fix
       $result->{$key}{class} = '' if( !defined($result->{$key}{class}) );   #deCONZ fix
       $result->{$key}{lights} = [] if( !defined($result->{$key}{lights}) ); #deCONZ fix
       $ret .= sprintf( "%2i: %-15s %-15s %-15s %-15s", $key, $result->{$key}{name}, $fhem_name, $result->{$key}{type}, $result->{$key}{class} );
-      $ret .= ' (ignored)' if( $hash->{helper}{ignored}{$code} );
       if( !$arg && $hash->{helper}{lights} ) {
         $ret .= sprintf( " %s\n", join( ",", map { my $l = $hash->{helper}{lights}{$_}{name}; $l?$l:$_;} @{$result->{$key}{lights}} ) );
       } else {
@@ -1391,9 +1391,9 @@ HUEBridge_Get($@)
       my $code = $name ."-S". $key;
       my $fhem_name = '';
          $fhem_name = $modules{HUEDevice}{defptr}{$code}->{NAME} if( defined($modules{HUEDevice}{defptr}{$code}) );
+         $fhem_name = ' (ignored)' if( !$fhem_name && $hash->{helper}{ignored}{$code} );
       $fhem_name = "" if( !$fhem_name );
       $ret .= sprintf( "%2i: %-20s %-15s %-20s", $key, $result->{$key}{name}, $fhem_name, $result->{$key}{type} );
-      $ret .= ' (ignored)' if( $hash->{helper}{ignored}{$code} );
       $ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{state}) ) if( $arg && $arg eq 'detail' );
       $ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{config}) ) if( $arg && $arg eq 'detail' );
       $ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{capabilities}) ) if( $arg && $arg eq 'detail' );
@@ -1841,7 +1841,8 @@ HUEBridge_Autocreate($;$$)
       next;
     }
 
-    if( $result->{$id}{type} eq 'Entertainment' ) {
+    if( $result->{$id}{recycle}
+        || $result->{$id}{type} eq 'Entertainment' ) {
       Log3 $name, 4, "$name: ignoring group $id ($result->{$id}{name}) of type $result->{$id}{type} in autocreate";
       $ignored[1]++;
       $hash->{helper}{ignored}{$code} = 1;