Ticket #4540: echelon_escape_like2.patch

source/tools/XpartaMuPP/EcheLOn.py

@@ -27 +27 @@
 from sleekxmpp.xmlstream.matcher import StanzaPath
 
 from sqlalchemy import func
+from sqlalchemy_utils import escape_like
 
 from LobbyRanking import session as db, Game, Player, PlayerInfo
 from ELO import get_rating_adjustment
@@ -45 +46 @@
       Retrieves the profile for the specified JID
     """
     stats = {}
-    player = db.query(Player).filter(Player.jid.ilike(str(JID)))
+    player = db.query(Player).filter(Player.jid.ilike(escape_like(str(JID)), "*"))
 
     if not player.first():
       return
@@ -109 +110 @@
                dict.values(gamereport['playerStates']))):
       return None
 
-    players = map(lambda jid: db.query(Player).filter(Player.jid.ilike(str(jid))).first(),
+    players = map(lambda jid: db.query(Player).filter(Player.jid.ilike(escape_like(str(jid)), "*")).first(),
                   dict.keys(gamereport['playerStates']))
 
     winning_jid = list(dict.keys({jid: state for jid, state in
@@ -154 +155 @@
     game = Game(map=gamereport['mapName'], duration=int(gamereport['timeElapsed']), teamsLocked=bool(gamereport['teamsLocked']), matchID=gamereport['matchID'])
     game.players.extend(players)
     game.player_info.extend(playerInfos)
-    game.winner = db.query(Player).filter(Player.jid.ilike(str(winning_jid))).first()
+    game.winner = db.query(Player).filter(Player.jid.ilike(escape_like(str(winning_jid)), "*")).first()
     db.add(game)
     db.commit()
     return game