Changeset b20014b

Timestamp:

2015-05-09T12:17:54Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

17aa9a2

Parents:

199d51c

Message:

Store the hex_version coming from BitlBee as a tuple instead of raw, that's
a little nicer.

File:

• python/implugin.py (modified) (4 diffs)

python/implugin.py

@@ -25 +25 @@
 ]
 
+def make_version_tuple(hex):
+        """Convert the BitlBee binary-encoded version number into something
+        more "Pythonic". Could use distutils.version instead but its main
+        benefit appears to be string parsing which here is not that useful."""
+
+        return (hex >> 16, (hex >> 8) & 0xff, hex & 0xff)
+
 class RpcForwarder(object):
         """Tiny object that forwards RPCs from local Python code to BitlBee
@@ -50 +57 @@
         
         # Filled in during initialisation:
-        # Version code in hex. So if you need to do comparisions, for example
-        # check "self.bitlbee_version >= 0x030202" for versions 3.2.2+
+        # Version number as a three-tuple, so 3.2 becomes (3, 2, 0).
         bitlbee_version = None
         # Full version string
@@ -75 +81 @@
         def init(self, bee):
                 self.bee = RpcForwarder(bee["method_list"], self._conn.call)
-                self.bitlbee_version = bee["version"]
+                self.bitlbee_version = make_version_tuple(bee["version"])
                 self.bitlbee_version_str = bee["version_str"]
 
@@ -104 +110 @@
                 creds = {"username": account["user"], "password": account["pass"]}
                 r = self.ua.post(self.url("/api/login"), creds)
+                self.bee.log("You're running BitlBee %d.%d.%d" % self.bitlbee_version)
                 if r.status_code != 200:
                         self.bee.error("HTTP error %d" % r.status_code)