1 files changed, 31 insertions, 22 deletions

diff --git a/worktime.py b/worktime.py
index 9c72d30..19e2186 100755
--- a/worktime.py
+++ b/worktime.py
@@ -60,7 +60,6 @@ class TogglAPI(object):
         return now - start if start <= now else None
 
 class Worktime(object):
-    time_to_work = timedelta()
     time_worked = timedelta()
     running_entry = None
     now = datetime.now(tzlocal())
@@ -82,34 +81,40 @@ class Worktime(object):
 
       hours_per_week = float(config.get('WORKTIME', 'HoursPerWeek', fallback=40))
       workdays = set([int(d.strip()) for d in config.get('WORKTIME', 'Workdays', fallback='1,2,3,4,5').split(',')])
-      hours_per_day = hours_per_week / len(workdays)
+      time_per_day = timedelta(hours = hours_per_week) / len(workdays)
 
-      holidays = set()
+      holidays = dict()
 
       for year in range(start_date.year, end_date.year + 1):
           y_easter = datetime.combine(easter(year), time(), tzinfo=tzlocal())
 
           # Legal holidays in munich, bavaria
-          holidays.add(datetime(year, 1, 1, tzinfo=tzlocal()).date())
-          holidays.add(datetime(year, 1, 6, tzinfo=tzlocal()).date())
-          holidays.add((y_easter+timedelta(days=-2)).date())
-          holidays.add((y_easter+timedelta(days=+1)).date())
-          holidays.add(datetime(year, 5, 1, tzinfo=tzlocal()).date())
-          holidays.add((y_easter+timedelta(days=+39)).date())
-          holidays.add((y_easter+timedelta(days=+50)).date())
-          holidays.add((y_easter+timedelta(days=+60)).date())
-          holidays.add(datetime(year, 8, 15, tzinfo=tzlocal()).date())
-          holidays.add(datetime(year, 10, 3, tzinfo=tzlocal()).date())
-          holidays.add(datetime(year, 11, 1, tzinfo=tzlocal()).date())
-          holidays.add(datetime(year, 12, 25, tzinfo=tzlocal()).date())
-          holidays.add(datetime(year, 12, 26, tzinfo=tzlocal()).date())
+          holidays[datetime(year, 1, 1, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[datetime(year, 1, 6, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[(y_easter+timedelta(days=-2)).date()] = time_per_day
+          holidays[(y_easter+timedelta(days=+1)).date()] = time_per_day
+          holidays[datetime(year, 5, 1, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[(y_easter+timedelta(days=+39)).date()] = time_per_day
+          holidays[(y_easter+timedelta(days=+50)).date()] = time_per_day
+          holidays[(y_easter+timedelta(days=+60)).date()] = time_per_day
+          holidays[datetime(year, 8, 15, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[datetime(year, 10, 3, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[datetime(year, 11, 1, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[datetime(year, 12, 25, tzinfo=tzlocal()).date()] = time_per_day
+          holidays[datetime(year, 12, 26, tzinfo=tzlocal()).date()] = time_per_day
 
       try:
           with open(f"{config_dir}/excused", 'r') as excused:
               for line in excused:
                   stripped_line = line.strip()
                   if stripped_line:
-                      holidays.add(datetime.strptime(stripped_line, date_format).replace(tzinfo=tzlocal()).date())
+                      splitLine = stripped_line.split(' ')
+                      if len(splitLine) == 2:
+                          [hours, date] = splitLine
+                          day = datetime.strptime(date, date_format).replace(tzinfo=tzlocal()).date()
+                          holidays[day] = timedelta(hours = float(hours))
+                      else:
+                          holidays[datetime.strptime(stripped_line, date_format).replace(tzinfo=tzlocal()).date()] = time_per_day
       except IOError as e:
           if e.errno != 2:
               raise e
@@ -130,7 +135,7 @@ class Worktime(object):
               raise e
       
 
-      days_to_work = set()
+      days_to_work = dict()
 
       start_day = start_date.date()
       end_day = end_date.date()
@@ -138,14 +143,18 @@ class Worktime(object):
           end_day = max(end_day, max(list(pull_forward)))
           
       for day in [start_day + timedelta(days = x) for x in range(0, (end_day - start_day).days + 1)]:
-          if day.isoweekday() in workdays and not day in holidays:
-              days_to_work.add(day)
+          if day.isoweekday() in workdays:
+              time_to_work = time_per_day
+              if day in holidays.keys():
+                time_to_work -= holidays[day]
+              if time_to_work > timedelta():
+                days_to_work[day] = time_to_work
 
       self.is_workday = self.now.date() in days_to_work
 
-      self.time_to_work = timedelta(hours = len([day for day in days_to_work if day <= end_date.date()]) * hours_per_day)
+      self.time_to_work = sum([days_to_work[day] for day in days_to_work.keys() if day <= end_date.date()], timedelta())
       for day in list(pull_forward):
-          days_forward = set([d for d in days_to_work if d >= end_date.date() and d < day and not d in pull_forward])
+          days_forward = set([d for d in days_to_work.keys() if d >= end_date.date() and d < day and not d in pull_forward])
           hours_per_day_forward = pull_forward[day] / len(days_forward) if len(days_forward) > 0 else timedelta()
           days_forward.discard(end_date.date())
           self.time_pulled_forward += pull_forward[day] - hours_per_day_forward * len(days_forward)