Changeset 2232

Timestamp:

07/01/07 12:38:02 (1 year ago)

Author:

abaumann

Message:

handle different meaning of repeat types in the extended calendar format (ticket #425)

Files:

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

plugins/moto-sync/motosync.py

@@ -60 +60 @@
-
-# repeat types in the calendar
-XXX FIXME: check order of DATE/DAY for monthly and yearly on extended-format phones
+these have a different meaning in the simple and extended calendars (why???!)
-MOTO_REPEAT_NONE = 0
-MOTO_REPEAT_DAILY = 1
-MOTO_REPEAT_WEEKLY = 2
-
-
-
-
+
+
+
+
+
+
+
-
-# features we require; these refer to the bits returned by the AT+MAID? command
@@ -430 +433 @@
-    return ((daynum + 1) % 7) * 8 + nth
-
-
+, extended_format
-    """Process XML recursion rules, converting them to the closest-possible
-    matching recursion specifier supported by the phone.
@@ -439 +442 @@
-      exrules:   list of exception rules
-      eventdt:   event's date (and time if set)
+      extended_format: bool iff the extended calendar format is used
-
-    Returns a dict containing the following fields:
@@ -516 +520 @@
-    elif (freq == 'MONTHLY' and not byday and (not bymonthday or bymonthday == set([eventdt.day]))
-            and not byyearday and (not bymonth or bymonth == byallmonths)):
-
+
+
+
+
-    elif (freq == 'MONTHLY' and byday and len(byday) == 1 and not bymonthday
-            and not byyearday and (not bymonth or bymonth == byallmonths)):
-
+
+
+
+
-        if not (byday_daynum == eventdt.weekday() and byday_nth == eventweek):
-            ret['repeat_day'] = moto_monthday_to_repeat_day(byday_nth, byday_daynum)
-    elif (freq == 'YEARLY' and not byday and (not bymonthday or bymonthday == set([eventdt.day]))
-            and not byyearday and (not bymonth or bymonth == set([eventdt.month]))):
-
-
+
+
+
+
+
-            and (not bymonthday or bymonthday == set([eventdt.day]))
-            and not byyearday and (not bymonth or bymonth == set([eventdt.month]))):
-
+EXTENDED_
-        if not (byday_daynum == eventdt.weekday() and byday_nth == eventweek):
-            ret['repeat_day'] = moto_monthday_to_repeat_day(byday_nth, byday_daynum)
@@ -571 +584 @@
-    return ret
-
-
+ extended_format,
-                      repeat_every=None, repeat_day=None, repeat_end=None):
-    """Convert a Motorola-format recurrence to the corresponding XML description.
@@ -600 +613 @@
-        rule = rrule.rrule(rrule.WEEKLY, byweekday=repeat_days,
-                           dtstart=eventdt, interval=repeat_every, until=repeat_end)
-
+
+
-        appendXMLTag(doc, e, 'Frequency', 'MONTHLY')
-        appendXMLTag(doc, e, 'ByMonthDay', str(eventdt.day))
-        rule = rrule.rrule(rrule.MONTHLY, bymonthday=eventdt.day,
-                           dtstart=eventdt, interval=repeat_every, until=repeat_end)
-
+
+
-        appendXMLTag(doc, e, 'Frequency', 'MONTHLY')
-        if repeat_day:
@@ -615 +630 @@
-        rule = rrule.rrule(rrule.MONTHLY, byweekday=rrule.weekdays[repeat_daynum](repeat_nth),
-                           dtstart=eventdt, interval=repeat_every, until=repeat_end)
-
+
+
-        appendXMLTag(doc, e, 'Frequency', 'YEARLY')
-        appendXMLTag(doc, e, 'ByMonth', str(eventdt.month))
@@ -621 +637 @@
-        rule = rrule.rrule(rrule.YEARLY, bymonth=eventdt.month, bymonthday=eventdt.day,
-                           dtstart=eventdt, interval=repeat_every, until=repeat_end)
-repeat_type == MOTO_REPEAT
+extended_format and repeat_type == MOTO_REPEAT_EXTENDED
-        appendXMLTag(doc, e, 'Frequency', 'YEARLY')
-        appendXMLTag(doc, e, 'ByMonth', str(eventdt.month))
@@ -1320 +1336 @@
-
-        if include_rrule:
-
+, False
-            for node in nodes:
-                insertXMLNode(top, node)
@@ -1371 +1387 @@
-        exrules = node.getElementsByTagName('ExceptionRule')
-
-
-
-
+
+
-            raise UnsupportedDataError("Recursion rule not supported by simple event format")
-
@@ -1473 +1488 @@
-
-        nodes = moto_rrule_to_xml(doc, self.eventdt, self.repeat_type,
-
+
+
-        for node in nodes:
-            insertXMLNode(top, node)
@@ -1531 +1547 @@
-        exdates = node.getElementsByTagName('ExceptionDateTime')
-        exrules = node.getElementsByTagName('ExceptionRule')
-
+, True
-        self.repeat_type = rule['repeat_type']
-        self.repeat_every = rule['repeat_every']