Minor changes.

b3/parser.py

@@ -326,7 +326,7 @@ def __init__(self, conf, options):
             game_log = self.config.get('server', 'game_log')
             if game_log[0:6] == 'ftp://' or game_log[0:7] == 'sftp://' or game_log[0:7] == 'http://':
                 self.remoteLog = True
-                self.bot('Working in remote-log mode: %s', game_log)
+                self.bot('Working in remote-log mode')
 
                 if self.config.has_option('server', 'local_game_log'):
                     f = self.config.getpath('server', 'local_game_log')

b3/parsers/cod4x.py

@@ -0,0 +1,227 @@
+#
+# BigBrotherBot(B3) (www.bigbrotherbot.net)
+# Copyright (C) 2005 Michael "ThorN" Thornton
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# CHANGELOG
+
+# 27/01/2016 - 0.1 - 82ndab-Bravo17     - initial release
+# 28/01/2016 - 0.2 - ph03n1x            - Correct parser Class name
+#                                       - Add unban and tempban methods from ph03n1x
+# 06/02/2016 - 0.3 - ph03n1x            - Correct indentation when calling tempban command
+#                                       - Limited reason string to 126 chars (max server can handle)
+# 10/02/2016 - 0.4 - ph03n1x            - Edited duration to convert float to integer before sending to server
+#                                       - removed custom strings in commands
+
+__author__ = 'ThorN, xlr8or, 82ndab-Bravo17, ph03n1x'
+__version__ = '0.4'
+
+import b3.clients
+import b3.functions
+import b3.parsers.cod4
+import re
+
+
+class Cod4XParser(b3.parsers.cod4.Cod4Parser):
+    gameName = 'cod4'
+    IpsOnly = False
+    _guidLength = 6
+
+    _regPlayer = re.compile(r'^\s*(?P<slot>[0-9]+)\s+'
+                            r'(?P<score>[0-9-]+)\s+'
+                            r'(?P<ping>[0-9]+)\s+'
+                            r'(?P<guid>[0-9]+)\s+'
+                            r'(?P<name>.*?)\s+'
+                            r'(?P<last>[0-9]+?)\s*'
+                            r'(?P<ip>(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}'
+                            r'(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])):?'
+                            r'(?P<port>-?[0-9]{1,5})\s*'
+                            r'(?P<qport>-?[0-9]{1,5})\s+'
+                            r'(?P<rate>[0-9]+)$', re.IGNORECASE | re.VERBOSE)
+
+    _commands = {
+        'message': 'tell %(cid)s %(message)s',
+        'say': 'say %(message)s',
+        'set': 'set %(name)s "%(value)s"',
+        'kick': 'clientkick %(cid)s %(reason)s ',
+        'ban': 'banclient %(cid)s %(reason)s ',
+        'unban': 'unban %(guid)s',
+        'tempban': 'tempban %(cid)s %(duration)sm %(reason)s',
+        'kickbyfullname': 'kick %(cid)s'
+    }
+
+    def unban(self, client, reason='', admin=None, silent=False, *kwargs):
+        """
+        Unban a client.
+        :param client: The client to unban
+        :param reason: The reason for the unban
+        :param admin: The admin who unbanned this client
+        :param silent: Whether or not to announce this unban
+        """
+        if self.PunkBuster:
+            if client.pbid:
+                result = self.PunkBuster.unBanGUID(client)
+
+                if result:                    
+                    admin.message('^3Unbanned^7: %s^7: %s' % (client.exactName, result))
+
+                if admin:
+                    variables = self.getMessageVariables(client=client, reason=reason, admin=admin)
+                    fullreason = self.getMessage('unbanned_by', variables)
+                else:
+                    variables = self.getMessageVariables(client=client, reason=reason)
+                    fullreason = self.getMessage('unbanned', variables)
+
+                if not silent and fullreason != '':
+                    self.say(fullreason)
+
+            elif admin:
+                admin.message('%s ^7unbanned but has no punkbuster id' % client.exactName)
+        else:
+            result = self.write(self.getCommand('unban', guid=client.guid, reason=reason))
+            if admin:
+                admin.message(result)
+
+    def tempban(self, client, reason='', duration=2, admin=None, silent=False, *kwargs):
+        """
+        Tempban a client.
+        :param client: The client to tempban
+        :param reason: The reason for this tempban
+        :param duration: The duration of the tempban
+        :param admin: The admin who performed the tempban
+        :param silent: Whether or not to announce this tempban
+        """
+        duration = b3.functions.time2minutes(duration)
+        if isinstance(client, b3.clients.Client) and not client.guid:
+            # client has no guid, kick instead
+            return self.kick(client, reason, admin, silent)
+        elif isinstance(client, str) and re.match('^[0-9]+$', client):
+            self.write(self.getCommand('tempban', cid=client, reason=reason))
+            return
+        elif admin:
+            banduration = b3.functions.minutesStr(duration)
+            variables = self.getMessageVariables(client=client, reason=reason, admin=admin, banduration=banduration)
+            fullreason = self.getMessage('temp_banned_by', variables)
+        else:
+            banduration = b3.functions.minutesStr(duration)
+            variables = self.getMessageVariables(client=client, reason=reason, banduration=banduration)
+            fullreason = self.getMessage('temp_banned', variables)
+
+        if self.PunkBuster:
+            # punkbuster acts odd if you ban for more than a day
+            # tempban for a day here and let b3 re-ban if the player
+            # comes back
+            duration = str(43200) if int(duration) > 43200 else int(duration)
+            self.PunkBuster.kick(client, duration, reason)
+        else:
+            # The server can only tempban a maximum of 43200 minutes. B3 will handle rebanning if needed.
+            duration = 43200 if int(duration) > 43200 else int(duration)
+            self.write(self.getCommand('tempban', cid=client.cid, reason=reason[:126], duration=duration))
+
+        if not silent and fullreason != '':
+            self.say(fullreason)
+
+        self.queueEvent(self.getEvent('EVT_CLIENT_BAN_TEMP', {'reason': reason,
+                                                              'duration': duration,
+                                                              'admin': admin}, client))
+        client.disconnect()
+
+
+    def getPlayerPings(self, filter_client_ids=None):
+        """
+        Returns a dict having players' id for keys and players' ping for values.
+        :param filter_client_ids: If filter_client_id is an iterable, only return values for the given client ids.
+        """
+        data = self.write('b3status')
+        if not data:
+            return {}
+
+        players = {}
+        for line in data.split('\n'):
+            m = re.match(self._regPlayerShort, line)
+            if not m:
+                m = re.match(self._regPlayer, line.strip())
+
+            if m:
+                players[str(m.group('slot'))] = int(m.group('ping'))
+
+        return players
+
+    def getPlayerScores(self):
+        """
+        Returns a dict having players' id for keys and players' scores for values.
+        """
+        data = self.write('b3status')
+        if not data:
+            return {}
+
+        players = {}
+        for line in data.split('\n'):
+            #self.debug('Line: ' + line + "-")
+            m = re.match(self._regPlayerShort, line)
+            if not m:
+                m = re.match(self._regPlayer, line.strip())
+
+            if m:  
+                players[str(m.group('slot'))] = int(m.group('score'))
+            #elif '------' not in line and 'map: ' not in line and 'num score ping' not in line:
+                #self.verbose('getPlayerScores() = Line did not match format: %s' % line)
+
+        return players
+
+    def getPlayerList(self, maxRetries=None):
+        """
+        Query the game server for connected players.
+        Return a dict having players' id for keys and players' data as another dict for values.
+        """
+        if self.PunkBuster:
+            return self.PunkBuster.getPlayerList()
+        else:
+            data = self.write('b3status', maxRetries=maxRetries)
+            if not data:
+                return {}
+
+            players = {}
+            lastslot = -1
+            for line in data.split('\n')[3:]:
+                m = re.match(self._regPlayer, line.strip())
+                if m:
+                    d = m.groupdict()
+                    if int(m.group('slot')) > lastslot:
+                        lastslot = int(m.group('slot'))
+                        d['pbid'] = None
+                        players[str(m.group('slot'))] = d
+
+                    else:
+                        self.debug('Duplicate or incorrect slot number - '
+                                   'client ignored %s last slot %s' % (m.group('slot'), lastslot))
+
+        return players
+
+    def getMap(self):
+        """
+        Return the current map/level name.
+        """
+        data = self.write('b3status')
+        if not data:
+            return None
+
+        line = data.split('\n')[0]
+        m = re.match(self._reMapNameFromStatus, line.strip())
+        if m:
+            return str(m.group('map'))
+
+        return None

b3/plugins/sftpytail/__init__.py

@@ -221,9 +221,9 @@ def handle_download(block):
                         self._remoteFileOffset = remotesize - self._maxGap
                     #self.debug('RETR from remote offset %s. (expecting to read at least %s bytes)' % (
                     #           self._remoteFileOffset, remoteSize - self._remoteFileOffset))
-                    if not rfile:
-                        self.debug('opening remote game log file %s for reading' % self.sftpconfig['path'])
-                        rfile = sftp.open(self.sftpconfig['path'], 'r')
+                    #if not rfile:
+                    self.debug('opening remote game log file %s for reading' % self.sftpconfig['path'])
+                    rfile = sftp.open(self.sftpconfig['path'], 'r')
                     rfile.seek(self._remoteFileOffset)
                     self.debug('reading remote game log file from offset %s' % self._remoteFileOffset)
                     handle_download(rfile.read())
@@ -354,4 +354,4 @@ def get_private_key(self, password=None):
             else:
                 raise ValueError("can't identify private key type")
             with open(self.private_key_file, "r") as f:
-                return key_type.from_private_key(f, password=password)
+                return key_type.from_private_key(f, password=password)

b3/querybuilder.py

@@ -189,7 +189,7 @@ def SelectQuery(self, fields, table, where='', orderby='', limit=0, offset='', g
         :param having: The HAVING clause for this select statement.
         :param keywords: Unused at the moment.
         """
-        sql = ['SELECT %s FROM %s' % (self.fieldStr(fields), table)]
+        sql = ['SELECT %s FROM `%s`' % (self.fieldStr(fields), table)]
 
         if where:
             sql.append("WHERE %s" % self.WhereClause(where))
@@ -278,4 +278,4 @@ def ReplaceQuery(self, data, table, delayed=None):
 
         sql += "(" + self.fieldStr(keys) + ") VALUES (" + ", ".join(values) + ")"
 
-        return sql
+        return sql