Merge pull request #367 from piqueserver/rewrite-betterspades-version

Rewrite Betterspades os info

pyspades/player.py

@@ -4,6 +4,7 @@
 import shlex
 from itertools import product
 import textwrap
+import re
 
 from twisted.internet import reactor
 from twisted.logger import Logger
@@ -633,17 +634,22 @@ def on_handshake_recieved(self, contained: loaders.HandShakeReturn) -> None:
 
     @register_packet_handler(loaders.VersionResponse)
     def on_version_info_recieved(self, contained: loaders.VersionResponse) -> None:
+        self.client_info["version"] = contained.version
+        self.client_info["os_info"] = contained.os_info
         # TODO: Make this a dict lookup instead
         if contained.client == 'o':
             self.client_info["client"] = "OpenSpades"
         elif contained.client == 'B':
             self.client_info["client"] = "BetterSpades"
+            # BetterSpades currently sends the client name in the OS info to
+            # deal with old scripts that don't recognize the 'B' indentifier
+            match = re.match(r"\ABetterSpades \((.*)\)\Z", contained.os_info)
+            if match:
+                self.client_info["os_info"] = match.groups()[0]
         elif contained.client == 'a':
             self.client_info["client"] = "ACE"
         else:
             self.client_info["client"] = "Unknown({})".format(contained.client)
-        self.client_info["version"] = contained.version
-        self.client_info["os_info"] = contained.os_info
 
     @property
     def client_string(self):