1.1 --- a/tools/make_freebusy.py Wed Aug 12 18:23:24 2015 +0200
1.2 +++ b/tools/make_freebusy.py Wed Aug 12 22:40:50 2015 +0200
1.3 @@ -24,7 +24,8 @@
1.4 from bisect import bisect_left
1.5 from codecs import getwriter
1.6 from imiptools.data import get_window_end, Object
1.7 -from imiptools.dates import get_default_timezone
1.8 +from imiptools.dates import get_default_timezone, to_utc_datetime
1.9 +from imiptools.period import insert_period
1.10 from imiptools.profile import Preferences
1.11 from imip_store import FileStore, FilePublisher
1.12 import sys
1.13 @@ -38,10 +39,11 @@
1.14 try:
1.15 user = sys.argv[1]
1.16 args = sys.argv[2:]
1.17 - participant = args and args[0] not in ("-n", "-s", "-v") and args[0] or user
1.18 + participant = args and args[0] not in ("-n", "-s", "-v", "-r") and args[0] or user
1.19 store_and_publish = "-s" in args
1.20 include_needs_action = "-n" in args
1.21 verbose = "-v" in args
1.22 + reset_updated_list = "-r" in args
1.23 except IndexError:
1.24 print >>sys.stderr, """\
1.25 Need a user and an optional participant (if different from the user),
1.26 @@ -67,7 +69,7 @@
1.27 # providing free/busy periods at the end of the given time window, or from
1.28 # a list of all events.
1.29
1.30 - all_events = store.get_freebusy_providers(user, window_end)
1.31 + all_events = not reset_updated_list and store.get_freebusy_providers(user, window_end)
1.32
1.33 if not all_events:
1.34 all_events = store.get_active_events(user)
1.35 @@ -100,11 +102,7 @@
1.36 if obj.get_participation(partstat, include_needs_action):
1.37 for p in obj.get_active_periods(recurrenceids, tzid, window_end):
1.38 fbp = obj.get_freebusy_period(p, partstat == "ORG")
1.39 - i = bisect_left(fb, fbp)
1.40 - if i == len(fb):
1.41 - fb.append(fbp)
1.42 - elif fb[i] != fbp:
1.43 - fb.insert(i, fbp)
1.44 + insert_period(fb, fbp)
1.45
1.46 # Store and publish the free/busy collection.
1.47
1.48 @@ -112,6 +110,7 @@
1.49 if user == participant:
1.50 store.set_freebusy(user, fb)
1.51 publisher.set_freebusy(user, fb)
1.52 + store.set_freebusy_providers(user, to_utc_datetime(window_end, tzid), [obj for obj in objs if obj.possibly_active_from(window_end, tzid)])
1.53 else:
1.54 store.set_freebusy_for_other(user, fb, participant)
1.55 else: