From a753e41ee7a7338e8bd3dc4665f3b851471b2e7c Mon Sep 17 00:00:00 2001 From: Mathew Odden Date: Fri, 30 May 2014 20:58:03 -0500 Subject: [PATCH] Fix single emtpy .ics file issue The function responsible for determining the file name for the .ics files was not handling paths properly, resulting in a single .ics file being generated. This fixes the issue and also tweaks the INFO output a bit. Change-Id: Ib620cf5d683f74b3d5066e6e6ce75e1b7e36ed1d --- arbiter/meeting.py | 11 +++++++---- arbiter/util.py | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arbiter/meeting.py b/arbiter/meeting.py index 88268ee..996208c 100644 --- a/arbiter/meeting.py +++ b/arbiter/meeting.py @@ -98,18 +98,21 @@ class Meeting: # add event to calendar cal.add_component(event) - # write ical files to disk - ical_filename = self.filename.split('.')[0] + '.ics' + # determine file name from source file + ical_filename = os.path.basename(self.filename).split('.')[0] + '.ics' + ical_filename = os.path.join(ical_dir, ical_filename) if not os.path.exists(ical_dir): os.makedirs(ical_dir) + # write ical files to disk with open(ical_filename, 'wb') as ics: ics.write(cal.to_ical()) num_events = len(cal.subcomponents) - logging.info('\'%s\' processed. [%d event(s)]' % (ical_filename, - num_events)) + logging.info("Wrote %(num_events)d event(s) to file '%(ical_file)s'" % + {'ical_file': ical_filename, + 'num_events': num_events}) def get_schedule_tuple(self): """returns a list of meeting tuples consisting meeting name, meeting diff --git a/arbiter/util.py b/arbiter/util.py index bd00894..f243be2 100644 --- a/arbiter/util.py +++ b/arbiter/util.py @@ -45,7 +45,6 @@ def load_meetings(yaml_dir, meeting_list=None): continue meetings_yaml.append(yaml_file) - print meetings_yaml meetings = [Meeting(yaml.load(open(f, 'r')), f) for f in meetings_yaml]