Changeset 10:b0048ba6f3ca in xplra for misc/client.py

Timestamp:

01/04/13 16:36:30 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Implemented the commands querying or setting multiple datarefs directly

File:

• misc/client.py (modified) (3 diffs)

misc/client.py

@@ -175 +175 @@
             print >> sys.stderr, "Error code:", result
 
-    def do_reg_multiget(self, args):
-        """Handle the 'reg_multiget' command"""
+    def do_multiget(self, args):
+        """Handle the 'multiget' command"""
         words = self._splitArgs(args)
         specs = []
@@ -190 +190 @@
             return False
 
+        self._writeU8(0x03)
+        self._writeU32(len(specs))
+        for (name, type, length, offset) in specs:
+            self._writeString(name)
+            self._writeU8(self._types[type])
+            if length is not None:
+                self._writeS32(length)
+                self._writeS32(offset)
+        self._flush()
+
+        result = self._readU8()
+        if result==0:
+            for (_, type, _, _) in specs:
+                value = self._readValue(type)
+                print value
+        elif result==0x02:
+            index = self._readU32()
+            print >> sys.stderr, "Invalid dataref at #%d" % (index,)
+        else:
+            print >> sys.stderr, "Error code:", result
+
+    def do_multiset(self, args):
+        """Handle the 'multiset' command"""
+        words = self._splitArgs(args)
+        specs = []
+        values = []
+        while words:
+            result = self._parseGetSpec(words)
+            if result is None:
+                return False
+            else:
+                words = result[1]
+                if not words:
+                    print >> sys.stderr, "Missing argument"
+                    return False
+                specs.append(result[0])
+                values.append(words[0])
+                words = words[1:]
+
+        if not specs:
+            return False
+
+        self._writeU8(0x04)
+        self._writeU32(len(specs))
+        for ((name, type, length, offset), value) in zip(specs, values):
+            self._writeString(name)
+            self._writeU8(self._types[type])
+            if length is not None:
+                self._writeS32(length)
+                self._writeS32(offset)
+            self._writeValue(type, value, length)
+        self._flush()
+
+        result = self._readU8()
+        if result==0x02:
+            index = self._readU32()
+            print >> sys.stderr, "Invalid dataref at #%d" % (index,)
+        elif result!=0:
+            print >> sys.stderr, "Error code:", result
+
+    def do_reg_multiget(self, args):
+        """Handle the 'reg_multiget' command"""
+        words = self._splitArgs(args)
+        specs = []
+        while words:
+            result = self._parseGetSpec(words)
+            if result is None:
+                return False
+            else:
+                specs.append(result[0])
+                words = result[1]
+
+        if not specs:
+            return False
+
         self._writeU8(0x11)
         self._writeU32(len(specs))
         for (name, type, length, offset) in specs:
-            print name, type
             self._writeString(name)
             self._writeU8(self._types[type])
@@ -275 +349 @@
         self._writeU32(len(specs))
         for (name, type, length, offset) in specs:
-            print name, type
             self._writeString(name)
             self._writeU8(self._types[type])