From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 8/9] pakfire: Add getmetadata function Date: Wed, 09 Mar 2022 23:56:54 +0100 Message-ID: <20220309225655.4472-9-robin.roevens@disroot.org> In-Reply-To: <20220309225655.4472-1-robin.roevens@disroot.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3098036024031994528==" List-Id: --===============3098036024031994528== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Added new getmetadata function for easy access to all available metadata of a pak without knowledge about or need to parse pakfire internal db files. - Added new 'pakfire info' functionality for displaying all available metadata of (a) pak(s) to the user, using the new getmetadata. - 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. Signed-off-by: Robin Roevens --- html/cgi-bin/services.cgi | 81 ++++++++++++++++++------------------ src/pakfire/lib/functions.pl | 55 ++++++++++++++++++++++++ src/pakfire/pakfire | 58 ++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 40 deletions(-) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 237475735..896c95ec3 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,51 @@ 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 ""; - $col=3D"bgcolor=3D'$color{'color22'}'"; - }else{ - print ""; - $col=3D"bgcolor=3D'$color{'color20'}'"; - } + my @paks; + my @addon_services; =20 - print "$_ "; - my $status =3D isautorun($_,$col); - print "$status "; - print "3D'$Lang::tr{'start'}'"; - print "3D'$Lang::tr{'stop'}' "; - my $status =3D &isrunningaddon($_,$col); - $status =3D~ s/\=1B\[[0-1]\;[0-9]+m//g; - - chomp($status); - print "$status"; - print ""; + # Generate list of installed addon pak services + my %paklist =3D &Pakfire::dblist("installed"); + + 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 ""; + $col=3D"bgcolor=3D'$color{'color22'}'"; + }else{ + print ""; + $col=3D"bgcolor=3D'$color{'color20'}'"; + } + print "$_ "; + my $status =3D isautorun($_,$col); + print "$status "; + # Don't allow user to start/stop folowing services from webui: + # - alsa has trouble with the volume saving and was not really stopped + if ($_ eq "alsa") { + print ""; + print " "; + } else { + print "3D'$Lang::tr{'start'}'"; + print "3D'$Lang::tr{'stop'}' "; + } + my $status =3D isrunningaddon($_,$col); + $status =3D~ s/\=1B\[[0-1]\;[0-9]+m//g; + + chomp($status); + print "$status"; + print ""; + } + print "\n"; &Header::closebox(); =20 diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 028a0277e..6dda8d688 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -115,6 +115,7 @@ sub usage { &Pakfire::message(" - Contacts the servers for new = lists of paks."); &Pakfire::message(" - Installs the latest version = of all paks."); &Pakfire::message(" [installed/notinstalled/upgrade] = - Outputs a list with all, installed, available or upgradeable paks."); + &Pakfire::message(" [ ...] - Output pak me= tadata."); &Pakfire::message(" - Outputs a summary about avail= able core upgrades, updates and a required reboot"); &Pakfire::message(""); &Pakfire::message(" Global options:"); @@ -674,6 +675,60 @@ sub parsemetafile { return %metadata; } =20 +sub getmetadata { + ### This subroutine returns a hash of available info for a package + # Pass package name and type of info as argument: Pakfire::getmetadata(pa= ckage, type_of_info)=20 + # Type_of_info can be "latest" or "installed" + # Usage is always with two argument. + my ($pak, $type) =3D @_; + + my %metadata =3D ( + Name =3D> $pak,=20 + Installed =3D> "no", + Available =3D> "no"); + my %installed_metadata =3D (); + + my @templine; + my @file; + + ### Get available version information + if ("$type" eq "latest") { + ### Check if package is in packages_list and get latest available version + my %db =3D Pakfire::dblist("all"); + =09 + if (defined $db{$pak}) { + ### Get and parse latest available metadata + if (getmetafile("$pak")) { + %metadata =3D parsemetafile("$Conf::dbdir/meta/meta-$pak"); + + $metadata{'Available'} =3D "yes"; + ### Rename version info fields + $metadata{'AvailableProgVersion'} =3D delete $metadata{'ProgVersion'}; + $metadata{'AvailableRelease'} =3D delete $metadata{'Release'}; + } + } + } +=09 + ### Parse installed pak metadata + if (&isinstalled($pak) =3D=3D 0) { + %installed_metadata =3D parsemetafile("$Conf::dbdir/installed/meta-$pak= "); + + if ("$type" eq "latest" && exists($metadata{'AvailableProgVersion'})) { + ### Add installed version info to latest metadata + $metadata{'ProgVersion'} =3D $installed_metadata{'ProgVersion'}; + $metadata{'Release'} =3D $installed_metadata{'Release'}; + } else { + ### Use metadata of installed pak + %metadata =3D %installed_metadata; + } + $metadata{'Installed'} =3D 'yes'; + } else { + $metadata{'Installed'} =3D 'no'; + } + + return %metadata; +} + sub decryptpak { my $pak =3D shift; =20 diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 0ed8aacd4..9935481a5 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -387,6 +387,64 @@ } else { &Pakfire::message("PAKFIRE WARN: No packages where found using filter $fi= lter."); } + } elsif ("$ARGV[0]" eq "info") { + shift; + + my @paks; + my $pak; + foreach $pak (@ARGV) { + unless ("$pak" =3D~ "^-") { + push(@paks,$pak); + } + } + + unless ("@paks") { + Pakfire::message("PAKFIRE ERROR: missing package name"); + Pakfire::usage; + exit 1; + } + + foreach $pak (@paks) { + my %metadata =3D Pakfire::getmetadata($pak, "latest"); + + ### Check if pakfile was actually found + if ($metadata{'Installed'} eq "no" && $metadata{'Available'} eq "no") { + Pakfire::message("PAKFIRE WARN: Pak '$pak' not found."); + last; + } + + unless (defined $metadata{'Available'}) { + Pakfire::message("PAKFIRE WARN: Unable to retrieve latest metadata for $= pak. Information may be outdated.") + } + + ### Printout metadata in a user friendly format + print "Name: $metadata{'Name'}\n"; + print "Summary: $metadata{'Summary'}\n"; + if ($metadata{'Available'} eq "yes") { + print "Version: $metadata{'AvailableProgVersion'}-$metadata{'AvailableRe= lease'}\n"; + } else { + print "Version: $metadata{'ProgVersion'}-$metadata{'Release'}\n"; + } + print "Size: " . Pakfire::beautifysize("$metadata{'Size'}") . "\n"; + print "Dependencies: $metadata{'Dependencies'}\n"; + print "Pakfile: $metadata{'File'}\n"; + print "Service InitScripts: $metadata{'Services'}\n"; + print "Installed: $metadata{'Installed'}\n"; + ### Generate a pak status message + if (! defined $metadata{'Available'}) { + print "Status: unknown (an error occured retrieving latest pak metadata)= "; + } elsif ($metadata{'Available'} eq "no") { + print "Status: obsolete (version $metadata{'ProgVersion'}-$metadata{'Rel= ease'} is installed)\n"; + } elsif ($metadata{'Installed'} eq "yes" && "$metadata{'Release'}" < "$me= tadata{'AvailableRelease'}") { + print "Status: outdated (version $metadata{'ProgVersion'}-$metadata{'Rel= ease'} is installed)\n"; + } elsif ($metadata{'Installed'} eq "yes") { + print "Status: up-to-date\n"; + } else { + print "Status: not installed\n"; + } + print "\n"; + } + } elsif ("$ARGV[0]" eq "resolvedeps") { foreach (@ARGV) { next if ("$_" eq "resolvedeps"); --=20 2.34.1 --=20 Dit bericht is gescanned op virussen en andere gevaarlijke inhoud door MailScanner en lijkt schoon te zijn. --===============3098036024031994528==--