Changeset 1796

Timestamp:

02/22/07 01:42:57 (2 years ago)

Author:

abaumann

Message:

* specify (hardcoded, at least for now) capabilities
* start updating to new internal XML format, unresolved issues are:

• RRULE handling is totally different now and not working
  
• same for Exception date/rule handling
  

the code still contains debug printfs and is barely tested

Files:

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

plugins/moto-sync/motosync.py

@@ -47 +47 @@
-# object types supported by this plugin
-SUPPORTED_OBJTYPES = ['event', 'contact']
+
+CAPABILITIES = """<?xml version="1.0"?>
+<capabilities>
+    <contact>
+        <Address />
+        <Birthday />
+        <Categories />
+        <EMail />
+        <FormattedName />
+        <Name />
+        <Nickname />
+        <Telephone />
+    </contact>
+    <event>
+        <Summary />
+        <DateStarted />
+        <DateEnd />
+        <Duration />
+        <Alarm />
+        <RecurrenceRule />
+        <ExceptionDateTime />
+    </event>
+</capabilities>
+"""
-
-# my phone doesn't like it if you read more than this many entries at a time
@@ -79 +103 @@
-]
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-# reverse of the above (almost): mapping from vcard to phone's contact type
-VCARD_CONTACT_TYPES = {
-work':
-home':
-voice':
-cell': 
-car':
-pcs':   3
-fax':
-pager':
+Work':   
+Home':   
+Voice':   
+Cellular':
+Car':   
+Message':  5
+Fax':   
+Pager':   
-}
-
@@ -105 +133 @@
-# can also have dom/intl/postal/parcel... these don't really make sense here
-VCARD_ADDRESS_TYPES = {
-w
-h
+W
+H
-}
-
-# reverse of the above
-MOTO_ADDRESS_TYPES = {
-w
-h
+W
+H
-}
-
@@ -139 +167 @@
-XML_NAME_PARTS = 'Prefix FirstName Additional LastName Suffix'.split()
-XML_ADDRESS_PARTS = ('Street ExtendedAddress'
-C
+Local
-
-# legal characters in telephone numbers
@@ -264 +292 @@
-    """
-    
+    # XXX FIXME: whole function needs reworkign for new XML format
+    return (MOTO_REPEAT_NONE, [])
+    
-    # can't support multiple rules
-    if len(rulenodes) != 1:
@@ -271 +302 @@
-    # build hash of rule parts
-    rules = {}
-rule in map(getXMLText, rulenode.getElementsByTagName('Rule'))
-, val = rule.split('=', 1
-key = key
+node in rulenode.childNodes
+ = node.nodeName.lower(
+val = getXMLText(node)
-        if key[:1] == 'by':
-            val = set(val.split(','))
@@ -279 +310 @@
-
-    # extract the parts
-freq')) # required by RFC2445
-freq
+content')) # required
+content
-    bymonth = rules.get('bymonth')
-    byweekno = rules.get('byweekno')
@@ -335 +366 @@
-
-    # recombine the rule parts into a single string, and parse into an rruleset
-
-
+
+
+
-
-    # are there any future occurrences of this event?
@@ -348 +380 @@
-    # add in the exception dates and rules (if any)
-    for node in exdates:
-
-
-
+
+
+
+
+
+
-
-    # are there any future occurrences of this event if we consider exceptions?
@@ -878 +913 @@
-        """Returns OpenSync XML representation of this event."""
-        impl = xml.dom.minidom.getDOMImplementation()
-
-
-
+
+
-
-        e = doc.createElement('Summary')
@@ -891 +925 @@
-        else:
-            dtstart = self.eventdt.strftime(VCAL_DATE)
-appendXMLChild(doc, e, '
+e.setAttribute('Date
-        appendXMLChild(doc, e, 'Content', dtstart)
-        top.appendChild(e)
@@ -901 +935 @@
-        else:
-            dtend = endtime.strftime(VCAL_DATE)
-appendXMLChild(doc, e, '
+e.setAttribute('Date
-        appendXMLChild(doc, e, 'Content', dtend)
-        top.appendChild(e)
@@ -908 +942 @@
-            alarm = doc.createElement('Alarm')
-            appendXMLChild(doc, alarm, 'AlarmAction', 'DISPLAY')
-
+
+
+
-            alarmtime = self.alarmdt.strftime(VCAL_DATETIME)
-            appendXMLChild(doc, alarm, 'AlarmTrigger', alarmtime)
@@ -915 +951 @@
-        e = doc.createElement('RecurrenceRule')
-        if self.repeat_type == MOTO_REPEAT_DAILY:
-Rule', 'FREQ=
+Content', '
-        elif self.repeat_type == MOTO_REPEAT_WEEKLY:
-Rule', 'FREQ=
+Content', '
-        elif self.repeat_type == MOTO_REPEAT_MONTHLY_DATE:
-Rule', 'FREQ=
-Rule', 'BYMONTHDAY=%d' % self.eventdt.day
+Content', '
+ByMonthDay', str(self.eventdt.day)
-        elif self.repeat_type == MOTO_REPEAT_MONTHLY_DAY:
-Rule', 'FREQ=
+Content', '
-            day = VCAL_DAYS[self.eventdt.weekday()]
-            # compute the week number that the event falls in
@@ -929 +965 @@
-            else:
-                weeknum = self.eventdt.day / 7 + 1
-Rule', 'BYDAY=
+ByDay', '
-        elif self.repeat_type == MOTO_REPEAT_YEARLY:
-Rule', 'FREQ=
-Rule', 'BYMONTH=%d' % self.eventdt.month
-Rule', 'BYMONTHDAY=%d' % self.eventdt.day
+Content', '
+ByMonth', str(self.eventdt.month)
+ByMonthDay', str(self.eventdt.day)
-
-        if e.hasChildNodes():
@@ -963 +999 @@
-            # work out which dates the exceptions correspond to and
-            # generate ExceptionDate nodes for them
+            e = doc.createElement('ExceptionDateTime')
+            e.setAttribute('DateValue', 'DATE')
-            for exnum in self.exceptions:
-                e = doc.createElement('ExclusionDate')
-                appendXMLChild(doc, e, 'Content',
-                               format_time(rrule[exnum], VCAL_DATE))
-    appendXMLChild(doc, e, 'Value', 'DATE')
+if e.hasChildNodes():
-                top.appendChild(e)
-
@@ -1014 +1051 @@
-        PhoneEvent.__init__(self)
-        doc = xml.dom.minidom.parseString(data)
-E
+e
-
-        def getField(tagname, subtag='Content'):
@@ -1027 +1064 @@
-            raise UnsupportedDataError('Event is too old')
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            endstr = getField('DateEnd')
@@ -1059 +1106 @@
-
-        rrules = event.getElementsByTagName('RecurrenceRule')
-lusionDat
-lus
+eptionDateTim
+ept
-        (self.repeat_type, self.exceptions) = convert_rrule(rrules, exdates,
-                                                          exrules, self.eventdt)
@@ -1256 +1303 @@
-        PhoneContact.__init__(self)
-        doc = xml.dom.minidom.parseString(data)
+        contact = doc.getElementsByTagName('contact')[0]
-
-        def getField(tagname, subtag='Content'):
-            """utility function for the XML processing below"""
-doc
+contact
-
-        # handle the name and formatted name fields
@@ -1306 +1354 @@
-                # filter out any illegal characters from the phone number
-                content = filter(lambda c: c in TEL_NUM_DIGITS, content)
-
-
-
+
+
-                moto_type = MOTO_CONTACT_DEFAULT
-                for t in ical_types:
@@ -1338 +1385 @@
-        for adr in doc.getElementsByTagName('Address'):
-            address = [getXMLField(adr, p) for p in XML_ADDRESS_PARTS]
-
-
+
-            for t in ical_types:
-                if VCARD_ADDRESS_TYPES.has_key(t):
@@ -1431 +1477 @@
-        else:
-            e = doc.createElement('Telephone')
-
-
+
+
+
+
-            if self.primaryflag:
-appendXMLChild(doc, e, 'Type', 'PREF'
+e.setAttribute('Preferred', "1"
-        appendXMLChild(doc, e, 'Content', self.contact)
-        ret.append(e)
@@ -1444 +1492 @@
-            if e.hasChildNodes():
-                if MOTO_ADDRESS_TYPES.has_key(self.contacttype):
-appendXMLChild(doc, e, 'Type
+e.setAttribute('Location
-                                   MOTO_ADDRESS_TYPES[self.contacttype].upper())
-                ret.append(e)
@@ -1584 +1632 @@
-            else:
-                xmldata = entry.to_xml()
+            print xmldata
-            data = opensync.Data(xmldata, self.objformats[objtype])
-            data.objtype = objtype
@@ -1752 +1801 @@
-            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
-        if change.changetype == opensync.CHANGE_TYPE_DELETED:
-            success = (self.access.uid_seen(change.uid)
@@ -1805 +1856 @@
-    version.modelversion = str(comms.read_model())
-    version.identifier = str(comms.read_serial())
-    # FIXME: discover and set capabilities
-    comms.disconnect()
-    info.version = version
+    info.capabilities = opensync.capabilities_parse(CAPABILITIES)
-
-    # for now, all objtypes are supported on all devices