feature: enhanced software inventory for Arch Linux

po1vo · Sep 13, 2018 · 01edbef · 01edbef
1 parent 462c259
commit 01edbef
Showing 1 changed file with 59 additions and 11 deletions.
diff --git a/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Pacman.pm b/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Pacman.pm
@@ -17,26 +17,74 @@ sub doInventory {
     my $inventory = $params{inventory};
     my $logger    = $params{logger};
 
-    my $handle = getFileHandle(
+    my $packages = _getPackagesList(
         logger  => $logger,
-        command => 'pacman -Q'
+        command => 'pacman -Qqi'
     );
+    return unless $packages;
+
+    foreach my $package (@$packages) {
+        $inventory->addEntry(
+            section => 'SOFTWARES',
+            entry   => $package
+        );
+    }
+}
+
+sub _getPackagesList {
+    my $handle = getFileHandle(@_);
     return unless $handle;
 
+    my @packages;
+    my $package;
+    my $index = 1;
+    my %months = map { $_ => $index ++ } qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
     while (my $line = <$handle>) {
-        next unless $line =~ /^(\S+)\s+(\S+)/;
-        my $name = $1;
-        my $version = $2;
+        chomp $line;
+        next unless $line;
+        next unless $line =~ /^(\S[^:]*):\s*(.*)$/;
 
-       $inventory->addEntry(
-            section => 'SOFTWARES',
-            entry   => {
-                NAME    => $name,
-                VERSION => $version
+        my $key   = $1;
+        my $value = $2;
+        $key =~ s/\s+$//;
+
+        if ($key eq 'Name') {
+            push @packages, $package
+                if $package;
+            $package = {
+                NAME => $value
+            };
+        } elsif ($key eq 'Version' && $value) {
+            $value =~ s/^\d+://;
+            $package->{VERSION} = $value;
+        } elsif ($key eq 'Description' && $value) {
+            $package->{COMMENTS} = $value;
+        } elsif ($key eq 'Architecture' && $value) {
+            $package->{ARCH} = $value;
+        } elsif ($key eq 'Install Date' && $value) {
+            my ($month, $day, $year) = $value =~ /^\w+\s+(\w+)\s+(\d+)\s+[\d:]+\s+(\d+)$/;
+            next unless $month && $months{$month};
+            $package->{INSTALLDATE} = sprintf("%d/%02d/%d", $day, $months{$month}, $year);
+        } elsif ($key eq 'Installed Size' && $value) {
+            if ($value =~ /^([\d.]+)\s+(\w+)$/) {
+                my $size =  $2 eq 'KiB' ? $1 * 1024 :
+                            $2 eq 'MiB' ? $1 * 1048576 :
+                            $2 eq 'GiB' ? $1 * 1073741824 :
+                            $1;
+                $package->{FILESIZE} = int($size);
             }
-        );
+        } elsif ($key eq 'Groups' && $value && $value ne 'None') {
+            $package->{SYSTEM_CATEGORY} = join(',', split(/\s+/,$value));
+        }
     }
     close $handle;
+
+    # Add last software
+    push @packages, $package
+        if $package;
+
+    return \@packages;
 }
 
 1;