Skip to content

Support revision string in addition to version string #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Techjar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support revision string in addition to version string #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions netplay_index/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def session_add(self):
"in_game",
"password",
"version",
"revision",
"method",
]:
new_session[key] = self.get_argument(key, default=None, strip=True)
Expand Down Expand Up @@ -177,6 +178,7 @@ def list(self):
password = self.get_argument("password", default=None)
region = self.get_argument("region", default=None)
version = self.get_argument("version", default=None)
revision = self.get_argument("revision", default=None)
in_game = self.get_argument("in_game", default=None)

filtered_sessions = list(sessions.get_all().values())
Expand All @@ -193,6 +195,9 @@ def list(self):
if version is not None:
filtered_sessions = _filter_string(filtered_sessions, "version", version)

if revision is not None:
filtered_sessions = _filter_string(filtered_sessions, "revision", revision)

try:
if password is not None:
filtered_sessions = _filter_string(
Expand Down
6 changes: 5 additions & 1 deletion netplay_index/tests/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,23 @@ def build_url(
password="1",
player_count="10",
server_id="1",
version="5.0-666",
revision="58d0e223547dd111d3e8975ad6ff7f1988fbddfe",
method="direct",
port="2626",
):
"""Return URL for testing purposes"""
return self.get_url(
"/v0/session/add?name={}&region={}&game={}&in_game={}&password={}&player_count={}&server_id={}&version=5.0-666&method={}&port={}".format(
"/v0/session/add?name={}&region={}&game={}&in_game={}&password={}&player_count={}&server_id={}&version={}&revision={}&method={}&port={}".format(
name,
region,
game,
in_game,
password,
player_count,
server_id,
version,
revision,
method,
port,
)
Expand Down
2 changes: 2 additions & 0 deletions netplay_index/tests/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def get_app(self):
"player_count": 2,
"game": "Some Game",
"version": "5.0-666",
"revision": "58d0e223547dd111d3e8975ad6ff7f1988fbddfe",
}

# Pretend that we are from the future so the test definitely has enough time to pass
Expand All @@ -59,6 +60,7 @@ def generate_session(self, timestamp=time.time()):
"player_count": 2,
"game": "Some Game",
"version": "5.0-666",
"revision": "58d0e223547dd111d3e8975ad6ff7f1988fbddfe",
"timestamp": timestamp,
}

Expand Down