Fix merge conflict, change indentation a bit.

[xonotic/xonstat.git] / xonstat / views / player.py

diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index 9a5457a3074d6667248d9de3bb6e0522213b1db9..d2112515ed82ff1cc911a2b993667d9976fbef69 100644 (file)
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -45,6 +45,13 @@ def player_index(request):
     return _player_index_data(request)
 
 
     return _player_index_data(request)
 
 

+def player_index_json(request):
+    """
+    Provides a list of all the current players. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+

 def _get_games_played(player_id):
     """
     Provides a breakdown by gametype of the games played by player_id.
 def _get_games_played(player_id):
     """
     Provides a breakdown by gametype of the games played by player_id.


@@ -266,6 +273,13 @@ def player_info(request):
     return _player_info_data(request)
 
 
     return _player_info_data(request)
 
 

+def player_info_json(request):
+    """
+    Provides detailed information on a specific player. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+

 def _player_game_index_data(request):
     player_id = request.matchdict['player_id']
 
 def _player_game_index_data(request):
     player_id = request.matchdict['player_id']
 


@@ -309,6 +323,15 @@ def player_game_index(request):
     return _player_game_index_data(request)
 
 
     return _player_game_index_data(request)
 
 

+def player_game_index_json(request):
+    """
+    Provides an index of the games in which a particular
+    player was involved. This is ordered by game_id, with
+    the most recent game_ids first. Paginated. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+

 def _player_accuracy_data(request):
     player_id = request.matchdict['id']
     allowed_weapons = ['nex', 'rifle', 'shotgun', 'uzi', 'minstanex']
 def _player_accuracy_data(request):
     player_id = request.matchdict['id']
     allowed_weapons = ['nex', 'rifle', 'shotgun', 'uzi', 'minstanex']


@@ -346,6 +369,13 @@ def _player_accuracy_data(request):
             }
 
 
             }
 
 

+def player_accuracy(request):
+    """
+    Provides the accuracy for the given weapon. (JSON only)
+    """
+    return _player_accuracy_data(request)
+
+

 def player_accuracy_json(request):
     """
     Provides a JSON response representing the accuracy for the given weapon.
 def player_accuracy_json(request):
     """
     Provides a JSON response representing the accuracy for the given weapon.