Changeset 1793

Timestamp:

02/21/07 11:05:18 (2 years ago)

Author:

abaumann

Message:

* protect against multiple calls to connect()
* add code to read mobile version/model information and report it
* use new xmlformat-*-doc formats

still broken, but now it doesn't crash! next, I need to update the XML

Files:

• plugins/moto-sync/motosync.py (modified) (7 diffs)

plugins/moto-sync/motosync.py

@@ -396 +396 @@
-
-    def connect(self):
-
+
+
+
+
+
+
+
-        if BT_MAC_RE.match(self.devstr):
-            assert(USE_BLUETOOTH_MODULE,
@@ -437 +443 @@
-        self.contact_data_len = contactlen
-        self.contact_name_len = namelen
+        
+        return True
-
-    def disconnect(self):
@@ -452 +460 @@
-        data = self.__do_cmd('AT+CGSN')
-        return self.__parse_results('CGSN', data)[0][0]
+
+    def read_version(self):
+        """read the phone's software version number"""
+        data = self.__do_cmd('AT+CGMR')
+        return self.__parse_results('CGMR', data)[0][0]
+
+    def read_model(self):
+        """read the phone's hardware model number"""
+        data = self.__do_cmd('AT+CGMM')
+        for s in self.__parse_results('CGMM', data)[0]:
+            if s.startswith("MODEL="):
+                return s.split("=", 1)[1]
+        return None
-
-    def read_time(self):
@@ -1492 +1513 @@
-        self.categories = {}
-        self.revcategories = {}
+        self.objformats = {}
-
-        # find ObjFormat objects for our types
-        self.objformats = {}
-        for objtype in SUPPORTED_OBJTYPES:
-
-
+
+
+
+
+
-
-    def connect(self):
-        """Connect to the phone and setup our data structures."""
-
+
+
-        self.serial = self.comms.read_serial()
-
@@ -1694 +1719 @@
-        opensync.ObjTypeSinkCallbacks.__init__(self, objtype)
-        self.objtype = objtype
-
+format
-        self.access = access
-        hashpath = os.path.join(info.configdir, "%s-hash.db" % objtype)
@@ -1766 +1791 @@
-    """Called by python-module plugin wrapper, registers sync classes."""
-    comms = PhoneComms(parse_config(info.config))
-
+, info
-    for objtype in SUPPORTED_OBJTYPES:
-        info.add_objtype(MotoSink(objtype, info, access).sink)
@@ -1772 +1797 @@
-def discover(info):
-    """Called by python-module wrapper, discovers capabilities of device."""
+    # HACK HACK, grab the comms object out of the initialised sink
+    comms = info.nth_objtype(0).callback_obj.access.comms
+    comms.connect()
+    version = opensync.Version()
+    version.plugin = "moto-sync"
+    version.softwareversion = str(comms.read_version())
+    version.modelversion = str(comms.read_model())
+    version.identifier = str(comms.read_serial())
+    # FIXME: discover and set capabilities
+    comms.disconnect()
+    info.version = version
+
+    # for now, all objtypes are supported on all devices
-    for sink in info.objtypes:
-        sink.available = True
-    info.version = opensync.Version()
-    info.version.plugin = "moto-sync"
-
-def get_sync_info(plugin):