Changeset 1807

Timestamp:

02/24/07 06:31:43 (22 months ago)

Author:

abaumann

Message:

fix a bug writing where changes were rejected due to an invalid
objformat, even though the format was actually fine

strangely, this didn't prevent the sync from reporting success, even
though the commit function returned FALSE and reported an OSyncError?

also do some cleanup, white-space / line length changes

Files:

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

plugins/moto-sync/motosync.py

@@ -166 +166 @@
 # logical order of the fields in structured XML data
 XML_NAME_PARTS = 'Prefix FirstName Additional LastName Suffix'.split()
-XML_ADDRESS_PARTS = ('Street ExtendedAddress'
-                     + ' Locality Region PostalCode Country').split()
+XML_ADDRESS_PARTS = ('Street ExtendedAddress Locality Region PostalCode Country').split()
 
 # legal characters in telephone numbers
@@ -189 +188 @@
     """Like DOM's getElementsByTagName, but allow multiple tag names."""
     for node in parent.childNodes:
-        if (node.nodeType == xml.dom.minidom.Node.ELEMENT_NODE
-            and node.tagName in tagnames):
+        if (node.nodeType == xml.dom.minidom.Node.ELEMENT_NODE and node.tagName in tagnames):
             ret.append(node)
         getElementsByTagNames(node, tagnames, ret)
@@ -241 +239 @@
 DATETIME_PART = '(?:%s)?(?:%s)?' % (DATE_PART, TIME_PART)
 WEEKS_PART = r'(\d+)W'
-DURATION_REGEX = re.compile(r'([-+]?)P(?:%s|%s)$'
-                            % (WEEKS_PART, DATETIME_PART))
+DURATION_REGEX = re.compile(r'([-+]?)P(?:%s|%s)$' % (WEEKS_PART, DATETIME_PART))
 
 def parse_ical_duration(duratstr):
@@ -444 +441 @@
             # 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')
@@ -562 +558 @@
             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] = []
@@ -691 +687 @@
         debug('<-- ' + ret)
         if c == '': # EOF, shouldn't happen
-            raise opensync.Error('Unexpected EOF talking to phone',
-                                 opensync.ERROR_IO_ERROR)
+            raise opensync.Error('Unexpected EOF talking to phone', opensync.ERROR_IO_ERROR)
         return ret
 
@@ -718 +713 @@
             return ret
         else:
-            raise opensync.Error("Error in phone command '%s'" % cmd,
-                                 opensync.ERROR_IO_ERROR)
+            raise opensync.Error("Error in phone command '%s'" % cmd, opensync.ERROR_IO_ERROR)
 
     def __parse_results(self, restype, lines):
@@ -779 +773 @@
                 return '%d'
             else:
-                assert(t == types.StringType or t == types.UnicodeType,
-                       'unexpected type %s' % str(t))
+                assert(t == types.StringType or t == types.UnicodeType, 'unexpected type %s' % str(t))
                 return '"%s"'
 
@@ -1002 +995 @@
             e.setAttribute('DateValue', 'DATE')
             for exnum in self.exceptions:
-                appendXMLChild(doc, e, 'Content',
-                               format_time(rrule[exnum], VCAL_DATE))
+                appendXMLChild(doc, e, 'Content', format_time(rrule[exnum], VCAL_DATE))
             if e.hasChildNodes():
                 top.appendChild(e)
@@ -1066 +1058 @@
         if event.getElementsByTagName('Duration') != []:
             duration = event.getElementsByTagName('Duration')[0]
-            def tryint(s):
-                if s == '':
+            def toint(numstr):
+                """Convert a string to an integer, unless it's empty, in which case return 0."""
+                if numstr == '':
                     return 0
                 else:
-                    return int(s)
-            weeks = tryint(getXMLField(duration, 'Weeks'))
-            days = tryint(getXMLField(duration, 'Days'))
-            hours = tryint(getXMLField(duration, 'Hours'))
-            mins = tryint(getXMLField(duration, 'Minutes'))
-            secs = tryint(getXMLField(duration, 'Seconds'))
-            self.duration = datetime.timedelta(weeks * 7 + days, (hours * 60 + mins) * 60 + secs)
+                    return int(numstr)
+            weeks = toint(getXMLField(duration, 'Weeks'))
+            days = toint(getXMLField(duration, 'Days'))
+            hours = toint(getXMLField(duration, 'Hours'))
+            mins = toint(getXMLField(duration, 'Minutes'))
+            secs = toint(getXMLField(duration, 'Seconds'))
+            self.duration = timedelta(weeks * 7 + days, (hours * 60 + mins) * 60 + secs)
         else:
             endstr = getField('DateEnd')
@@ -1108 +1101 @@
         exdates = event.getElementsByTagName('ExceptionDateTime')
         exrules = event.getElementsByTagName('ExceptionRule')
-        (self.repeat_type, self.exceptions) = convert_rrule(rrules, exdates,
-                                                          exrules, self.eventdt)
+        (self.repeat_type, self.exceptions) = convert_rrule(rrules, exdates, exrules, self.eventdt)
 
         if len(rrules) > 0 and self.repeat_type == MOTO_REPEAT_NONE:
@@ -1474 +1466 @@
         elif self.contacttype == MOTO_CONTACT_MAILINGLIST:
             # the 'contact' is a space-separated list of other contact positions
-            assert(False, "mailing lists aren't handled yet, sorry") # FIXME
+            assert(False, "mailing lists aren't handled yet, sorry") # FIXME: implement mailing lists
         else:
             e = doc.createElement('Telephone')
@@ -1492 +1484 @@
             if e.hasChildNodes():
                 if MOTO_ADDRESS_TYPES.has_key(self.contacttype):
-                    e.setAttribute('Location',
-                                   MOTO_ADDRESS_TYPES[self.contacttype].upper())
+                    e.setAttribute('Location', MOTO_ADDRESS_TYPES[self.contacttype].upper())
                 ret.append(e)
 
@@ -1581 +1572 @@
         for (bit, desc) in REQUIRED_FEATURES:
             if not features[bit]:
-                raise opensync.Error(desc + ' feature not present',
-                                     opensync.ERROR_NOT_SUPPORTED)
+                raise opensync.Error(desc + ' feature not present', opensync.ERROR_NOT_SUPPORTED)
 
         # read current time on the phone, check if it matches our local time
@@ -1595 +1585 @@
 
         # initialise the position allocators
-        self.positions['event'] = PosAllocator('event', 0,
-                                               self.comms.max_events - 1)
+        self.positions['event'] = PosAllocator('event', 0, self.comms.max_events - 1)
         min_contact = max(self.comms.min_contact_pos, MOTO_QUICKDIAL_ENTRIES)
-        self.positions['contact'] = PosAllocator('contact', min_contact,
-                                                 self.comms.max_contact_pos)
+        self.positions['contact'] = PosAllocator('contact', min_contact, self.comms.max_contact_pos)
 
         # initialise the category mappings
@@ -1632 +1620 @@
             else:
                 xmldata = entry.to_xml()
-            print xmldata
             data = opensync.Data(xmldata, self.objformats[objtype])
             data.objtype = objtype
@@ -1663 +1650 @@
         """
         objtype = change.objtype
-        if change.objformat != self.objformats[objtype]:
-            raise opensync.Error("unhandled data format "+change.objformat.name,
-                                 opensync.ERROR_NOT_SUPPORTED)
+        if change.objformat.name != self.objformats[objtype].name:
+            raise opensync.Error("unhandled data format " + change.objformat.name, opensync.ERROR_NOT_SUPPORTED)
         try:
             if objtype == 'event':
@@ -1676 +1662 @@
             # if its modified and we've seen it before, delete it
             # otherwise just ignore it
-            if (change.changetype == opensync.CHANGE_TYPE_MODIFIED
-                and self.uid_seen(change.uid)):
+            if (change.changetype == opensync.CHANGE_TYPE_MODIFIED and self.uid_seen(change.uid)):
                 change.changetype = opensync.CHANGE_TYPE_DELETED
                 change.data = None
@@ -1683 +1668 @@
             else:
                 return False
-        
         if change.changetype == opensync.CHANGE_TYPE_ADDED:
             # allocate positions for the new entry
@@ -1705 +1689 @@
                 self.positions[objtype].mark_free(free_positions)
             entry.set_pos(positions)
-        
         entry.write(self.comms)
         change.uid = self.__generate_uid(entry)
@@ -1740 +1723 @@
         Uses the last 8 digit's of the phone's IMEI to do so.
         """
-        return ("moto-%s-%s@%s"
-                % (entry.get_objtype(), entry.generate_uid(), self.serial[-8:]))
+        return ("moto-%s-%s@%s" % (entry.get_objtype(), entry.generate_uid(), self.serial[-8:]))
 
     def __uid_to_pos(self, uid):
@@ -1749 +1731 @@
         """
         moto, objtype, lastpart = uid.split('-', 2)
-        assert(moto == "moto" and objtype in SUPPORTED_OBJTYPES,
-               'Invalid UID: %s' % uid)
+        assert(moto == "moto" and objtype in SUPPORTED_OBJTYPES, 'Invalid UID: %s' % uid)
         lastpos = lastpart.rindex('@')
-        assert(lastpart[lastpos + 1:] == self.serial[-8:],
-               'Entry not created on this phone')
+        assert(lastpart[lastpos + 1:] == self.serial[-8:], 'Entry not created on this phone')
         
         if objtype == "event":
@@ -1783 +1763 @@
         for change in self.access.list_changes(self.objtype):
             self.hashtable.report(change.uid)
-            change.changetype = self.hashtable.get_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)
+                self.hashtable.update_hash(change.changetype, change.uid, change.hash)
                 ctx.report_change(change)
         for uid in self.hashtable.get_deleted():
@@ -1799 +1777 @@
         """Write a change to the phone."""
         if change.objtype != self.objtype:
-            raise opensync.Error('unsupported objtype %s' % change.objtype,
-                                 opensync.ERROR_NOT_SUPPORTED)
-        if change.changetype != opensync.CHANGE_TYPE_DELETED:
-            print "\nOpenSync wants me to write:\n", change.data.data
+            raise opensync.Error('unsupported objtype %s' % change.objtype, opensync.ERROR_NOT_SUPPORTED)
         if change.changetype == opensync.CHANGE_TYPE_DELETED:
-            success = (self.access.uid_seen(change.uid)
-                       and self.access.delete_entry(change.uid))
+            success = (self.access.uid_seen(change.uid) and self.access.delete_entry(change.uid))
         elif change.changetype == opensync.CHANGE_TYPE_MODIFIED:
             old_uid = change.uid
@@ -1812 +1786 @@
             # the old one was deleted, to keep it consistent
             if (success and old_uid != change.uid):
-                self.hashtable.update_hash(opensync.CHANGE_TYPE_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)
+            self.hashtable.update_hash(change.changetype, change.uid, change.hash)
 
     def disconnect(self, info, ctx):
@@ -1830 +1802 @@
         doc = xml.dom.minidom.parseString(configstr)
     except:
-        raise opensync.Error('failed to parse config data',
-                             opensync.ERROR_MISCONFIGURATION)
+        raise opensync.Error('failed to parse config data', opensync.ERROR_MISCONFIGURATION)
 
     ret = getXMLField(doc, 'device').strip()
     if ret == '':
-        raise opensync.Error('device not specified in config file',
-                             opensync.ERROR_MISCONFIGURATION)
+        raise opensync.Error('device not specified in config file', opensync.ERROR_MISCONFIGURATION)
     return ret