1.1 --- a/imiptools/handlers/resource.py Sun Oct 26 19:42:40 2014 +0100
1.2 +++ b/imiptools/handlers/resource.py Sun Oct 26 19:43:41 2014 +0100
1.3 @@ -6,7 +6,7 @@
1.4
1.5 from datetime import date, datetime, timedelta
1.6 from imiptools.content import Handler, format_datetime, to_part
1.7 -from imiptools.period import insert_period, period_overlaps, remove_period
1.8 +from imiptools.period import have_conflict, insert_period, remove_period
1.9 from vCalendar import to_node
1.10 from vRecurrence import get_parameters, get_rule
1.11
1.12 @@ -108,18 +108,11 @@
1.13 periods = [(format_datetime(dtstart), format_datetime(dtend))]
1.14
1.15 conflict = False
1.16 - freebusy = self.store.get_freebusy(attendee)
1.17 + freebusy = self.store.get_freebusy(attendee) or []
1.18
1.19 if freebusy:
1.20 remove_period(freebusy, self.uid)
1.21 - conflict = True
1.22 - for start, end in periods:
1.23 - if period_overlaps(freebusy, (start, end)):
1.24 - break
1.25 - else:
1.26 - conflict = False
1.27 - else:
1.28 - freebusy = []
1.29 + conflict = have_conflict(freebusy, periods)
1.30
1.31 # If the event can be scheduled, it is registered and a reply sent
1.32 # accepting the event. (The attendee has PARTSTAT=ACCEPTED as an