fix: Don't make edid mandatory if monitor SERIAL & CAPTION are still found

This fixes monitors inventory on Apple M1.
This indeed enhances #430 fix

Author: g-bougard

Changes

@@ -25,6 +25,8 @@ inventory:
 * fix #630: Enhanced support for linux on Raspberry Pi 3
 * Fix ioreg command output parsing on MacOSX to avoid Deep Recursion perl warning
 * Fix software publisher analysis in software inventory on MacOSX
+* Enhance #430 fix: Don't make edid mandatory if monitor SERIAL & CAPTION are still
+  found. This fixes monitors inventory on Apple M1.
 
 remoteinventory:
 * Limit the number of attempts and reported errors when libssh2 fails but ssh command

lib/GLPI/Agent/Task/Inventory/Generic/Screen.pm

@@ -330,33 +330,36 @@ sub _getScreens {
 
     my %screens = ();
 
-    my @screens =
-        OSNAME eq 'MSWin32' ?  _getScreensFromWindows(%params) :
-        OSNAME eq 'darwin' ?   _getScreensFromMacOS(%params) :
+    # $params{screens} can only be set during tests
+    my @screens = $params{screens} ? @{$params{screens}} :
+        OSNAME eq 'MSWin32' ?   _getScreensFromWindows(%params) :
+        OSNAME eq 'darwin' ?    _getScreensFromMacOS(%params) :
                                 _getScreensFromUnix(%params);
 
     foreach my $screen (@screens) {
-        next unless $screen->{edid};
+        next unless $screen->{edid} || ($screen->{SERIAL} && $screen->{CAPTION});
 
-        my $info = _getEdidInfo(
-            edid    => $screen->{edid},
-            logger  => $params{logger},
-            datadir => $params{datadir},
-        );
-        if ($info) {
-            $screen->{CAPTION}      = $info->{CAPTION};
-            $screen->{DESCRIPTION}  = $info->{DESCRIPTION};
-            $screen->{MANUFACTURER} = $info->{MANUFACTURER};
-            $screen->{SERIAL}       = $info->{SERIAL};
-            $screen->{ALTSERIAL}    = $info->{ALTSERIAL} if $info->{ALTSERIAL};
-        }
+        if ($screen->{edid}) {
+            my $info = _getEdidInfo(
+                edid    => $screen->{edid},
+                logger  => $params{logger},
+                datadir => $params{datadir},
+            );
+            if ($info) {
+                $screen->{CAPTION}      = $info->{CAPTION};
+                $screen->{DESCRIPTION}  = $info->{DESCRIPTION};
+                $screen->{MANUFACTURER} = $info->{MANUFACTURER};
+                $screen->{SERIAL}       = $info->{SERIAL};
+                $screen->{ALTSERIAL}    = $info->{ALTSERIAL} if $info->{ALTSERIAL};
+            }
 
-        $screen->{BASE64} = encode_base64($screen->{edid});
+            $screen->{BASE64} = encode_base64($screen->{edid});
 
-        delete $screen->{edid};
+            delete $screen->{edid};
+        }
 
         # Add or merge found values
-        my $serial = $info->{SERIAL} || $screen->{BASE64};
+        my $serial = $screen->{SERIAL} || $screen->{BASE64};
         if (!exists($screens{$serial})) {
             $screens{$serial} = $screen ;
         } else {