Skip to content
This repository was archived by the owner on Nov 5, 2025. It is now read-only.

Decode feature flags for protonvpn s #368

Open
marcel-engelke wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Decode feature flags for protonvpn s #368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cfabb6
fix(#367): decode server feature bit flags
marcel-engelke Mar 24, 2024
92353fc
refactor(#367): use new fn with dialog
marcel-engelke Mar 24, 2024
d5b8465
refactor(#367): use new fn with 2nd dialog
marcel-engelke Mar 24, 2024
ca6261b
Add IPv6 to server features
zPhoeniqz Dec 9, 2024
e749309
Merge pull request #2 from zPhoeniqz/367-protonvpn-s
marcel-engelke Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions protonvpn_cli/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ def show_dialog(headline, choices, stop=False):

pull_server_data()

features = {
1: "Secure-Core",
2: "Tor",
4: "P2P",
8: "Streaming",
}
server_tiers = {0: "F", 1: "B", 2: "P"}

servers = get_servers()
Expand Down Expand Up @@ -106,21 +100,17 @@ def show_dialog(headline, choices, stop=False):
get_server_value(servername, "Load", servers)
).rjust(3, " ")

servers_features = []
feat = int(get_server_value(servername, 'Features', servers))
for bit_flag in features:
if (feat & bit_flag) != 0:
servers_features.append(features[bit_flag])
server_features = get_server_features(servername, servers)
Copy link
Copy Markdown

@guyboertje guyboertje Jan 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcel-engelke Is this variable rename necessary? It forces 3 other changes that are not code fixes per se. (maybe these little 'extras' are blocking a good review and merge?)


if len(servers_features) == 0:
servers_features.append("Normal")
if len(server_features) == 0:
server_features.append("Normal")

tier = server_tiers[
get_server_value(servername, "Tier", servers)
]

choices.append((servername, "Load: {0}% | {1} | {2}".format(
load, tier, ", ".join(servers_features)
load, tier, ", ".join(server_features)
)))

server_result = show_dialog("Choose the server to connect:", choices)
Expand Down
3 changes: 3 additions & 0 deletions protonvpn_cli/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ def get_servers():
# Sort server IDs by Tier
return [server for server in servers if server["Tier"] <= user_tier and server["Status"] == 1] # noqa


Copy link
Copy Markdown

@guyboertje guyboertje Jan 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcel-engelke Are these extra linefeeds necessary?

def get_server_value(servername, key, servers):
"""Return the value of a key for a given server."""
value = [server[key] for server in servers if server['Name'] == servername]
return value[0]


def get_server_features(servername, servers):
"""Decode server feature bit flags and return feature strings in list"""
feat = int(get_server_value(servername, "Features", servers))
Expand All @@ -129,6 +131,7 @@ def get_server_features(servername, servers):
server_features.append(SERVER_FEATURES[bit_flag])
return server_features


def get_config_value(group, key):
"""Return specific value from CONFIG_FILE as string"""
config = configparser.ConfigParser()
Expand Down