Changeset 1785

Timestamp:

02/21/07 01:06:19 (22 months ago)

Author:

abaumann

Message:

update motosync to new data/change API, use new ObjTypeSinkCallbacks? class, and clean up a bit
this is still untested, but has a slim chance of working if the OpenSync? XML format is unchanged

Files:

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

plugins/moto-sync/motosync.py

@@ -12 +12 @@
 __revision__ = "$Id$"
 
-import sys, os, types, traceback, md5, time, calendar, re
+import sys, os, types, md5, time, calendar, re
 import xml.dom.minidom
 from datetime import date, datetime, timedelta, time as datetime_time
@@ -396 +396 @@
 
     def connect(self):
+        """Connect to the phone and initiate communication."""
         if BT_MAC_RE.match(self.devstr):
             assert(USE_BLUETOOTH_MODULE,
                    "MAC address specified, but pybluez module is not available")
-            
+
             # search for the port to use on the device
             port = BT_DEFAULT_CHANNEL
-            found = bluetooth.find_service(name=BT_SERVICE_NAME, address=self.devstr)
+            found = bluetooth.find_service(name=BT_SERVICE_NAME,
+                                           address=self.devstr)
             if found:
                 assert(found[0]['protocol'] == 'RFCOMM')
@@ -437 +439 @@
 
     def disconnect(self):
+        """Disconnect from the phone."""
         self.close_calendar()
         if self.__fd:
@@ -503 +506 @@
             for (expos, exnum, extype) in self.__parse_results('MDBRE', data):
                 if extype != 1: # haven't seen anything else
-                    raise opensync.Error('unexpected exception type %d' % extype)
+                    raise opensync.Error('unexpected exception type %d'%extype)
                 if not exceptions.has_key(expos):
                     exceptions[expos] = []
@@ -1483 +1486 @@
      Interfaces between PhoneComms/PhoneEntry classes and SyncClass below.
      """
-    def __init__(self, comms):
+    def __init__(self, comms, info):
         self.comms = comms
         self.serial = None
@@ -1490 +1493 @@
         self.revcategories = {}
 
+        # find ObjFormat objects for our types
+        self.objformats = {}
+        for objtype in SUPPORTED_OBJTYPES:
+            formatstr = "xml-%s-doc" % objtype
+            self.objformats[objtype] = info.format_env.find_objformat(formatstr)
+
     def connect(self):
+        """Connect to the phone and setup our data structures."""
         self.comms.connect()
-        self.serial = comms.read_serial()
+        self.serial = self.comms.read_serial()
 
         # check that the phone supports the features we need
-        features = comms.read_features()
+        features = self.comms.read_features()
         for (bit, desc) in REQUIRED_FEATURES:
             if not features[bit]:
@@ -1503 +1513 @@
         # read current time on the phone, check if it matches our local time
         # FIXME: allow the user to configure a different timezone for the phone
-        timestr = comms.read_time()[:-3]
+        timestr = self.comms.read_time()[:-3]
         phone_now = time.strptime(timestr, '%y/%m/%d,%H:%M:%S')
         local_now = time.localtime()
@@ -1522 +1532 @@
 
     def disconnect(self):
+        """Disconnect from the phone."""
         self.comms.disconnect()
 
-    def list_changes(self, objtype, info):
+    def list_changes(self, objtype):
         """Return a list of change objects for all entries of the given type."""
 
@@ -1544 +1555 @@
         ret = []
         for entry in entries:
+            if objtype == 'contact':
+                xmldata = entry.to_xml(self.categories)
+            else:
+                xmldata = entry.to_xml()
+            data = opensync.Data(xmldata, self.objformats[objtype])
+            data.objtype = objtype
             change = opensync.Change()
-            change.member = member
-            change.objtype = objtype
+            change.data = data
             change.uid = self.__generate_uid(entry)
-            change.format = "xml-%s-doc" % objtype
-            if objtype == 'contact':
-                change.data = entry.to_xml(self.categories)
-            else:
-                change.data = entry.to_xml()
             change.hash = self.__gen_hash(entry)
             ret.append(change)
@@ -1578 +1589 @@
         """
         objtype = change.objtype
-        if change.format != 'xml-%s-doc' % objtype:
-            raise opensync.Error("unhandled data format %s" % change.format,
+        if change.objformat != self.objformats[objtype]:
+            raise opensync.Error("unhandled data format "+change.objformat.name,
                                  opensync.ERROR_NOT_SUPPORTED)
         try:
             if objtype == 'event':
-                entry = PhoneEventXML(change.data)
+                entry = PhoneEventXML(change.data.data)
             elif objtype == 'contact':
-                entry = PhoneContactXML(change.data, self.revcategories)
+                entry = PhoneContactXML(change.data.data, self.revcategories)
         except UnsupportedDataError, e:
             warning("%s is unsupported (%s), ignored" % (change.uid, str(e)))
@@ -1591 +1602 @@
             # if its modified and we've seen it before, delete it
             # otherwise just ignore it
-            if (change.changetype == opensync.CHANGE_MODIFIED
+            if (change.changetype == opensync.CHANGE_TYPE_MODIFIED
                 and self.uid_seen(change.uid)):
-                change.changetype = opensync.CHANGE_DELETED
+                change.changetype = opensync.CHANGE_TYPE_DELETED
                 change.data = None
                 return self.delete_entry(change.uid)
@@ -1599 +1610 @@
                 return False
         
-        if change.changetype == opensync.CHANGE_ADDED:
+        if change.changetype == opensync.CHANGE_TYPE_ADDED:
             # allocate positions for the new entry
             positions = self.positions[objtype].alloc(entry.num_pos())
@@ -1677 +1688 @@
 
 
-class MotoSink(opensync.ObjTypeSink):
+class MotoSink(opensync.ObjTypeSinkCallbacks):
     """Event synchronisation class used by OpenSync."""
 
     def __init__(self, objtype, info, access):
-        opensync.ObjTypeSink.__init__(self, objtype, self)
+        opensync.ObjTypeSinkCallbacks.__init__(self, objtype)
         self.objtype = objtype
-        self.add_objformat("xml-%s-doc" % objtype)
+        self.sink.add_objformat("xml-%s-doc" % objtype)
         self.access = access
         hashpath = os.path.join(info.configdir, "%s-hash.db" % objtype)
@@ -1694 +1705 @@
     def get_changes(self, info, ctx):
         """Report all OSyncChange objects for entries on the phone."""
-        if self.slowsink:
+        if self.sink.slowsync:
             self.hashtable.reset()
-        for change in self.access.list_changes(self.objtype, info):
+        for change in self.access.list_changes(self.objtype):
             self.hashtable.report(change.uid)
-            change.changetype = self.hashtable.get_changetype(change.uid, change.hash)
-            if change.changetype != opensync.CHANGE_UNMODIFIED:
-                self.hashtable.update_hash(change.changetype, change.uid, change.hash)
+            change.changetype = self.hashtable.get_changetype(change.uid,
+                                                              change.hash)
+            if change.changetype != opensync.CHANGE_TYPE_UNMODIFIED:
+                self.hashtable.update_hash(change.changetype, change.uid,
+                                           change.hash)
                 ctx.report_change(change)
         for uid in self.hashtable.get_deleted():
             change = opensync.Change()
             change.uid = uid
-            change.changetype = opensync.CHANGE_DELETED
+            change.changetype = opensync.CHANGE_TYPE_DELETED
             ctx.report_change(change)
-            hashtable.update_hash(opensync.CHANGE_DELETED, uid, None)
+            self.hashtable.update_hash(opensync.CHANGE_TYPE_DELETED, uid, None)
 
     def commit(self, info, ctx, change):
@@ -1714 +1727 @@
             raise opensync.Error('unsupported objtype %s' % change.objtype,
                                  opensync.ERROR_NOT_SUPPORTED)
-        if change.changetype == opensync.CHANGE_DELETED:
+        if change.changetype == opensync.CHANGE_TYPE_DELETED:
             success = (self.access.uid_seen(change.uid)
                        and self.access.delete_entry(change.uid))
-        elif change.changetype == opensync.CHANGE_MODIFIED:
+        elif change.changetype == opensync.CHANGE_TYPE_MODIFIED:
             old_uid = change.uid
             success = self.access.update_entry(change)
@@ -1723 +1736 @@
             # the old one was deleted, to keep it consistent
             if (success and old_uid != change.uid):
-                self.hashtable.update_hash(opensync.CHANGE_DELETED, old_uid, None)
+                self.hashtable.update_hash(opensync.CHANGE_TYPE_DELETED,
+                                           old_uid, None)
         else:
             success = self.access.update_entry(change)
         if success:
-            self.hashtable.update_hash(change.changetype, change.uid, change.hash)
-
-    def sync_done(self, info, ctx):
-        """Called when the sync is complete."""
-        self.hashtable.forget()
-        self.hashtable.close()
+            self.hashtable.update_hash(change.changetype, change.uid,
+                                       change.hash)
 
     def disconnect(self, info, ctx):
@@ -1758 +1768 @@
     access = PhoneAccess(comms)
     for objtype in SUPPORTED_OBJTYPES:
-        info.add_objtype(MotoSink(objtype, info, access))
+        info.add_objtype(MotoSink(objtype, info, access).sink)
 
 def discover(info):
-    """Called by python-module plugin wrapper, discovers capabilities of device."""
+    """Called by python-module wrapper, discovers capabilities of device."""
     for sink in info.objtypes:
         sink.available = True