mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-25 02:12:58 +02:00
pakfire: Refactor dblist seperating UI and logic
- Removed UI code from dblist function and refactor it making it return
a hash representing the pak db for easier handling of this data.
- Moved core update check in dblist to new seperate dbcoreinfo function
making it return a hash with current and possibly available core
version info.
- Update existing calls to dblist
- Bring UI parts previously in dblist to pakfire program itself,
pakfire.cgi and index.cgi with a few small enhancements:
- Translations for 'Core-Update', 'Release', 'Update' and 'Version'
- Add currently installed version numbers to installed paks list in
pakfire.cgi
- Add 'Installed: yes/no' to pakfire list output so people not using
colors have this information too. (Partly fixes Bug #12868)
- Add update available details to pakfire list output if package has
updates available.
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
This commit is contained in:
Robin Roevens
committed by
Peter Müller
Peter Müller
parent
f201005f46
commit
0bd5b13195
@@ -44,7 +44,7 @@ my @VALID_KEY_FINGERPRINTS = (
|
||||
);
|
||||
|
||||
# A small color-hash :D
|
||||
my %color;
|
||||
our %color;
|
||||
$color{'normal'} = "\033[0m";
|
||||
$color{'black'} = "\033[0;30m";
|
||||
$color{'darkgrey'} = "\033[1;30m";
|
||||
@@ -434,108 +434,113 @@ sub dbgetlist {
|
||||
}
|
||||
}
|
||||
|
||||
sub coredbinfo {
|
||||
### This subroutine returns core db version information in a hash.
|
||||
# Usage is without arguments
|
||||
|
||||
eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
|
||||
|
||||
my %coredb = (
|
||||
CoreVersion => $Conf::version,
|
||||
Release => $Conf::core_mine,
|
||||
);
|
||||
|
||||
$coredb{'AvailableRelease'} = $core_release if ("$Conf::core_mine" < "$core_release");
|
||||
|
||||
return %coredb;
|
||||
}
|
||||
|
||||
sub dblist {
|
||||
### This subroutine lists the packages.
|
||||
# You may also pass a filter: &Pakfire::dblist(filter)
|
||||
# Usage is always with two arguments.
|
||||
# filter may be: all, notinstalled, installed
|
||||
### This subroutine returns the packages from the packages_list db in a hash.
|
||||
# It uses the currently cached version of packages_list. To ensure latest
|
||||
# data, run Pakfire::dbgetlist first.
|
||||
# You may also pass a filter: &Pakfire::dblist(filter)
|
||||
# Usage is always with one argument.
|
||||
# filter may be:
|
||||
# - "all": list all known paks,
|
||||
# - "notinstalled": list only not installed paks,
|
||||
# - "installed": list only installed paks
|
||||
# - "upgrade": list only upgradable paks
|
||||
#
|
||||
# Returned hash format:
|
||||
# ( "<pak name>" => (
|
||||
# "Installed" => "Yes" or "No" wether the pak is installed,
|
||||
# "ProgVersion" => Installed program version when "Installed" => "Yes" or
|
||||
# Available version when "Installed" => No,
|
||||
# "Release" => Installed pak release number when "Installed" => "Yes" or
|
||||
# Available pak release number when "Installed" => No,
|
||||
# "AvailableProgVersion" => Available program version.
|
||||
# Only defined if an upgrade to a higher version is available,
|
||||
# "AvailableRelease" => Available pak release version.
|
||||
# Only defined if an upgrade to a higher version is available
|
||||
# ),
|
||||
# ...
|
||||
# )
|
||||
|
||||
my $filter = shift;
|
||||
my $forweb = shift;
|
||||
my @updatepaks;
|
||||
my %paklist = ();
|
||||
my $file;
|
||||
my $line;
|
||||
my $prog;
|
||||
my %metadata;
|
||||
my @templine;
|
||||
|
||||
### Make sure that the list is not outdated.
|
||||
#dbgetlist("noforce");
|
||||
|
||||
|
||||
open(FILE, "<$Conf::dbdir/lists/packages_list.db");
|
||||
my @db = <FILE>;
|
||||
close(FILE);
|
||||
|
||||
if ("$filter" eq "upgrade") {
|
||||
if ("$forweb" ne "forweb" && "$forweb" ne "notice" ) {getcoredb("noforce");}
|
||||
eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
|
||||
if ("$core_release" > "$Conf::core_mine") {
|
||||
if ("$forweb" eq "forweb") {
|
||||
print "<option value=\"core\">Core-Update -- $Conf::version -- Release: $Conf::core_mine -> $core_release</option>\n";
|
||||
}
|
||||
elsif ("$forweb" eq "notice") {
|
||||
print "<br /><br /><br /><a href='pakfire.cgi'>$Lang::tr{'core notice 1'} $Conf::core_mine $Lang::tr{'core notice 2'} $core_release $Lang::tr{'core notice 3'}</a>";
|
||||
} else {
|
||||
my $command = "Core-Update $Conf::version\nRelease: $Conf::core_mine -> $core_release\n";
|
||||
if ("$Pakfire::enable_colors" eq "1") {
|
||||
print "$color{'lila'}$command$color{'normal'}\n";
|
||||
} else {
|
||||
print "$command\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ("$filter" ne "notinstalled") {
|
||||
opendir(DIR,"$Conf::dbdir/installed");
|
||||
my @files = readdir(DIR);
|
||||
closedir(DIR);
|
||||
|
||||
foreach $file (@files) {
|
||||
next if ( $file eq "." );
|
||||
next if ( $file eq ".." );
|
||||
next if ( $file =~ /^old/ );
|
||||
%metadata = parsemetafile("$Conf::dbdir/installed/$file");
|
||||
|
||||
foreach $prog (@db) {
|
||||
@templine = split(/\;/,$prog);
|
||||
if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" < "$templine[2]" && "$forweb" ne "notice")) {
|
||||
push(@updatepaks,$metadata{'Name'});
|
||||
if ("$forweb" eq "forweb") {
|
||||
print "<option value=\"$metadata{'Name'}\">Update: $metadata{'Name'} -- Version: $metadata{'ProgVersion'} -> $templine[1] -- Release: $metadata{'Release'} -> $templine[2]</option>\n";
|
||||
} else {
|
||||
my $command = "Update: $metadata{'Name'}\nVersion: $metadata{'ProgVersion'} -> $templine[1]\nRelease: $metadata{'Release'} -> $templine[2]\n";
|
||||
if ("$Pakfire::enable_colors" eq "1") {
|
||||
print "$color{'lila'}$command$color{'normal'}\n";
|
||||
} else {
|
||||
print "$command\n";
|
||||
}
|
||||
}
|
||||
foreach $line (@db) {
|
||||
next unless ($line =~ /.*;.*;.*;/ );
|
||||
@templine = split(/\;/,$line);
|
||||
if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" < "$templine[2]")) {
|
||||
# Add all upgradable paks to list
|
||||
$paklist{"$metadata{'Name'}"} = {
|
||||
ProgVersion => $metadata{'ProgVersion'},
|
||||
Release => $metadata{'Release'},
|
||||
AvailableProgVersion => $templine[1],
|
||||
AvailableRelease => $templine[2],
|
||||
Installed => "yes"
|
||||
};
|
||||
last;
|
||||
} elsif (("$metadata{'Name'}" eq "$templine[0]") && ("$filter" ne "upgrade")) {
|
||||
# Add installed paks without an upgrade available to list
|
||||
$paklist{"$metadata{'Name'}"} = {
|
||||
ProgVersion => $metadata{'ProgVersion'},
|
||||
Release => $metadata{'Release'},
|
||||
Installed => "yes"
|
||||
};
|
||||
last;
|
||||
}
|
||||
}
|
||||
}
|
||||
return @updatepaks;
|
||||
} else {
|
||||
my $line;
|
||||
my $use_color;
|
||||
my @templine;
|
||||
my $count;
|
||||
foreach $line (sort @db) {
|
||||
next unless ($line =~ /.*;.*;.*;/ );
|
||||
$use_color = "";
|
||||
@templine = split(/\;/,$line);
|
||||
if ("$filter" eq "notinstalled") {
|
||||
next if ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
|
||||
} elsif ("$filter" eq "installed") {
|
||||
next unless ( -e "$Conf::dbdir/installed/meta-$templine[0]" );
|
||||
}
|
||||
$count++;
|
||||
if ("$forweb" eq "forweb")
|
||||
{
|
||||
if ("$filter" eq "notinstalled") {
|
||||
print "<option value=\"$templine[0]\">$templine[0]-$templine[1]-$templine[2]</option>\n";
|
||||
} else {
|
||||
print "<option value=\"$templine[0]\">$templine[0]</option>\n";
|
||||
}
|
||||
} else {
|
||||
if ("$Pakfire::enable_colors" eq "1") {
|
||||
if (&isinstalled("$templine[0]")) {
|
||||
$use_color = "$color{'red'}"
|
||||
} else {
|
||||
$use_color = "$color{'green'}"
|
||||
}
|
||||
}
|
||||
print "${use_color}Name: $templine[0]\nProgVersion: $templine[1]\nRelease: $templine[2]$color{'normal'}\n\n";
|
||||
}
|
||||
}
|
||||
print "$count packages total.\n" unless ("$forweb" eq "forweb");
|
||||
}
|
||||
|
||||
# Add all not installed paks to list
|
||||
if (("$filter" ne "upgrade") && ("$filter" ne "installed")) {
|
||||
foreach $line (@db) {
|
||||
next unless ($line =~ /.*;.*;.*;/ );
|
||||
@templine = split(/\;/,$line);
|
||||
next if ((defined $paklist{"$templine[0]"}) || (&isinstalled($templine[0]) == 0));
|
||||
|
||||
$paklist{"$templine[0]"} = {
|
||||
ProgVersion => "$templine[1]",
|
||||
Release => "$templine[2]",
|
||||
Installed => "no"
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return %paklist;
|
||||
}
|
||||
|
||||
sub resolvedeps_one {
|
||||
@@ -910,10 +915,10 @@ sub progress_bar {
|
||||
|
||||
sub updates_available {
|
||||
# Get packets with updates available
|
||||
my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
|
||||
my %upgradepaks = &Pakfire::dblist("upgrade");
|
||||
|
||||
# Get the length of the returned array
|
||||
my $updatecount = scalar @upgradepaks;
|
||||
# Get the length of the returned hash
|
||||
my $updatecount = keys %upgradepaks;
|
||||
|
||||
return "$updatecount";
|
||||
}
|
||||
|
||||
@@ -270,14 +270,25 @@
|
||||
&Pakfire::getcoredb("$force");
|
||||
|
||||
} elsif ("$ARGV[0]" eq "upgrade") {
|
||||
my $use_color = "";
|
||||
my $reset_color = "";
|
||||
|
||||
if ("$Pakfire::enable_colors" eq "1") {
|
||||
$reset_color = "$Pakfire::color{'normal'}";
|
||||
$use_color = "$Pakfire::color{'lightpurple'}";
|
||||
}
|
||||
|
||||
&Pakfire::upgradecore();
|
||||
my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
|
||||
|
||||
my @deps = ();
|
||||
|
||||
if (@upgradepaks) {
|
||||
if (my %upgradepaks = &Pakfire::dblist("upgrade")) {
|
||||
# Resolve the dependencies of the to be upgraded packages
|
||||
@deps = &Pakfire::resolvedeps_recursive(@upgradepaks);
|
||||
@deps = &Pakfire::resolvedeps_recursive(keys %upgradepaks);
|
||||
|
||||
foreach $pak (sort keys %upgradepaks) {
|
||||
print "${use_color}Update: $pak\nVersion: $upgradepaks{$pak}{'ProgVersion'} -> $upgradepaks{$pak}{'AvailableProgVersion'}\n";
|
||||
print "Release: $upgradepaks{$pak}{'Release'} -> $upgradepaks{$pak}{'AvailableRelease'}${reset_color}\n";
|
||||
}
|
||||
&Pakfire::message("");
|
||||
&Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above.");
|
||||
if ($interactive) {
|
||||
@@ -290,36 +301,78 @@
|
||||
exit 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Download packages
|
||||
foreach $pak (sort keys %upgradepaks) {
|
||||
&Pakfire::getpak("$pak", "");
|
||||
}
|
||||
|
||||
# Download packages
|
||||
foreach $pak (@upgradepaks) {
|
||||
&Pakfire::getpak("$pak", "");
|
||||
}
|
||||
# Download dependencies
|
||||
foreach $pak (@deps) {
|
||||
&Pakfire::getpak("$pak", "");
|
||||
}
|
||||
|
||||
# Download dependencies
|
||||
foreach $pak (@deps) {
|
||||
&Pakfire::getpak("$pak", "");
|
||||
}
|
||||
# Install dependencies first
|
||||
foreach $pak (@deps) {
|
||||
&Pakfire::setuppak("$pak");
|
||||
}
|
||||
|
||||
# Install dependencies first
|
||||
foreach $pak (@deps) {
|
||||
&Pakfire::setuppak("$pak");
|
||||
}
|
||||
|
||||
# Install all upgrades
|
||||
foreach $pak (@upgradepaks) {
|
||||
&Pakfire::upgradepak("$pak");
|
||||
# Install all upgrades
|
||||
foreach $pak (sort keys %upgradepaks) {
|
||||
&Pakfire::upgradepak("$pak");
|
||||
}
|
||||
} else {
|
||||
&Pakfire::message("PAKFIRE WARN: No new package upgrades available.");
|
||||
}
|
||||
|
||||
} elsif ("$ARGV[0]" eq "list") {
|
||||
my $count;
|
||||
my $use_color = "";
|
||||
my $reset_color = "";
|
||||
my $filter = "all";
|
||||
|
||||
if ("$ARGV[1]" =~ /installed|notinstalled/) {
|
||||
&Pakfire::dblist("$ARGV[1]", "noweb");
|
||||
$filter = "$ARGV[1]";
|
||||
} else {
|
||||
&Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]);
|
||||
&Pakfire::dblist("all", "noweb");
|
||||
&Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]);
|
||||
}
|
||||
|
||||
my $pak;
|
||||
my %paklist = &Pakfire::dblist($filter);
|
||||
|
||||
if ("$Pakfire::enable_colors" eq "1") {
|
||||
$reset_color = "$Pakfire::color{'normal'}";
|
||||
$use_color = "$Pakfire::color{'lightgreen'}";
|
||||
}
|
||||
|
||||
foreach $pak (sort keys %paklist) {
|
||||
if ("$Pakfire::enable_colors" eq "1") {
|
||||
if ("$paklist{$pak}{'Installed'}" eq "yes") {
|
||||
if (defined $paklist{$pak}{'AvailableProgVersion'}) {
|
||||
$use_color = "$Pakfire::color{'lightgreen'}";
|
||||
} else {
|
||||
$use_color = "$Pakfire::color{'green'}";
|
||||
}
|
||||
} else {
|
||||
$use_color = "$Pakfire::color{'red'}";
|
||||
}
|
||||
}
|
||||
|
||||
print "${use_color}Name: $pak\nProgVersion: $paklist{$pak}{'ProgVersion'}\n";
|
||||
print "Release: $paklist{$pak}{'Release'}\nInstalled: $paklist{$pak}{'Installed'}\n";
|
||||
if (defined $paklist{$pak}{'AvailableProgVersion'}) {
|
||||
print "Update available:\n Version: $paklist{$pak}{'ProgVersion'} -> $paklist{$pak}{'AvailableProgVersion'}\n Release: $paklist{$pak}{'Release'} -> $paklist{$pak}{'AvailableRelease'}\n";
|
||||
}
|
||||
print "${reset_color}\n";
|
||||
|
||||
}
|
||||
|
||||
$count = keys %paklist;
|
||||
if ($count > 0) {
|
||||
print "$count packages total.\n";
|
||||
} else {
|
||||
&Pakfire::message("PAKFIRE WARN: No packages where found using filter $filter.");
|
||||
}
|
||||
} elsif ("$ARGV[0]" eq "resolvedeps") {
|
||||
foreach (@ARGV) {
|
||||
next if ("$_" eq "resolvedeps");
|
||||
|
||||
Reference in New Issue
Block a user