mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-08 01:38:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

use a named tuple on parse_game_ports

Browse Source
This commit is contained in:
Uriel
2026-03-07 17:13:50 -03:00
parent e2823aa044
commit 9ab7c56791
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WebHostLib/customserver.py
View File

@@ -184,8 +184,14 @@ class WebHostContext(Context):
return d
class GameRangePorts(typing.NamedTuple):
parsed_ports: list[range | list[int]]
weights: list[int]
ephemeral_allowed: bool
@functools.cache
def parse_game_ports(game_ports: tuple[str | int]):
def parse_game_ports(game_ports: tuple[str | int]) -> GameRangePorts:
parsed_ports: list[range | list[int]] = []
weights = []
ephemeral_allowed = False
@@ -205,13 +211,15 @@ def parse_game_ports(game_ports: tuple[str | int]):
weights.append(total_length)
parsed_ports.append([int(item)])
return parsed_ports, weights, total_length, ephemeral_allowed
return GameRangePorts(parsed_ports, weights, ephemeral_allowed)
def create_random_port_socket(game_ports: tuple[str | int], host: str) -> socket.socket:
parsed_ports, weights, length, ephemeral_allowed = parse_game_ports(game_ports)
parsed_ports, weights, ephemeral_allowed = parse_game_ports(game_ports)
# try to randomize the order of parsed ports with weights, but don't have duplicates of them
port_ranges = list(dict.fromkeys(random.choices(parsed_ports, weights=weights, k=len(parsed_ports)) + parsed_ports))
port_ranges = list(
dict.fromkeys(random.choices(parsed_ports, cum_weights=weights, k=len(parsed_ports)) + parsed_ports)
)
remaining = 1024
for r in port_ranges:
r_length = len(r)