diff --git a/StorrageBackend.py b/StorrageBackend.py index 13ee9d5..c5ce6fc 100644 --- a/StorrageBackend.py +++ b/StorrageBackend.py @@ -112,6 +112,11 @@ def getPlayer(pid, name="NOTFOUND"): return known_player[pid] def fuzzy_find_player(name): + return "Not Implemented" + +def findPlayer(name): + global player_ranks + ret = "" tup_list = [] TS.lock() @@ -122,7 +127,21 @@ def fuzzy_find_player(name): finally: TS.unlock() tmp = sorted(tup_list, key=lambda x: x[0], reverse=True) - return list(filter(lambda x: x[0] > 80, tmp)) + players = list([x[1] for x in filter(lambda x: x[0] > 80, tmp)]) + + # update ranks # + updatePlayerRanks(force=True) + + # build rank tupel # + playerRankTupel = [] + for p in players: + try: + playerRankTupel += [(p, player_ranks[p])] + except KeyError: + playerRankTupel += [(p, "N/A")] + + return playerRankTupel + def get_player_rank(p): global player_ranks diff --git a/httpAPI.py b/httpAPI.py index 0c42b7a..fe184ca 100644 --- a/httpAPI.py +++ b/httpAPI.py @@ -35,5 +35,5 @@ def getRankRange(): @app.route('/findplayer') def findPlayer(): string = flask.request.args.get("string") - players = SB.fuzzy_find_player(string) - return "|".join([p.serialize() for p in players]) + players = SB.findPlayer(string) + return "|".join([pt[0].serialize() + "," + str(pt[1]) for pt in players])