Add country code exclusion in connect command

Author: Galiley

protonvpn_cli/cli.py

@@ -115,6 +115,7 @@ def connect(self):
         group.add_argument("-f", "--fastest", help="Connect to the fastest ProtonVPN server.", action="store_true")
         group.add_argument("-r", "--random", help="Connect to a random ProtonVPN server.", action="store_true")
         group.add_argument("--cc", help="Connect to the specified country code (SE, PT, BR, AR).", metavar="")
+        group.add_argument("--not-cc", help="Connect to the fastest server not inside the specified country code (SE, PT, BR, AR).", metavar="")
         group.add_argument("--sc", help="Connect to the fastest Secure-Core server.", action="store_true")
         group.add_argument("--p2p", help="Connect to the fastest torrent server.", action="store_true")
         group.add_argument("--tor", help="Connect to the fastest Tor server.", action="store_true")
@@ -138,6 +139,8 @@ def connect(self):
             connection.direct(args.servername, protocol)
         elif args.cc:
             connection.country_f(args.cc, protocol)
+        elif args.not_cc:
+            connection.country_f(args.not_cc, protocol, True)
         elif args.p2p:
             connection.feature_f(self.server_features_dict.get("p2p", None), protocol)
         elif args.sc:
@@ -341,6 +344,9 @@ def print_examples():
         "protonvpn connect --cc AU\n"
         "               Connect to the fastest Australian server\n"
         "               with the default protocol.\n\n"
+        "protonvpn connect --not-cc AU\n"
+        "               Connect to the fastest server outside Australia\n"
+        "               with the default protocol.\n\n"
         "protonvpn c --p2p -p tcp\n"
         "               Connect to the fastest torrent server with TCP.\n\n"
         "protonvpn c --sc\n"

protonvpn_cli/connection.py

@@ -165,7 +165,7 @@ def fastest(protocol=None):
     openvpn_connect(fastest_server, protocol)
 
 
-def country_f(country_code, protocol=None):
+def country_f(country_code, protocol=None, excluded=False):
     """Connect to the fastest server in a specific country."""
     logger.debug("Starting fastest country connect")
 
@@ -185,15 +185,23 @@ def country_f(country_code, protocol=None):
     # Filter out excluded features and countries
     server_pool = []
     for server in servers:
-        if server["Features"] not in excluded_features and server["ExitCountry"] == country_code:
-            server_pool.append(server)
+        if server["Features"] not in excluded_features:
+            if (excluded and server["ExitCountry"] != country_code) or (not excluded and server["ExitCountry"] == country_code):
+                server_pool.append(server)
 
     if len(server_pool) == 0:
-        print(
-            "[!] No Server in country {0} found\n".format(country_code)
-            + "[!] Please choose a valid country"
-        )
-        logger.debug("No server in country {0}".format(country_code))
+        if not excluded:
+            print(
+                "[!] No Server in country {0} found\n".format(country_code)
+                + "[!] Please choose a valid country"
+            )
+            logger.debug("No server in country {0}".format(country_code))
+        else:
+            print(
+                "[!] No Server found outside country {0}\n".format(country_code)
+                + "[!] Please choose a valid country"
+            )
+            logger.debug("No server outside country {0}".format(country_code))
         sys.exit(1)
 
     fastest_server = get_fastest_server(server_pool)

protonvpn_cli/constants.py

@@ -27,6 +27,7 @@
     protonvpn (c | connect) [<servername>] [-p <protocol>]
     protonvpn (c | connect) [-f | --fastest] [-p <protocol>]
     protonvpn (c | connect) [--cc <code>] [-p <protocol>]
+    protonvpn (c | connect) [--not-cc <code>] [-p <protocol>]
     protonvpn (c | connect) [--sc] [-p <protocol>]
     protonvpn (c | connect) [--p2p] [-p <protocol>]
     protonvpn (c | connect) [--tor] [-p <protocol>]
@@ -44,6 +45,7 @@
     -f, --fastest       Select the fastest ProtonVPN server.
     -r, --random        Select a random ProtonVPN server.
     --cc CODE           Determine the country for fastest connect.
+    --not-cc CODE       Determine the country to exclude for fastest connect.
     --sc                Connect to the fastest Secure-Core server.
     --p2p               Connect to the fastest torrent server.
     --tor               Connect to the fastest Tor server.