network check so not run mirrortest if missing

pacman_mirrors/configuration.py

@@ -20,7 +20,6 @@
 """Pacman-Mirrors Configuration"""
 
 # this is for runing in dev environment
-# TODO: CHANGE BELOW IN PRODUCTION
 DEVELOPMENT = ""
 DESCRIPTION = "unstable development"
 # if DEVELOPMENT:

pacman_mirrors/customfn.py

@@ -81,8 +81,8 @@ class CustomFn:
         try:
             with open(
                 filename) as cnf, tempfile.NamedTemporaryFile(
-                "w+t", dir=os.path.dirname(
-                    filename), delete=False) as tmp:
+                    "w+t", dir=os.path.dirname(
+                        filename), delete=False) as tmp:
                 replaced = False
                 for line in cnf:
                     if "OnlyCountry" in line:

pacman_mirrors/filefn.py

@@ -57,7 +57,7 @@ class FileFn:
                 filename = FALLBACK
         if not filename:
             print("\n{}.:! {}{}\n".format(txt.RS,
-                                          "Houston?! we have a problem",
+                                          txt.HOUSTON,
                                           txt.CE))
             exit(1)
         result = (filename, status)
@@ -134,16 +134,4 @@ class FileFn:
         """
         workitem = mirror
         handle.write("## Country       : {}\n".format(workitem["country"]))
-        # TODO: approval to remove useless lines
-        # Commented since the info after a short time
-        # is no longer valid
-        if workitem["resp_time"] == txt.SERVER_RES:
-            workitem["resp_time"] = "N/A"
-        handle.write("## Response time : {}\n".format(
-            workitem["resp_time"]))
-        if workitem["last_sync"] == txt.SERVER_BAD or \
-                workitem["last_sync"] == txt.LASTSYNC_NA:
-            workitem["last_sync"] = "N/A"
-        handle.write("## Last Upd hh:mm: {}\n".format(
-            workitem["last_sync"]))
         handle.write("Server = {}\n\n".format(workitem["url"]))

pacman_mirrors/httpfn.py

@@ -150,4 +150,6 @@ class HttpFn:
                 print(".: {} {} {}".format(txt.WRN_CLR,
                                            txt.FALLING_BACK,
                                            FALLBACK))
+            if not FileFn.check_file(FALLBACK):
+                print(".: {} {}".format(txt.ERR_CLR, txt.HOUSTON))
             return False

pacman_mirrors/miscfn.py

@@ -27,4 +27,14 @@ class MiscFn:
 
     @staticmethod
     def debug(where, what, value):
+        """Helper for printing debug messages"""
         print("{} In function {} -> '{} = {}'".format(txt.DBG_CLR, where, what, value))
+
+    @staticmethod
+    def internet_connection_message(required=False):
+        """Message when internet connection is down"""
+        print(".: {} {}".format(txt.INF_CLR, txt.INTERNET_DOWN))
+        if required:
+            print(".: {} {}".format(txt.INF_CLR, txt.INTERNET_REQUIRED))
+        else:
+            print(".: {} {}".format(txt.INF_CLR, txt.MIRROR_RANKING_NA))

pacman_mirrors/pacman_mirrors.py

@@ -359,18 +359,20 @@ class PacmanMirrors:
             print(".: {} {}".format(txt.INF_CLR, txt.USING_DEFAULT_FILE))
         print(".: {} {} - {}".format(txt.INF_CLR, txt.QUERY_MIRRORS, txt.TAKES_TIME))
 
-        for mirror in worklist:
-            if not self.quiet:
-                print("   ..... {:<15}: {}".format(mirror["country"],
-                                                   mirror["url"]), end='')
-            # sys.stdout.flush()
-            resp_time = HttpFn.get_mirror_response(mirror["url"], quiet=self.quiet)
-            mirror["resp_time"] = resp_time
-            if resp_time == txt.SERVER_RES:
-                continue
-            if not self.quiet:
-                print("\r   {:<5}{}{} ".format(txt.GS, resp_time, txt.CE))
-        return worklist
+        if self.network:
+            for mirror in worklist:
+                if not self.quiet:
+                    print("   ..... {:<15}: {}".format(mirror["country"],
+                                                       mirror["url"]), end='')
+                # sys.stdout.flush()
+                resp_time = HttpFn.get_mirror_response(mirror["url"], quiet=self.quiet)
+                mirror["resp_time"] = resp_time
+                if resp_time == txt.SERVER_RES:
+                    continue
+                if not self.quiet:
+                    print("\r   {:<5}{}{} ".format(txt.GS, resp_time, txt.CE))
+            return worklist
+        MiscFn.internet_connection_message()
 
     def run(self):
         """Run"""
@@ -385,8 +387,7 @@ class PacmanMirrors:
             if self.network:
                 self.build_fasttrack_mirror_list(self.fasttrack)
             else:
-                print(".: {} {}".format(txt.INF_CLR, txt.NETWORK_DOWN))
-                print(".: {} {}".format(txt.INF_CLR, txt.NETWORK_REQUIRED))
+                MiscFn.internet_connection_message(True)
         else:
             if self.interactive:
                 self.build_interactive_mirror_list()

pacman_mirrors/txt.py

@@ -71,9 +71,10 @@ FALLING_BACK = _("Falling back to")
 IS_MISSING = _("is missing")
 MIRROR_FILE = _("The mirror file")
 MIRROR_LIST_SAVED = _("Mirrorlist generated and saved to")
+MIRROR_RANKING_NA = _("Mirror ranking is not available")
 MUST_BE_ROOT = _("Must have root privileges")
-NETWORK_DOWN = _("Internet connection appears to be down")
-NETWORK_NEEDED = _("Internet access is required to proceed")
+INTERNET_DOWN = _("Internet connection appears to be down")
+INTERNET_REQUIRED = _("Internet access is required to proceed")
 NO_CHANGE = _("The mirror list is not changed")
 NO_SELECTION = _("No mirrors in selection")
 OPTION = _("Option")
@@ -101,7 +102,7 @@ I_CONFIRM_SELECTION = _("Confirm selections")
 I_USE_THESE_MIRRORS = _("I want to use these mirrors")
 
 # NON TRANSLATABLE STRINGS
-
+HOUSTON = "Houston?! We have a problem."
 # mirror status constants
 LASTSYNC_OK = "24:00"  # last syncronize in the past 24 hours
 LASTSYNC_NA = "98:00"  # last syncronization not available