Merge remote-tracking branch 'upstream/master' (reverted from commit...

Merge remote-tracking branch 'upstream/master' (reverted from commit 9df3c6ec)

Merge remote-tracking branch 'upstream/master' (reverted from commit...
5d502192 · Frede H · 63f3b65a · 5d502192 · 5d502192 · 5d502192
Commit 5d502192 authored 8 years ago by Frede H
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,8 @@
 All notable changes to this project will be documented in this file.
 ## [4.0.4-dev]
- Improvement on `--interactive`: select mirrors by protocol.
+- improvement on `--interactive`: select mirrors by protocol
- Added to config `# SSL = False`.
+- added to config `# SSL = False`
- Some optimizations.
- Update translations.
 ## [4.0.3] - 2017-03-28
 - Fix issue with `--fasttrack` and `OnlyCountry = Custom`.

--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ help:
 	@echo "test - run tests quickly with the default Python"
 	@echo "test-all - run tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
-	@echo "docs - generate MkDocs HTML documentation, including API docs"
+	@echo "docs - generate Sphinx HTML documentation, including API docs"
 	@echo "release - package and upload a release"
 	@echo "dist - package"
 	@echo "install - install the package to the active Python's site-packages"

--- a/README.md
+++ b/README.md
@@ -17,31 +17,27 @@ Package that provides all mirrors for Manjaro Linux.
 - A GUI for selecting the mirrors to used to generate a custom list.
 ### How does fasttrack work
-First of all, a working internet connection is mandatory. pacman-mirrors always checks if network is online. It is doing so by pinging google with 3 packets.
+First of all, a working internet connection is mandatory. Pacman-Mirrors always checks if network is online. It is doing so by pinging google with 3 packets.
-The following arguments `-c -i -m --geoip` will not work in conjunction with `-f`.
+The following arguments `-c -i -m --geoip` will not work in conjunction with `-f`. 
 #### Question:
 So, `pacman-mirrors -f 2` takes the same time to create `/etc/pacman.d/mirrorlist` as `pacman-mirrors -f 20`?
 ##### Answer:
 No. `pacman-mirors -f 2` will be faster than `pacman-mirrors -f 20` since only 2 mirrors are probed vs 20 mirrors but since most mirrors respond within the first second it is barely noticeable.
 #### Question:
 `pacman-mirrors -f n` always ranks ALL mirrors by response time (the same as `pacman-mirrors -g` does) and additionally takes up-to-date mirrors and writes only **n** mirrors to `/etc/pacman.d/mirrorlist`?
-##### Answer:
+##### Answer: 
-No. `pacman-mirrors -f n` ranks on a sorted list with known up-to-date mirrors. Thus it is only the first **n** mirrors from this list which are actually probed. If you have a list of 30 mirrors which are up-to-date and use `-f 5` only the top 5 mirrors are probed and then sorted after response time.
+No. `pacman-mirrors -f n` ranks on a sorted list with known up-to-date mirrors. Thus it is only the first **n** mirrors from this list which are actually probed. If you have a list of 30 mirrors which are uptodate and use `-f 5` only the top 5 mirrors are probed and then sorted after response time.
-The switch does not guarantee you get **the n** fastest mirrors only that they are responsive and up-to-date. Mirrors which have network errors or times out are not considered at all.
+The switch does not guarantee you get **the n** fastest mirrors only that they are responsive and uptodate. Mirrors which have network errors or times out are not considered at all.
 #### Beware
 The smaller number you choose to write to the mirrorlist will increase the possibility of not getting a responsive mirror since only the first **n** in the list are tested not all of them.
 A reasonable number is between 5 and 10.
-The force of this approach is that we know forehand if the mirror is up-to-date and thus only have to rank **n** mirrors from the mirrors known to be up-to-date.
+The force of this approach is that we know forehand if the mirror is uptodate and thus only have to rank **n** mirrors from the mirrors known to be uptodate.
 If you need a complete ranking then `pacman-mirrors -g` is the way to go.
 ## Technologies
-pacman-mirrors uses open-source projects to work properly:
+pacman-mirrors is build with Python and Gtk3.
-* [Python 3](https://www.python.org)
-* [GTK+ 3](https://www.gtk.org)
-* [npyscreen](https://github.com/npcole/npyscreen)
--- a/locale/tr/LC_MESSAGES/pacman_mirrors.po
+++ b/locale/tr/LC_MESSAGES/pacman_mirrors.po
@@ -5,16 +5,14 @@
 # 
 # Translators:
 # Ali Kömesöğütlü <byzlo685@gmail.com>, 2017
-# Demiray Muhterem <mdemiray@msn.com>, 2017
-# ilkeryus <ilkeryus@gmail.com>, 2016
 # ilkeryus <ilkeryus@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: manjaro-pacman-mirrors\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2017-02-20 15:44+0100\n"
-"PO-Revision-Date: 2017-03-30 19:10+0000\n"
+"PO-Revision-Date: 2017-03-06 15:24+0000\n"
-"Last-Translator: Demiray Muhterem <mdemiray@msn.com>\n"
+"Last-Translator: Ali Kömesöğütlü <byzlo685@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/manjarolinux/manjaro-pacman-mirrors/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +39,7 @@ msgstr "Zaman aşımı"
 #: pacman_mirrors/txt.py:36
 msgid "HTTPException"
-msgstr "HTTPHariç"
+msgstr ""
 #: pacman_mirrors/txt.py:38
 msgid "PATH"
@@ -57,115 +55,115 @@ msgstr "SANİYE"
 #: pacman_mirrors/txt.py:41
 msgid "DIGIT"
-msgstr "RAKAM"
+msgstr ""
 #: pacman_mirrors/txt.py:43
 msgid "Branch name"
-msgstr "Kol adı"
+msgstr ""
 #: pacman_mirrors/txt.py:44
 msgid "Comma separated list of countries, from which mirrors will be used"
-msgstr "Yansıların kullanılacağı, virgülle ayrılmış ülkelerin listesi"
+msgstr ""
 #: pacman_mirrors/txt.py:46
 msgid "Output file"
-msgstr "Çıktı dosyası"
+msgstr ""
 #: pacman_mirrors/txt.py:47
 msgid "Generate mirrorlist"
-msgstr "Yansı listesi oluştur"
+msgstr ""
 #: pacman_mirrors/txt.py:48
 msgid "Get current country using geolocation. Ignored if"
-msgstr "Coğrafi konum kullanarak ülkenizi öğrenin. Yok sayarsan"
+msgstr ""
 #: pacman_mirrors/txt.py:49
 msgid "is supplied"
-msgstr "tedarik edildi"
+msgstr ""
 #: pacman_mirrors/txt.py:50
 msgid "Generate custom mirrorlist"
-msgstr "Özel yansı listesi oluştur"
+msgstr ""
 #: pacman_mirrors/txt.py:51
 msgid "Generation method"
-msgstr "Oluşturma yöntemi"
+msgstr ""
 #: pacman_mirrors/txt.py:52
 msgid "Don't generate mirrorlist if"
-msgstr "Eğer var ise yansı listesi oluşturmayın"
+msgstr ""
 #: pacman_mirrors/txt.py:53
 msgid "in the configuration file"
-msgstr "yapılandırma dosyasında"
+msgstr ""
 #: pacman_mirrors/txt.py:54
 msgid "Mirrors list path"
-msgstr "yansı listesi yolu"
+msgstr ""
 #: pacman_mirrors/txt.py:55
 msgid "Quiet mode - less verbose output"
-msgstr "Sessiz mod - daha detaysız çıktı"
+msgstr ""
 #: pacman_mirrors/txt.py:56
 msgid "Maximum waiting time for server response"
-msgstr "Sunucu yanıtı için azami bekleme süresi"
+msgstr ""
 #: pacman_mirrors/txt.py:57
 msgid "Print the pacman-mirrors version"
-msgstr "pacman-mirrors sürümünü yazdır"
+msgstr ""
 #: pacman_mirrors/txt.py:58
 msgid "A quick mirrorlist. Overrides -cim --geoip"
-msgstr "Hızlı bir yansı listesi. -cim --geoip'i geçersiz kılar"
+msgstr ""
 #: pacman_mirrors/txt.py:60
 msgid "Available countries are"
-msgstr "Mevcut ülkeler"
+msgstr ""
 #: pacman_mirrors/txt.py:61
 msgid "Could not download from"
-msgstr "Adresinden indirilemedi"
+msgstr ""
 #: pacman_mirrors/txt.py:62
 msgid "Cannot read file"
-msgstr "Dosya okunamadı"
+msgstr ""
 #: pacman_mirrors/txt.py:63
 msgid "Cannot write file"
-msgstr "Dosyaya yazılamadı"
+msgstr ""
 #: pacman_mirrors/txt.py:64
 msgid "Converting custom mirror file to new format"
-msgstr "Özel yansı listesini yeni biçime dönüştür"
+msgstr ""
 #: pacman_mirrors/txt.py:65
 msgid "Custom mirror file"
-msgstr "Özel yansı dosyası"
+msgstr ""
 #: pacman_mirrors/txt.py:66
 msgid "Custom mirror file saved"
-msgstr "Özel yansı dpsyası kaydedildi"
+msgstr ""
 #: pacman_mirrors/txt.py:67
 msgid "User generated mirror list"
-msgstr "Kullanıcı tarafından oluşturulan yansı listesi"
+msgstr ""
 #: pacman_mirrors/txt.py:68
 msgid "doesn't exist."
-msgstr "varolmayan."
+msgstr ""
 #: pacman_mirrors/txt.py:69
 msgid "Downloading mirrors from repo.manjaro.org"
-msgstr "Yansı listesi repo.manjaro.org adresinden indiriliyor"
+msgstr ""
 #: pacman_mirrors/txt.py:70
 msgid "Falling back to"
-msgstr "Geri düşüm"
+msgstr ""
 #: pacman_mirrors/txt.py:71
 msgid "is missing"
-msgstr "kayıp"
+msgstr ""
 #: pacman_mirrors/txt.py:72
 msgid "The mirror file"
@@ -173,19 +171,19 @@ msgstr "Yansı dosyası"
 #: pacman_mirrors/txt.py:73
 msgid "Mirrorlist generated and saved to"
-msgstr "Yansı oluşturuldu ve kaydedildi"
+msgstr ""
 #: pacman_mirrors/txt.py:74
 msgid "Must have root privileges"
-msgstr "Root yetkisine sahip olmalısınız"
+msgstr ""
 #: pacman_mirrors/txt.py:75
 msgid "The mirror list is not changed"
-msgstr "Yansı listesi değiştirilmedi"
+msgstr ""
 #: pacman_mirrors/txt.py:76
 msgid "No mirrors in selection"
-msgstr "Yansı seçilmedi"
+msgstr ""
 #: pacman_mirrors/txt.py:77
 msgid "Option"
@@ -193,51 +191,51 @@ msgstr "Seçenek"
 #: pacman_mirrors/txt.py:78
 msgid "Writing mirror list"
-msgstr "Yansı listesi yazılıyor"
+msgstr ""
 #: pacman_mirrors/txt.py:79
 msgid "Querying mirrors"
-msgstr "Yansı sorgulama"
+msgstr ""
 #: pacman_mirrors/txt.py:80
 msgid "Randomizing mirror list"
-msgstr "Rastgele yansı listesi seç"
+msgstr ""
 #: pacman_mirrors/txt.py:81
 msgid "To reset custom config run `pacman-mirrors -c all`"
-msgstr "Özel yansıları sıfırlamak için `pacman-mirrors -c all` kullanın"
+msgstr ""
 #: pacman_mirrors/txt.py:82
 msgid "This may take some time"
-msgstr "Bu işlem biraz zaman alabilir"
+msgstr ""
 #: pacman_mirrors/txt.py:83
 msgid "unknown country"
-msgstr "bilinmeyen ülke"
+msgstr ""
 #: pacman_mirrors/txt.py:84
 msgid "Using all mirrors"
-msgstr "Tüm yansılar kullanılsın"
+msgstr ""
 #: pacman_mirrors/txt.py:85
 msgid "Using custom mirror file"
-msgstr "Özel yansı dosyası kullanılsın"
+msgstr ""
 #: pacman_mirrors/txt.py:86
 msgid "Using default mirror file"
-msgstr "Varsayılan yansı dosyası kullanılsın"
+msgstr ""
 #: pacman_mirrors/txt.py:88
 msgid "Manjaro mirrors by response time"
-msgstr "Hızına göre yansılar kullanılsın"
+msgstr ""
 #: pacman_mirrors/txt.py:89
 msgid "Manjaro mirrors in random order"
-msgstr "Rastgele sıralanmış yansılar kullanılsın"
+msgstr ""
 #: pacman_mirrors/txt.py:90
 msgid "Check mirrors for your personal list"
-msgstr "Özel listeniz için yansıları kontrol edin"
+msgstr ""
 #: pacman_mirrors/txt.py:91
 msgid "Use"
@@ -249,11 +247,11 @@ msgstr "Ülke"
 #: pacman_mirrors/txt.py:93
 msgid "Resp"
-msgstr "Kısa"
+msgstr ""
 #: pacman_mirrors/txt.py:94
 msgid "Sync"
-msgstr "Senk"
+msgstr ""
 #: pacman_mirrors/txt.py:95
 msgid "URL"

--- a/pacman_mirrors/configfn.py
+++ b/pacman_mirrors/configfn.py
@@ -106,8 +106,10 @@ def build_config():
                    elif key == "SSL":
                        config["ssl"] = value
    except (PermissionError, OSError) as err:
-        print(".: {} {}: {}: {}".format(txt.ERR_CLR, txt.CANNOT_READ_FILE,
+        print(".: {} {}: {}: {}".format(txt.ERR_CLR,
-                                            err.filename, err.strerror))
+                                        txt.CANNOT_READ_FILE,
+                                        err.filename,
+                                        err.strerror))
    return config, custom
@@ -120,8 +122,10 @@ def modify_config(config, custom=False):
        # remove custom file if present
        if os.path.isfile(config["custom_file"]):
            os.remove(config["custom_file"])
-    write_configuration(config["config_file"], config["only_country"],
-                            custom=custom)
+    write_configuration(config["config_file"],
+                        config["only_country"],
+                        custom=custom)
 def write_configuration(filename, selection, custom=False):
@@ -140,8 +144,11 @@ def write_configuration(filename, selection, custom=False):
        selection = "# OnlyCountry = \n"
    try:
-        with open(filename) as cnf, tempfile.NamedTemporaryFile("w+t",
+        with open(
-                            dir=os.path.dirname(filename), delete=False) as tmp:
+            filename) as cnf, tempfile.NamedTemporaryFile(
+            "w+t", dir=os.path.dirname(
+                filename), delete=False) as tmp:
            replaced = False
            for line in cnf:
                if "OnlyCountry" in line:
@@ -155,5 +162,5 @@ def write_configuration(filename, selection, custom=False):
        os.chmod(filename, 0o644)
    except OSError as err:
        print(".: {} {}: {}: {}".format(txt.ERR_CLR, txt.CANNOT_READ_FILE,
-                                            err.filename, err.strerror))
+                                        err.filename, err.strerror))
        exit(1)
--- a/pacman_mirrors/consolefn.py
+++ b/pacman_mirrors/consolefn.py
@@ -25,6 +25,7 @@ import json
 def list_to_tuple(list_data, named_tuple):
    """
    Comvert list to a list with named tuples
    :param list_data: the list to convert
    :param named_tuple: tuple list item converts to
    :return data: list of named tuples
@@ -37,17 +38,20 @@ def list_to_tuple(list_data, named_tuple):
 def rows_from_tuple(servers, joiner=" | "):
    """
    Generates equal formatted lines
    :param servers: named tuples
    :param joiner: string used to join tuple items
    :return lines: list of nicely formatted lines
    """
    rows = []
-    if servers:
+    if not servers:
-        # calculate max col width
+        return rows
-        col_width = [max(len(text) for text in col) for col in zip(*servers)]
+    # calculate max col width
-        # generate lines
+    col_width = [max(len(text) for text in col) for col in zip(*servers)]
-        for line in servers:
-            rows.append(joiner.join("{:{}}".format(text, col_width[i])
+    # generate linies
-                                    for i, text in enumerate(line)))
+    for line in servers:
+        rows.append(joiner.join("{:{}}".format(text, col_width[i])
+                                for i, text in enumerate(line)))
    return rows
--- a/pacman_mirrors/consoleui.py
+++ b/pacman_mirrors/consoleui.py
@@ -81,6 +81,7 @@ class ConsoleUI(npyscreen.NPSAppManaged):
    def done(self, selection):
        """
        After editing
        :param selection:
        """
        if selection:

--- a/pacman_mirrors/filefn.py
+++ b/pacman_mirrors/filefn.py
@@ -27,6 +27,13 @@ from . import miscfn
 from . import txt
+def check_file(filename):
+    """Check if file exist
+    :param filename:
+    """
+    return os.path.isfile(filename)
 def dir_must_exist(dir_name):
    """Check necessary directory
    :param dir_name:
@@ -42,13 +49,13 @@ def return_mirror_filename(config):
    filename = ""
    status = False  # status.json or mirrors.json
    # decision on file availablity
-    if os.path.isfile(config["status_file"]):
+    if check_file(config["status_file"]):
        status = True
        filename = config["status_file"]
-    elif os.path.isfile(config["mirror_file"]):
+    elif check_file(config["mirror_file"]):
        filename = config["mirror_file"]
-    elif os.path.isfile(config["fallback_file"]):
+    elif check_file(config["fallback_file"]):
-        filename = config["fallback_file"]
+            filename = config["fallback_file"]
    if not filename:
        print("\n{}.:! {}{}\n".format(txt.RS,
                                      txt.HOUSTON,

--- a/pacman_mirrors/graphicalui.py
+++ b/pacman_mirrors/graphicalui.py
@@ -87,8 +87,7 @@ class GraphicalUI(Gtk.Window):
        self.button_done = Gtk.Button(txt.I_CONFIRM, sensitive=False)
        self.button_done.connect("clicked", self.done)
-        grid = Gtk.Grid(column_homogeneous=True, column_spacing=10,
+        grid = Gtk.Grid(column_homogeneous=True, column_spacing=10, row_spacing=10)
-                            row_spacing=10)
        grid.attach(header, 0, 0, 2, 1)
        grid.attach(scrolled_tree, 0, 1, 2, 1)
        grid.attach(button_cancel, 0, 2, 1, 1)
@@ -124,8 +123,8 @@ class GraphicalUI(Gtk.Window):
    def done(self, button):
        """Confirm choice"""
        dialog = Gtk.Dialog(txt.I_CONFIRM_SELECTION, None, 0, (
-                                Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+            Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                                Gtk.STOCK_OK, Gtk.ResponseType.OK))
+            Gtk.STOCK_OK, Gtk.ResponseType.OK))
        dialog.set_transient_for(self)
        dialog.set_border_width(10)
        box = dialog.get_content_area()

--- a/pacman_mirrors/httpfn.py
+++ b/pacman_mirrors/httpfn.py
@@ -61,7 +61,8 @@ def download_mirrors(config):
    except (HTTPException, json.JSONDecodeError, URLError):
        pass
-    return (fetchmirrors, fetchstatus)
+    result = (fetchmirrors, fetchstatus)
+    return result
 def get_geoip_country():
@@ -136,9 +137,11 @@ def is_connected(remote_host, maxwait=2):
    # noinspection PyBroadException
    try:
        data = urlopen(remote_host, timeout=maxwait)
+        if data:
+            return True
    except:
        pass
-    return bool(data)
+    return False
 def ping_host(host, count=1):
@@ -158,13 +161,12 @@ def update_mirrors(config):
    :rtype: tuple
    """
    result = None
-    connected = is_connected("http://repo.manjaro.org")
+    mjro_online = is_connected("http://repo.manjaro.org")
-    if connected:
+    if mjro_online:
-        print(".: {} {} {}".format(txt.INF_CLR, txt.DOWNLOADING_MIRROR_FILE,
+        print(".: {} {} {}".format(txt.INF_CLR, txt.DOWNLOADING_MIRROR_FILE, txt.REPO_SERVER))
-                                        txt.REPO_SERVER))
        result = download_mirrors(config)
    else:
-        if not os.path.isfile(config["mirror_file"]):
+        if not filefn.check_file(config["mirror_file"]):
            print(".: {} {} {} {}".format(txt.WRN_CLR,
                                          txt.MIRROR_FILE,
                                          config["mirror_file"],
@@ -173,7 +175,8 @@ def update_mirrors(config):
                                       txt.FALLING_BACK,
                                       conf.FALLBACK))
            result = (True, False)
-        if not os.path.isfile(config["fallback_file"]):
+        if not filefn.check_file(config["fallback_file"]):
            print(".: {} {}".format(txt.ERR_CLR, txt.HOUSTON))
            result = (False, False)
    return result
--- a/pacman_mirrors/jsonfn.py
+++ b/pacman_mirrors/jsonfn.py
@@ -34,6 +34,7 @@ def read_json_file(filename, dictionary=True):
        else:
            with open(filename, "r") as infile:
                result = json.load(infile)
    except OSError:
        pass
    return result

--- a/pacman_mirrors/mirror.py
+++ b/pacman_mirrors/mirror.py
@@ -67,6 +67,6 @@ class Mirror:
        for server in mirrors:
            if status:
                self.add(server["country"], server["url"], server["protocols"],
-                            server["branches"], server["last_sync"])
+                         server["branches"], server["last_sync"])
            else:
                self.add(server["country"], server["url"], server["protocols"])
--- a/pacman_mirrors/mirrorfn.py
+++ b/pacman_mirrors/mirrorfn.py
@@ -32,14 +32,19 @@ def build_country_list(selectedcountries, countrylist, geoip=False):
    :rtype: list
    """
    result = []
-    if selectedcountries == ["all"]:
+    if selectedcountries:
-        result = countrylist
+        if selectedcountries == ["all"]:
-    elif validfn.country_list_is_valid(selectedcountries, countrylist):
+            result = countrylist
-        result = selectedcountries
+        else:
-    if not result and geoip:
+            if validfn.country_list_is_valid(selectedcountries, countrylist):
-        country = get_geoip_country(countrylist)
+                result = selectedcountries
-        if country:  # valid geoip
+    if not result:
-            result = country
+        if geoip:
+            country = get_geoip_country(countrylist)
+            if country:  # valid geoip
+                result = country
+            else:
+                result = countrylist
        else:
            result = countrylist
    return result

--- a/pacman_mirrors/miscfn.py
+++ b/pacman_mirrors/miscfn.py
@@ -44,4 +44,5 @@ def terminal_size():
    # http://www.programcreek.com/python/example/85471/shutil.get_terminal_size
    cols = shutil.get_terminal_size().columns
    lines = shutil.get_terminal_size().lines
-    return (cols, lines)
+    result = (cols, lines)
+    return result
--- a/pacman_mirrors/pacman_mirrors.py
+++ b/pacman_mirrors/pacman_mirrors.py
@@ -123,8 +123,7 @@ class PacmanMirrors:
        parser.add_argument("-f", "--fasttrack",
                            type=int,
                            metavar=txt.DIGIT,
-                            help="{} {}".format(txt.HLP_ARG_FASTTRACK,
+                            help="{} {}".format(txt.HLP_ARG_FASTTRACK, txt.OVERRIDE_OPT))
-                                                    txt.OVERRIDE_OPT))
        parser.add_argument("-l", "--list",
                            action="store_true",
                            help=txt.HLP_ARG_LIST)
@@ -350,8 +349,7 @@ class PacmanMirrors:
            if self.default and custom_list:
                if self.config["method"] == "rank":
                    custom_list = self.test_mirrors(custom_list)
-                    custom_list = sorted(custom_list,
+                    custom_list = sorted(custom_list, key=itemgetter("resp_time"))
-                                            key=itemgetter("resp_time"))
                else:
                    shuffle(custom_list)
@@ -372,18 +370,13 @@ class PacmanMirrors:
                print("--------------------------")
                # output mirror file
                jsonfn.write_json_file(mirrorfile, self.config["custom_file"])
-                print(".: {} {}: {}".format(txt.INF_CLR,
+                print(".: {} {}: {}".format(txt.INF_CLR, txt.CUSTOM_MIRROR_FILE_SAVED, self.config["custom_file"]))
-                                                txt.CUSTOM_MIRROR_FILE_SAVED,
-                                                self.config["custom_file"]))
                # output pacman mirrorlist
-                filefn.output_mirror_list(self.config, selected,
+                filefn.output_mirror_list(self.config, selected, custom=True, quiet=self.quiet, interactive=True)
-                                            custom=True, quiet=self.quiet,
-                                            interactive=True)
                # always use "Custom" from interactive
                self.config["only_country"] = ["Custom"]
                configfn.modify_config(self.config, custom=True)
-                print(".: {} {} {}".format(txt.INF_CLR, txt.RESET_CUSTOM_CONFIG,
+                print(".: {} {} {}".format(txt.INF_CLR, txt.RESET_CUSTOM_CONFIG, txt.RESET_TIP))
-                                            txt.RESET_TIP))
            else:
                print(".: {} {}".format(txt.WRN_CLR, txt.NO_SELECTION))
                print(".: {} {}".format(txt.INF_CLR, txt.NO_CHANGE))

--- a/share/mirrors.json
+++ b/share/mirrors.json
-[{"country":"Australia","url":"http://mirror.ventraip.net.au/Manjaro/","protocols":["http"]},{"country":"Australia","url":"http://manjaro.uberglobalmirror.com/","protocols":["http"]},{"country":"Australia","url":"http://manjaro.mirror.serversaustralia.com.au/","protocols":["http"]},{"country":"Austria","url":"http://mirror.inode.at/manjaro/","protocols":["http"]},{"country":"Belarus","url":"http://mirror.datacenter.by/pub/mirrors/manjaro/","protocols":["http"]},{"country":"Belgium","url":"http://ftp.belnet.be/manjaro/","protocols":["ftp","http"]},{"country":"Belgium","url":"https://manjaro.cu.be/","protocols":["https"]},{"country":"Brasil","url":"http://linorg.usp.br/manjaro/","protocols":["http"]},{"country":"Bulgaria","url":"https://mirrors.netix.net/manjaro/","protocols":["http","https"]},{"country":"Bulgaria","url":"http://manjaro.ipacct.com/manjaro/","protocols":["http"]},{"country":"Bulgaria","url":"http://manjaro.telecoms.bg/","protocols":["http"]},{"country":"Canada","url":"http://manjaro.cybr.ca/","protocols":["http"]},{"country":"Canada","url":"https://ca.mirror.babylon.network/manjaro/","protocols":["https"]},{"country":"Chile","url":"http://manjaro.dcc.uchile.cl/","protocols":["http"]},{"country":"Chile","url":"http://doge.ing.puc.cl/Mirrors/Manjaro/","protocols":["http"]},{"country":"China","url":"http://mirrors.ustc.edu.cn/manjaro/","protocols":["http"]},{"country":"China","url":"http://ftp.cuhk.edu.hk/pub/Linux/manjaro/","protocols":["ftp","http"]},{"country":"China","url":"http://mirrors.tuna.tsinghua.edu.cn/manjaro/","protocols":["http"]},{"country":"China","url":"https://mirrors.zju.edu.cn/manjaro/","protocols":["http","https"]},{"country":"Colombia","url":"http://mirror.edatel.net.co/manjaro/","protocols":["http"]},{"country":"Costa_Rica","url":"http://mirrors.ucr.ac.cr/manjaro/","protocols":["http"]},{"country":"Czech","url":"https://mirror.dkm.cz/manjaro/","protocols":["http","https"]},{"country":"Denmark","url":"https://mirrors.dotsrc.org/manjaro/","protocols":["http","https"]},{"country":"Denmark","url":"https://www.uex.dk/repos/manjaro/","protocols":["http","https"]},{"country":"Ecuador","url":"https://mirror.cedia.org.ec/manjaro/","protocols":["http","https"]},{"country":"Ecuador","url":"https://mirror.uta.edu.ec/manjaro/","protocols":["http","https"]},{"country":"Ecuador","url":"https://mirror.espoch.edu.ec/manjaro/","protocols":["http","https"]},{"country":"France","url":"http://manjarolinux.polymorf.fr/","protocols":["http"]},{"country":"France","url":"http://mirror.lignux.com/manjaro/","protocols":["http"]},{"country":"France","url":"http://ftp.free.org/mirrors/repo.manjaro.org/repos/","protocols":["ftp","http"]},{"country":"France","url":"https://fr.mirror.babylon.network/manjaro/","protocols":["https"]},{"country":"Germany","url":"http://mirror.ragenetwork.de/manjaro/","protocols":["http"]},{"country":"Germany","url":"http://ftp.halifax.rwth-aachen.de/manjaro/","protocols":["ftp","http"]},{"country":"Germany","url":"http://ftp.tu-chemnitz.de/pub/linux/manjaro/","protocols":["ftp","http"]},{"country":"Germany","url":"https://mirror.netzspielplatz.de/manjaro/packages/","protocols":["https"]},{"country":"Germany","url":"https://mirror.netcologne.de/manjaro/","protocols":["https"]},{"country":"Germany","url":"https://repo.rhindon.net/manjaro/","protocols":["https"]},{"country":"Germany","url":"https://repo.stdout.net/manjaro/","protocols":["http","https"]},{"country":"Germany","url":"https://manjaro-mirror-a.alpix.eu/","protocols":["http","https"]},{"country":"Germany","url":"http://ftp.rz.tu-bs.de/pub/mirror/manjaro.org/repos/","protocols":["ftp","http"]},{"country":"Greece","url":"http://ftp.cc.uoc.gr/mirrors/linux/manjaro/","protocols":["ftp","http"]},{"country":"Hungary","url":"http://mirror.infotronik.hu/mirrors/pub/manjaro/","protocols":["http"]},{"country":"Indonesia","url":"http://kambing.ui.ac.id/manjaro/","protocols":["http"]},{"country":"Indonesia","url":"http://kartolo.sby.datautama.net.id/manjaro/","protocols":["http"]},{"country":"Indonesia","url":"http://jaran.undip.ac.id/manjaro/","protocols":["http"]},{"country":"Ireland","url":"https://ftp.heanet.ie/mirrors/manjaro/","protocols":["ftp","https"]},{"country":"Italy","url":"http://manjaro.mirror.garr.it/mirrors/manjaro/","protocols":["http"]},{"country":"Italy","url":"http://ba.mirror.garr.it/mirrors/manjaro/","protocols":["http"]},{"country":"Italy","url":"http://ct.mirror.garr.it/mirrors/manjaro/","protocols":["http"]},{"country":"Japan","url":"http://ftp.tsukuba.wide.ad.jp/Linux/manjaro/","protocols":["ftp","http"]},{"country":"Japan","url":"http://ftp.riken.jp/Linux/manjaro/","protocols":["ftp","http"]},{"country":"Netherlands","url":"http://ftp.nluug.nl/pub/os/Linux/distr/manjaro/","protocols":["ftp","http"]},{"country":"Netherlands","url":"http://ftp.snt.utwente.nl/pub/linux/manjaro/","protocols":["ftp","http"]},{"country":"Netherlands","url":"https://nl.mirror.babylon.network/manjaro/","protocols":["https"]},{"country":"Philippines","url":"http://mirror.rise.ph/manjaro/","protocols":["http"]},{"country":"Poland","url":"http://mirror.chmuri.net/manjaro/","protocols":["http"]},{"country":"Portugal","url":"http://ftp.dei.uc.pt/pub/linux/manjaro/","protocols":["ftp","http"]},{"country":"Portugal","url":"http://manjaro.barata.pt/","protocols":["http"]},{"country":"Romania","url":"http://mirrors.serverhost.ro/manjaro/packages/","protocols":["http"]},{"country":"Romania","url":"http://ftp.lug.ro/manjaro/","protocols":["ftp","http"]},{"country":"Russia","url":"https://mirror.yandex.ru/mirrors/manjaro/","protocols":["http","https"]},{"country":"Singapore","url":"http://download.nus.edu.sg/mirror/manjaro/","protocols":["http"]},{"country":"South_Africa","url":"http://mirror.is.co.za/mirrors/manjaro.org/","protocols":["http"]},{"country":"Sweden","url":"https://ftp.lysator.liu.se/pub/manjaro/","protocols":["ftp","https"]},{"country":"Sweden","url":"http://mirror.zetup.net/manjaro/","protocols":["http"]},{"country":"Taiwan","url":"http://free.nchc.org.tw/manjaro/","protocols":["http"]},{"country":"Turkey","url":"http://ftp.linux.org.tr/manjaro/","protocols":["ftp","http"]},{"country":"United_Kingdom","url":"http://repo.manjaro.org.uk/","protocols":["http"]},{"country":"United_Kingdom","url":"https://www.mirrorservice.org/sites/repo.manjaro.org/repos/","protocols":["https"]},{"country":"United_Kingdom","url":"http://mirror.catn.com/pub/manjaro/","protocols":["http"]},{"country":"United_Kingdom","url":"http://manjaro.mirrors.uk2.net/","protocols":["http"]},{"country":"United_States","url":"http://mirror.dacentec.com/manjaro/","protocols":["http"]},{"country":"United_States","url":"http://mirror.jmu.edu/manjaro/","protocols":["http"]},{"country":"United_States","url":"http://mirror.solarvps.com/manjaro/","protocols":["http"]},{"country":"United_States","url":"http://mirror.nexcess.net/manjaro/","protocols":["http"]},{"country":"United_States","url":"http://distro.ibiblio.org/manjaro/","protocols":["http"]},{"country":"United_States","url":"http://mirror.clarkson.edu/manjaro/","protocols":["http"]},{"country":"United_States","url":"http://mirrors.ocf.berkeley.edu/manjaro/","protocols":["http"]},{"country":"Vietnam","url":"https://mirror.freedif.org/Manjaro/","protocols":["https"]}]
+[{"country": "Australia", "url": "http://mirror.ventraip.net.au/Manjaro/", "protocols": ["http"]}, {"country": "Australia", "url": "http://manjaro.uberglobalmirror.com/", "protocols": ["http"]}, {"country": "Australia", "url": "http://manjaro.mirror.serversaustralia.com.au/", "protocols": ["http"]}, {"country": "Austria", "url": "http://mirror.inode.at/manjaro/", "protocols": ["http"]}, {"country": "Belarus", "url": "http://mirror.datacenter.by/pub/mirrors/manjaro/", "protocols": ["http"]}, {"country": "Belgium", "url": "http://ftp.belnet.be/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Belgium", "url": "https://manjaro.cu.be/", "protocols": ["https"]}, {"country": "Brasil", "url": "http://linorg.usp.br/manjaro/", "protocols": ["http"]}, {"country": "Bulgaria", "url": "https://mirrors.netix.net/manjaro/", "protocols": ["http", "https"]}, {"country": "Bulgaria", "url": "http://manjaro.ipacct.com/manjaro/", "protocols": ["http"]}, {"country": "Bulgaria", "url": "http://manjaro.telecoms.bg/", "protocols": ["http"]}, {"country": "Canada", "url": "http://manjaro.cybr.ca/", "protocols": ["http"]}, {"country": "Canada", "url": "https://ca.mirror.babylon.network/manjaro/", "protocols": ["https"]}, {"country": "Chile", "url": "http://manjaro.dcc.uchile.cl/", "protocols": ["http"]}, {"country": "Chile", "url": "http://doge.ing.puc.cl/Mirrors/Manjaro/", "protocols": ["http"]}, {"country": "China", "url": "http://mirrors.ustc.edu.cn/manjaro/", "protocols": ["http"]}, {"country": "China", "url": "http://ftp.cuhk.edu.hk/pub/Linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "China", "url": "http://mirrors.tuna.tsinghua.edu.cn/manjaro/", "protocols": ["http"]}, {"country": "China", "url": "https://mirrors.zju.edu.cn/manjaro/", "protocols": ["http", "https"]}, {"country": "Colombia", "url": "http://mirror.edatel.net.co/manjaro/", "protocols": ["http"]}, {"country": "Costa_Rica", "url": "http://mirrors.ucr.ac.cr/manjaro/", "protocols": ["http"]}, {"country": "Czech", "url": "https://mirror.dkm.cz/manjaro/", "protocols": ["http", "https"]}, {"country": "Denmark", "url": "https://mirrors.dotsrc.org/manjaro/", "protocols": ["http", "https"]}, {"country": "Denmark", "url": "http://www.uex.dk/repos/manjaro/", "protocols": ["http"]}, {"country": "Ecuador", "url": "https://mirror.cedia.org.ec/manjaro/", "protocols": ["http", "https"]}, {"country": "Ecuador", "url": "https://mirror.uta.edu.ec/manjaro/", "protocols": ["http", "https"]}, {"country": "Ecuador", "url": "https://mirror.espoch.edu.ec/manjaro/", "protocols": ["http", "https"]}, {"country": "France", "url": "http://manjarolinux.polymorf.fr/", "protocols": ["http"]}, {"country": "France", "url": "http://mirror.lignux.com/manjaro/", "protocols": ["http"]}, {"country": "France", "url": "http://ftp.free.org/mirrors/repo.manjaro.org/repos/", "protocols": ["ftp", "http"]}, {"country": "France", "url": "https://fr.mirror.babylon.network/manjaro/", "protocols": ["https"]}, {"country": "Germany", "url": "http://mirror.ragenetwork.de/manjaro/", "protocols": ["http"]}, {"country": "Germany", "url": "http://ftp.halifax.rwth-aachen.de/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Germany", "url": "http://ftp.tu-chemnitz.de/pub/linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Germany", "url": "https://mirror.netzspielplatz.de/manjaro/packages/", "protocols": ["https"]}, {"country": "Germany", "url": "https://mirror.netcologne.de/manjaro/", "protocols": ["https"]}, {"country": "Germany", "url": "https://repo.rhindon.net/manjaro/", "protocols": ["https"]}, {"country": "Germany", "url": "http://mirrors.cicku.me/manjaro/", "protocols": ["http"]}, {"country": "Germany", "url": "https://repo.stdout.net/manjaro/", "protocols": ["http", "https"]}, {"country": "Germany", "url": "https://manjaro-mirror-a.alpix.eu/", "protocols": ["http", "https"]}, {"country": "Germany", "url": "http://ftp.rz.tu-bs.de/pub/mirror/manjaro.org/repos/", "protocols": ["ftp", "http"]}, {"country": "Greece", "url": "http://ftp.cc.uoc.gr/mirrors/linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Hungary", "url": "http://mirror.infotronik.hu/mirrors/pub/manjaro/", "protocols": ["http"]}, {"country": "Indonesia", "url": "http://kambing.ui.ac.id/manjaro/", "protocols": ["http"]}, {"country": "Indonesia", "url": "http://kartolo.sby.datautama.net.id/manjaro/", "protocols": ["http"]}, {"country": "Indonesia", "url": "http://jaran.undip.ac.id/manjaro/", "protocols": ["http"]}, {"country": "Ireland", "url": "https://ftp.heanet.ie/mirrors/manjaro/", "protocols": ["ftp", "https"]}, {"country": "Italy", "url": "http://manjaro.mirror.garr.it/mirrors/manjaro/", "protocols": ["http"]}, {"country": "Italy", "url": "http://ba.mirror.garr.it/mirrors/manjaro/", "protocols": ["http"]}, {"country": "Italy", "url": "http://ct.mirror.garr.it/mirrors/manjaro/", "protocols": ["http"]}, {"country": "Japan", "url": "http://ftp.tsukuba.wide.ad.jp/Linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Japan", "url": "http://ftp.riken.jp/Linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Netherlands", "url": "http://ftp.nluug.nl/pub/os/Linux/distr/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Netherlands", "url": "http://ftp.snt.utwente.nl/pub/linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Netherlands", "url": "https://nl.mirror.babylon.network/manjaro/", "protocols": ["https"]}, {"country": "Philippines", "url": "http://mirror.rise.ph/manjaro/", "protocols": ["http"]}, {"country": "Poland", "url": "http://mirror.chmuri.net/manjaro/", "protocols": ["http"]}, {"country": "Portugal", "url": "http://ftp.dei.uc.pt/pub/linux/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Portugal", "url": "http://repo.barata.website/", "protocols": ["http"]}, {"country": "Romania", "url": "http://mirrors.serverhost.ro/manjaro/packages/", "protocols": ["http"]}, {"country": "Romania", "url": "http://ftp.lug.ro/manjaro/", "protocols": ["ftp", "http"]}, {"country": "Russia", "url": "https://mirror.yandex.ru/mirrors/manjaro/", "protocols": ["http", "https"]}, {"country": "Russia", "url": "ftp://kibo.remi.lu/pub/", "protocols": ["ftp"]}, {"country": "Singapore", "url": "http://download.nus.edu.sg/mirror/manjaro/", "protocols": ["http"]}, {"country": "South_Africa", "url": "http://mirror.is.co.za/mirrors/manjaro.org/", "protocols": ["http"]}, {"country": "Sweden", "url": "https://ftp.lysator.liu.se/pub/manjaro/", "protocols": ["ftp", "https"]}, {"country": "Sweden", "url": "http://mirror.zetup.net/manjaro/", "protocols": ["http"]}, {"country": "Taiwan", "url": "http://free.nchc.org.tw/manjaro/", "protocols": ["http"]}, {"country": "Turkey", "url": "http://ftp.linux.org.tr/manjaro/", "protocols": ["ftp", "http"]}, {"country": "United_Kingdom", "url": "http://repo.manjaro.org.uk/", "protocols": ["http"]}, {"country": "United_Kingdom", "url": "https://www.mirrorservice.org/sites/repo.manjaro.org/repos/", "protocols": ["https"]}, {"country": "United_Kingdom", "url": "http://mirror.catn.com/pub/manjaro/", "protocols": ["http"]}, {"country": "United_Kingdom", "url": "http://manjaro.mirrors.uk2.net/", "protocols": ["http"]}, {"country": "United_States", "url": "http://mirror.dacentec.com/manjaro/", "protocols": ["http"]}, {"country": "United_States", "url": "http://mirror.jmu.edu/manjaro/", "protocols": ["http"]}, {"country": "United_States", "url": "http://mirror.solarvps.com/manjaro/", "protocols": ["http"]}, {"country": "United_States", "url": "http://mirror.nexcess.net/manjaro/", "protocols": ["http"]}, {"country": "United_States", "url": "http://distro.ibiblio.org/manjaro/", "protocols": ["http"]}, {"country": "United_States", "url": "http://mirror.clarkson.edu/manjaro/", "protocols": ["http"]}, {"country": "United_States", "url": "http://mirrors.ocf.berkeley.edu/manjaro/", "protocols": ["http"]}, {"country": "Vietnam", "url": "https://mirror.freedif.org/Manjaro/", "protocols": ["https"]}]
\ No newline at end of file