From cf7c94adac940f27466faef1018c5ed7c24c5cd2 Mon Sep 17 00:00:00 2001
From: guinux <nuxgui@gmail.com>
Date: Sat, 15 Jun 2019 09:25:38 +0200
Subject: [PATCH] remove TransactionSummary.aur_conflicts_to_remove
---
src/package.vala | 19 +++++++++++++++----
src/transaction-cli.vala | 28 ----------------------------
src/transaction-gtk.vala | 17 -----------------
3 files changed, 15 insertions(+), 49 deletions(-)
diff --git a/src/package.vala b/src/package.vala
index 87a68f36..de48f8ad 100644
--- a/src/package.vala
+++ b/src/package.vala
@@ -276,7 +276,6 @@ namespace Pamac {
List<Package> to_reinstall_priv;
List<Package> to_remove_priv;
List<AURPackage> to_build_priv;
- List<Package> aur_conflicts_to_remove_priv;
List<string> aur_pkgbases_to_build_priv;
public List<Package> to_install { get {return to_install_priv;} }
public List<Package> to_upgrade { get {return to_upgrade_priv;} }
@@ -284,7 +283,6 @@ namespace Pamac {
public List<Package> to_reinstall { get {return to_reinstall_priv;} }
public List<Package> to_remove { get {return to_remove_priv;} }
public List<AURPackage> to_build { get {return to_build_priv;} }
- public List<Package> aur_conflicts_to_remove { get {return aur_conflicts_to_remove_priv;} }
public List<string> aur_pkgbases_to_build { get {return aur_pkgbases_to_build_priv;} }
internal TransactionSummary (TransactionSummaryStruct summary_struct) {
to_install_priv = new List<Package> ();
@@ -293,29 +291,34 @@ namespace Pamac {
to_reinstall_priv = new List<Package> ();
to_remove_priv = new List<Package> ();
to_build_priv = new List<AURPackage> ();
- aur_conflicts_to_remove_priv = new List<Package> ();
aur_pkgbases_to_build_priv = new List<string> ();
foreach (unowned PackageStruct pkg_struct in summary_struct.to_install) {
to_install_priv.append (new Package.from_struct (pkg_struct));
}
+ to_install_priv.sort (compare_name_pkg);
foreach (unowned PackageStruct pkg_struct in summary_struct.to_upgrade) {
to_upgrade_priv.append (new Package.from_struct (pkg_struct));
}
+ to_upgrade_priv.sort (compare_name_pkg);
foreach (unowned PackageStruct pkg_struct in summary_struct.to_downgrade) {
to_downgrade_priv.append (new Package.from_struct (pkg_struct));
}
+ to_downgrade_priv.sort (compare_name_pkg);
foreach (unowned PackageStruct pkg_struct in summary_struct.to_reinstall) {
to_reinstall_priv.append (new Package.from_struct (pkg_struct));
}
+ to_reinstall_priv.sort (compare_name_pkg);
foreach (unowned PackageStruct pkg_struct in summary_struct.to_remove) {
to_remove_priv.append (new Package.from_struct (pkg_struct));
}
foreach (unowned AURPackageStruct pkg_struct in summary_struct.to_build) {
to_build_priv.append (new AURPackage.from_struct (pkg_struct));
}
+ to_build_priv.sort (compare_name_aur);
foreach (unowned PackageStruct pkg_struct in summary_struct.aur_conflicts_to_remove) {
- aur_conflicts_to_remove_priv.append (new Package.from_struct (pkg_struct));
+ to_remove_priv.append (new Package.from_struct (pkg_struct));
}
+ to_remove_priv.sort (compare_name_pkg);
foreach (unowned string str in summary_struct.aur_pkgbases_to_build) {
aur_pkgbases_to_build_priv.append (str);
}
@@ -341,3 +344,11 @@ namespace Pamac {
}
}
}
+
+int compare_name_pkg (Pamac.Package pkg_a, Pamac.Package pkg_b) {
+ return strcmp (pkg_a.name, pkg_b.name);
+}
+
+int compare_name_aur (Pamac.AURPackage pkg_a, Pamac.AURPackage pkg_b) {
+ return strcmp (pkg_a.name, pkg_b.name);
+}
diff --git a/src/transaction-cli.vala b/src/transaction-cli.vala
index a5670a76..e0d20411 100644
--- a/src/transaction-cli.vala
+++ b/src/transaction-cli.vala
@@ -362,20 +362,6 @@ namespace Pamac {
}
}
}
- if (summary.aur_conflicts_to_remove.length () > 0) {
- foreach (unowned Package pkg in summary.aur_conflicts_to_remove) {
- rsize += pkg.size;
- if (pkg.name.length > name_length) {
- name_length = pkg.name.length;
- }
- if (pkg.version.length > version_length) {
- version_length = pkg.version.length;
- }
- if (pkg.repo.length > repo_length) {
- repo_length = pkg.repo.length;
- }
- }
- }
if (summary.to_downgrade.length () > 0) {
foreach (unowned Package pkg in summary.to_downgrade) {
dsize += pkg.download_size;
@@ -519,10 +505,8 @@ namespace Pamac {
size);
}
}
- bool to_remove_printed = false;
if (summary.to_remove.length () > 0) {
stdout.printf (dgettext (null, "To remove") + " (%u):\n".printf (summary.to_remove.length ()));
- to_remove_printed = true;
foreach (unowned Package pkg in summary.to_remove) {
stdout.printf (" %-*s %-*s %-*s %s\n",
name_length, pkg.name,
@@ -531,18 +515,6 @@ namespace Pamac {
pkg.repo);
}
}
- if (summary.aur_conflicts_to_remove.length () > 0) {
- if (!to_remove_printed) {
- stdout.printf (dgettext (null, "To remove") + " (%u):\n".printf (summary.aur_conflicts_to_remove.length ()));
- }
- foreach (unowned Package pkg in summary.aur_conflicts_to_remove) {
- stdout.printf (" %-*s %-*s %-*s %s\n",
- name_length, pkg.name,
- version_length , pkg.version,
- installed_version_length, "",
- pkg.repo);
- }
- }
stdout.printf ("\n");
if (dsize > 0) {
stdout.printf ("%s: %s\n", dgettext (null, "Total download size"), format_size (dsize));
diff --git a/src/transaction-gtk.vala b/src/transaction-gtk.vala
index 9854b2b2..0f93b5a7 100644
--- a/src/transaction-gtk.vala
+++ b/src/transaction-gtk.vala
@@ -314,7 +314,6 @@ namespace Pamac {
} else {
uint must_confirm_length = summary.to_downgrade.length ()
+ summary.to_remove.length ()
- + summary.aur_conflicts_to_remove.length ()
+ summary.to_build.length ();
if (no_confirm_upgrade
&& must_confirm_length == 0
@@ -352,22 +351,6 @@ namespace Pamac {
transaction_sum_dialog.sum_list.set (iter, 0, "<b>%s</b>".printf (dgettext (null, "To remove") + ":"));
to_remove_printed = true;
}
- if (summary.aur_conflicts_to_remove.length () > 0) {
- // do not add type enum because it is just infos
- foreach (unowned Package pkg in summary.aur_conflicts_to_remove) {
- transaction_summary.add (pkg.name);
- transaction_sum_dialog.sum_list.insert_with_values (out iter, -1,
- 1, pkg.name,
- 2, pkg.version,
- 4, pkg.repo);
- }
- if (!to_remove_printed) {
- Gtk.TreePath path = transaction_sum_dialog.sum_list.get_path (iter);
- uint pos = (path.get_indices ()[0]) - (summary.aur_conflicts_to_remove.length () - 1);
- transaction_sum_dialog.sum_list.get_iter (out iter, new Gtk.TreePath.from_indices (pos));
- transaction_sum_dialog.sum_list.set (iter, 0, "<b>%s</b>".printf (dgettext (null, "To remove") + ":"));
- }
- }
if (summary.to_downgrade.length () > 0) {
foreach (unowned Package pkg in summary.to_downgrade) {
dsize += pkg.download_size;
--
GitLab