From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robin Roevens <robin.roevens@disroot.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 10/10] pakfire: Replace getmetadata duplicate code
Date: Thu, 28 Jul 2022 13:21:36 +0200
Message-ID: <20220728112136.30218-11-robin.roevens@disroot.org>
In-Reply-To: <20220728112136.30218-1-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9119008144425445588=="
List-Id: <development.lists.ipfire.org>

--===============9119008144425445588==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Use getmetadata function in services.cgi to determine installed
  addon services to display. Removing code duplication and intel that
  should only be known by pakfire itself.
- Removed hardcoded exclusions:
  - squid should show up correctly using the new metadata info
  - mdadm is part of core and will never show up here
  - alsa, unknown if this problem still exists, but if it is, this
    should be handled somewhere else.

Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
 html/cgi-bin/services.cgi | 74 ++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index a1dcfd57e..29926ecc3 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -29,6 +29,7 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "${General::swroot}/graphs.pl";
+require "/opt/pakfire/lib/functions.pl";
=20
 my %color =3D ();
 my %mainsettings =3D ();
@@ -160,51 +161,44 @@ END
=20
 	my $lines=3D0; # Used to count the outputlines to make different bgcolor
=20
-	# Generate list of installed addon pak's
-	opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pakf=
ire/db/installed/: $!";
-	my @pak =3D sort readdir DIR;
-	closedir(DIR);
-
-	foreach (@pak){
-		chomp($_);
-		next unless (m/^meta-/);
-		s/^meta-//;
-
-		# Check which of the paks are services
-		if (-e "/etc/init.d/$_") {
-			# blacklist some packages
-			#
-			# alsa has trouble with the volume saving and was not really stopped
-			# mdadm should not stopped with webif because this could crash the system
-			#
-			if ( $_ eq 'squid' ) {
-				next;
-			}
-			if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
-				$lines++;
-				if ($lines % 2){
-					print "<tr>";
-					$col=3D"bgcolor=3D'$color{'color22'}'";
-				}else{
-					print "<tr>";
-					$col=3D"bgcolor=3D'$color{'color20'}'";
-				}
+	my @paks;
+	my @addon_services;
+
+	# Generate list of installed addon pak services
+	my %paklist =3D &Pakfire::dblist("installed");
=20
-				print "<td align=3D'left' $col width=3D'31%'>$_</td> ";
-				my $status =3D isautorun($_,$col);
-				print "$status ";
-				print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?$_=
!start'><img alt=3D'$Lang::tr{'start'}' title=3D'$Lang::tr{'start'}' src=3D'/=
images/go-up.png' border=3D'0' /></a></td>";
-				print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?$_=
!stop'><img alt=3D'$Lang::tr{'stop'}' title=3D'$Lang::tr{'stop'}' src=3D'/ima=
ges/go-down.png' border=3D'0' /></a></td> ";
-				my $status =3D &isrunningaddon($_,$col);
-		 		$status =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
-
-				chomp($status);
-				print "$status";
-				print "</tr>";
+	foreach my $pak (keys %paklist) {
+		my %metadata =3D &Pakfire::getmetadata($pak, "installed");
+		=09
+		if ("$metadata{'Services'}") {
+			foreach my $service (split(/ /, "$metadata{'Services'}")) {
+				push(@addon_services, $service);
 			}
 		}
 	}
=20
+	foreach (@addon_services) {
+		$lines++;
+		if ($lines % 2){
+			print "<tr>";
+			$col=3D"bgcolor=3D'$color{'color22'}'";
+		}else{
+			print "<tr>";
+			$col=3D"bgcolor=3D'$color{'color20'}'";
+		}
+		print "<td align=3D'left' $col width=3D'31%'>$_</td> ";
+		my $status =3D isautorun($_,$col);
+		print "$status ";
+		print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?$_!s=
tart'><img alt=3D'$Lang::tr{'start'}' title=3D'$Lang::tr{'start'}' src=3D'/im=
ages/go-up.png' border=3D'0' /></a></td>";
+		print "<td align=3D'center' $col width=3D'8%'><a href=3D'services.cgi?$_!s=
top'><img alt=3D'$Lang::tr{'stop'}' title=3D'$Lang::tr{'stop'}' src=3D'/image=
s/go-down.png' border=3D'0' /></a></td> ";
+		my $status =3D isrunningaddon($_,$col);
+		$status =3D~ s/\=1B\[[0-1]\;[0-9]+m//g;
+
+		chomp($status);
+		print "$status";
+		print "</tr>";
+	}
+
 	print "</table></div>\n";
 	&Header::closebox();
=20
--=20
2.36.1


--=20
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.


--===============9119008144425445588==--