From 804ab33a6d07b34c2f0942a63c71f652dfb067f3 Mon Sep 17 00:00:00 2001
From: Raphael Maenle <raphael@maenle.net>
Date: Sun, 17 May 2020 22:58:13 +0200
Subject: [PATCH] updates color generation

- hopefully fixes a small bug that fucks up colors
- fixes generation when saving calendar colors
---
 Routine.py   |  5 ++---
 caltojson.py | 22 +++++++++++++---------
 colors.json  |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Routine.py b/Routine.py
index b4219ee..9ae1cfc 100644
--- a/Routine.py
+++ b/Routine.py
@@ -25,11 +25,10 @@ class Routine:
             for calendar in calendars:
                 if calendar.toggle == 'True': 
                     visualCals.append(calendar.name)
-            
-            googleCreds =  google.oauth2.credentials.Credentials(**credentials)
+            googleCreds = google.oauth2.credentials.Credentials(**credentials)
+            print(credentials_to_dict(googleCreds), flush=True)
             calendarjson = caltojson.generateJsonFromCalendarEntries(visualCals,  googleCreds)
             user.setJson(calendarjson) 
-            print(calendarjson)
             directory = 'userinfo/' + user.id + '/'
             if not os.path.exists(directory):
                 os.makedirs(directory)
diff --git a/caltojson.py b/caltojson.py
index 6412a31..e604a5d 100644
--- a/caltojson.py
+++ b/caltojson.py
@@ -138,7 +138,7 @@ def getCalendarEvents(service, visibleCalendars, startDate, endDate):
         for event in events_result.get('items', []):
             
             # create simple event
-            name = event['summary']
+            name = event.get('summary', '(no Title)')
             start = event['start'].get('dateTime')
             end = event['end'].get('dateTime')
             newEvent = Event(name, start, end)
@@ -179,17 +179,21 @@ def colorizeEvents(allEvents, service):
     colors = getCalendarColors(service)
     
     for event in allEvents:
-        event.colorHex = fromColorIdGetColor(event.calendarColorId, colormap, colors)
+            event.colorHex = forEventGetColor(event, colormap, colors)
 
-def fromColorIdGetColor(colorId, colormap, colors):
+# this function is only used once for calendar generation stuff
+def fromColorIdGetColor(color, colormap, colors):
+    return toNaturalColor(colormap, colors['calendar'][color]['background'])
 
-    if colorId != 0:
-        orgColor = colors['calendar'][colorId]['background']
+def forEventGetColor(event, colormap, colors):
+    if event.calendarColorId != 0:
+        bg  = colors['calendar'][event.calendarColorId]['background']
     else:
-        calColorId = toCalendarColorId(colormap, colorId)
-        orgColor = colors['calendar'][calColorId]['background']
-    
-    return toNaturalColor(colormap, orgColor)
+        calColorId = toCalendarColorId(colormap, event.eventColorId)
+        bg = colors['calendar'][calColorId]['background']     
+    print(event.name) 
+    print(bg)
+    return toNaturalColor(colormap, bg)
 
 def toJson(events):
     data = {}
diff --git a/colors.json b/colors.json
index 36a36e6..ac2bd03 100644
--- a/colors.json
+++ b/colors.json
@@ -10,7 +10,7 @@
     },
     {
       "api": "#f83a22",
-      "natural": "#8E24AA"
+      "natural": "#d50000"
     },
     {
       "api": "#fa573c",
@@ -143,4 +143,4 @@
       "to": "8"
     }
   ]
-}
\ No newline at end of file
+}