Update protocols

opengsq/binary_reader.py

@@ -6,11 +6,11 @@ def __init__(self, data: bytes):
         self.__data = data
         self.stream_position = 0
 
-    def length(self) -> int:
+    def remaining_bytes(self) -> int:
         return len(self.__data) - self.stream_position
 
     def is_end(self) -> int:
-        return self.stream_position >= len(self.__data) - 1
+        return self.stream_position >= len(self.__data)
 
     def prepend_bytes(self, data):
         self.__data = data + self.__data
@@ -58,7 +58,7 @@ def read_float(self) -> float:
     def read_string(self, delimiters=[b'\x00'], encoding='utf-8', errors='ignore') -> str:
         bytes_string = b''
 
-        while self.length() > 0:
+        while self.remaining_bytes() > 0:
             stream_byte = bytes([self.read_byte()])
 
             if stream_byte in delimiters:

opengsq/protocols/doom3.py

@@ -41,11 +41,11 @@ async def get_info(self, strip_color=True):
         info['version'] = f'{major}.{minor}'
 
         # Read packet size
-        if br.read_long() != br.length():
+        if br.read_long() != br.remaining_bytes():
             br.stream_position -= 4
 
         # Key / value pairs, delimited by an empty pair
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             key = br.read_string().strip()
             val = br.read_string().strip()
 

opengsq/protocols/gamespy1.py

@@ -117,7 +117,7 @@ def __parse_as_key_values(self, br: BinaryReader, is_status=False):
         kv = {}
 
         # Bind key value
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             key = br.read_string(b'\\').lower()
 
             # Check is the end of key_values
@@ -137,7 +137,7 @@ def __parse_as_key_values(self, br: BinaryReader, is_status=False):
     def __parse_as_object(self, br: BinaryReader, is_player=False):
         items, keyhashes, filters = {}, [], []
 
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             # Get the key, for example player_1, frags_1, ping_1, etc...
             key = br.read_string(b'\\').lower()
 

opengsq/protocols/gamespy2.py

@@ -49,7 +49,7 @@ def __get_info(self, br: BinaryReader) -> dict:
         info = {}
 
         # Read all key values
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             key = br.read_string()
 
             if key == '':
@@ -71,7 +71,7 @@ def __get_players(self, br: BinaryReader) -> list:
         # Get all keys
         keys = []
 
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             key = br.read_string()
 
             if key == '':
@@ -97,7 +97,7 @@ def __get_teams(self, br: BinaryReader) -> list:
         # Get all keys
         keys = []
 
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             key = br.read_string()
 
             if key == '':

opengsq/protocols/quake1.py

@@ -41,7 +41,7 @@ def _parse_info(self, br: BinaryReader) -> dict:
         info = {}
 
         # Read all key values until meet \n
-        while br.length() > 0:
+        while br.remaining_bytes() > 0:
             key = br.read_string(self._delimiter1)
 
             if key == '':

opengsq/protocols/scum.py

@@ -59,7 +59,7 @@ async def query_master_servers() -> list:
                             total = br.read_short()
 
                         # server bytes length always 127
-                        while br.length() >= 127:
+                        while br.remaining_bytes() >= 127:
                             server = {}
                             server['ip'] = '.'.join(map(str, reversed([br.read_byte(), br.read_byte(), br.read_byte(), br.read_byte()])))
                             server['port'] = br.read_short()

opengsq/protocols/source.py

@@ -156,7 +156,7 @@ async def get_players(self) -> list:
             player['Duration'] = br.read_float()
             players.append(player)
 
-        if br.length() > 0:
+        if br.remaining_bytes() > 0:
             for i in range(player_count):
                 players[i]['Deaths'] = br.read_long()
                 players[i]['Money'] = br.read_long()

opengsq/protocols/unreal2.py

@@ -38,7 +38,7 @@ async def get_details(self):
         details['NumPlayers'] = br.read_long()
         details['MaxPlayers'] = br.read_long()
 
-        if br.length() > 12:
+        if br.remaining_bytes() > 12:
             try:
                 # Killing Floor
                 stream_position = br.stream_position