# HG changeset patch # User Paul Boddie # Date 1431971978 -7200 # Node ID 03a4ad954a1e3c89216cd7f090ff77e32dd852c1 # Parent d0a189c102e822cd19dee8becb160987c8ecaf5f Fixed bundled free/busy information to originate from the specified store. diff -r d0a189c102e8 -r 03a4ad954a1e imiptools/__init__.py --- a/imiptools/__init__.py Mon May 18 18:42:27 2015 +0200 +++ b/imiptools/__init__.py Mon May 18 19:59:38 2015 +0200 @@ -59,6 +59,12 @@ self.publishing_dir = None self.debug = False + def get_store(self): + return self.store_dir and imip_store.FileStore(self.store_dir) or None + + def get_publisher(self): + return self.publishing_dir and imip_store.FilePublisher(self.publishing_dir) or None + def process(self, f, original_recipients, outgoing_only): """ @@ -94,8 +100,8 @@ may be constructed according to individual preferences. """ - store = self.store_dir and imip_store.FileStore(self.store_dir) or None - publisher = self.publishing_dir and imip_store.FilePublisher(self.publishing_dir) or None + store = self.get_store() + publisher = self.get_publisher() handlers = dict([(name, cls(senders, recipient, self.messenger, store, publisher)) for name, cls in self.handlers]) @@ -227,7 +233,7 @@ utcnow = get_timestamp() uid = "imip-agent-%s-%s" % (utcnow, recipient) - freebusy = imip_store.FileStore().get_freebusy(organiser) + freebusy = (self.get_store() or imip_store.FileStore()).get_freebusy(organiser) return to_part("PUBLISH", [make_freebusy(freebusy, uid, organiser, organiser_attr)]) return None