From 7c2aa35931cf91eb3a7df29f60c565722ff2d130 Mon Sep 17 00:00:00 2001
From: guinux <nuxgui@gmail.com>
Date: Sat, 15 Apr 2017 21:34:35 +0200
Subject: [PATCH] add new pacman-mirrors support

---
 src/mirrors_config.vala     | 33 ++++++++++++++++-----------------
 src/preferences_dialog.vala |  4 ++--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/mirrors_config.vala b/src/mirrors_config.vala
index fea5891..a112152 100644
--- a/src/mirrors_config.vala
+++ b/src/mirrors_config.vala
@@ -20,27 +20,29 @@
 namespace Pamac {
 	class MirrorsConfig {
 		string conf_path;
-		GLib.List<string> _countrys ;
+		GLib.List<string> _countries ;
 
-
-		public string mirrorlists_dir { get; private set; }
 		public string choosen_generation_method { get; private set; }
 		public string choosen_country { get; private set; }
-		public unowned GLib.List<string> countrys {
+		public unowned GLib.List<string> countries {
 			get {
 				try {
-					var directory = GLib.File.new_for_path (mirrorlists_dir);
-					var enumerator = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0);
-					FileInfo file_info;
-					_countrys = new GLib.List<string> ();
-					while ((file_info = enumerator.next_file ()) != null) {
-						_countrys.append(file_info.get_name ());
+					string countries_str;
+					int status;
+					Process.spawn_command_line_sync ("pacman-mirrors -l",
+												out countries_str,
+												null,
+												out status);
+					_countries = new GLib.List<string> ();
+					if (status == 0) {
+						foreach (unowned string country in countries_str.split ("\n")) {
+						_countries.append (country);
+						}
 					}
-					_countrys.sort (strcmp);
-				} catch (Error e) {
-					stderr.printf ("%s\n", e.message);
+				} catch (SpawnError e) {
+					stdout.printf ("Error: %s\n", e.message);
 				}
-				return _countrys;
+				return _countries;
 			}
 		}
 
@@ -54,7 +56,6 @@ namespace Pamac {
 			// set default options
 			choosen_generation_method = "rank";
 			choosen_country = "ALL";
-			mirrorlists_dir = "/etc/pacman.d/mirrors";
 			parse_file (conf_path);
 		}
 
@@ -87,8 +88,6 @@ namespace Pamac {
 							choosen_generation_method = val;
 						} else if (key == "OnlyCountry") {
 							choosen_country = val;
-						} else if (key == "MirrorlistsDir") {
-							mirrorlists_dir = val.replace ("\"", "");
 						}
 					}
 				} catch (Error e) {
diff --git a/src/preferences_dialog.vala b/src/preferences_dialog.vala
index 674a0f9..b5bfea7 100644
--- a/src/preferences_dialog.vala
+++ b/src/preferences_dialog.vala
@@ -101,7 +101,7 @@ namespace Pamac {
 			no_update_hide_icon_checkbutton.toggled.connect (on_no_update_hide_icon_checkbutton_toggled);
 			transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished);
 
-			AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrorlist");
+			AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors");
 			if (pkg.name == "") {
 				mirrors_config_box.visible = false;
 			} else {
@@ -109,7 +109,7 @@ namespace Pamac {
 				mirrors_country_comboboxtext.append_text (dgettext (null, "Worldwide"));
 				mirrors_country_comboboxtext.active = 0;
 				int index = 1;
-				foreach (unowned string country in mirrors_config.countrys) {
+				foreach (unowned string country in mirrors_config.countries) {
 					mirrors_country_comboboxtext.append_text (country);
 					if (country == mirrors_config.choosen_country) {
 						mirrors_country_comboboxtext.active = index;