From a8fa65a507a5ef1beb45b2da817ee56624ec3fdb Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Tue, 7 Feb 2017 22:25:41 -0500 Subject: [PATCH] Update the is_supported_game_type function to use the new object. --- xonstat/views/submission.py | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py index 89c3efb..1b7417f 100644 --- a/xonstat/views/submission.py +++ b/xonstat/views/submission.py @@ -295,17 +295,8 @@ def has_required_metadata(submission): and submission.server_name is not None) -def get_remote_addr(request): - """Get the Xonotic server's IP address""" - if 'X-Forwarded-For' in request.headers: - return request.headers['X-Forwarded-For'] - else: - return request.remote_addr - - -def is_supported_gametype(gametype, version): - """Whether a gametype is supported or not""" - is_supported = False +def is_supported_gametype(submission): + """Determines if a submission is of a valid and supported game type.""" # if the type can be supported, but with version constraints, uncomment # here and add the restriction for a specific version below @@ -328,18 +319,23 @@ def is_supported_gametype(gametype, version): 'tdm', ) - if gametype in supported_game_types: - is_supported = True - else: - is_supported = False + is_supported = submission.game_type_cd in supported_game_types # some game types were buggy before revisions, thus this additional filter - if gametype == 'ca' and version <= 5: + if submission.game_type_cd == 'ca' and submission.version <= 5: is_supported = False return is_supported +def get_remote_addr(request): + """Get the Xonotic server's IP address""" + if 'X-Forwarded-For' in request.headers: + return request.headers['X-Forwarded-For'] + else: + return request.remote_addr + + def do_precondition_checks(request, game_meta, raw_players): """Precondition checks for ALL gametypes. These do not require a database connection.""" @@ -422,9 +418,6 @@ def has_minimum_real_players(settings, player_events): return flg_has_min_real_players - - - def should_do_weapon_stats(game_type_cd): """True of the game type should record weapon stats. False otherwise.""" if game_type_cd in 'cts': -- 2.39.2