code commenting and cleanup

__init__.py

@@ -8,6 +8,7 @@ from google_auth_oauthlib.flow import InstalledAppFlow
 from google.auth.transport.requests import Request
 
 from server import db
+from database.models import Calendar as dbCalendar
 
 # If modifying these scopes, delete the file token.pickle.
 SCOPES = ["https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/userinfo.profile", "https://www.googleapis.com/auth/calendar.readonly", "openid"]
@@ -24,9 +25,7 @@ class Calendar:
 class Event:
     def __init__(self, name_, start_, end_):
         self.name = name_
-        self.eventColorId = 0
+        self.eventColorId = None
-        self.calendarColorId = None 
-        self.naturalColorId = 0
         self.start = start_
         self.end = end_
         self.colorHex = '#adfff5'
@@ -65,44 +64,12 @@ class Event:
     def print(self):
         if self.allDay:
             print(self.name + "All Day")
-        else:
-            print(self.name + ": " + self.naturalColorId)
 
     
-
-def calendarCredentials(token = None):
-    creds = None
-    # The file token.pickle stores the user's access and refresh tokens, and is
-    # created automatically when the authorization flow completes for the first
-    # time.
-
-    if token == None:
-        if os.path.exists('token.pickle'):
-            with open('token.pickle', 'rb') as token:
-                token.seek(0)
-                creds = pickle.load(token)
-    
-    else:
-        creds = pickle.load(token)
-
-    # If there are no (valid) credentials available, let the user log in.
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
-            flow = InstalledAppFlow.from_client_secrets_file(
-                'credentials.json', SCOPES)
-            creds = flow.run_local_server(port=1234)
-        # Save the credentials for the next run
-        with open('token.pickle', 'wb') as token:
-            pickle.dump(creds, token)
-
-    service = build('calendar', 'v3', credentials=creds)
-    
-    return service
-    
 def updateCalendars(user, calendars, colors):
     
+    if user == None or calendars == None or colors == None:
+        return
     COLORS_FILE = os.path.join(os.path.dirname(__file__), 'colors.json')
     with open(COLORS_FILE) as f:
         colormap = json.load(f)
@@ -114,11 +81,11 @@ def updateCalendars(user, calendars, colors):
         if not user.hasCalendar(calendar.calendarId):
             color = fromColorIdGetColor(calendar.color, colormap, colors)
             c = dbCalendar(calendar_id=calendar.calendarId, 
-                           name = calendar.summary,
+                           name = calendar.name,
                            toggle = "False",
                            color = color)
             db.session.add(c)
-            current_user.calendars.append(c)
+            user.calendars.append(c)
 
     db.session.commit()
     
@@ -134,7 +101,7 @@ def calendarsFromDb(user):
 
     return pyCalendars
 
-
+# removes not visible calendars from the list of all calendars
 def purgeCalendars(calendars, visibleCalendars):
     purged = []
     for calendar in calendars:
@@ -142,48 +109,7 @@ def purgeCalendars(calendars, visibleCalendars):
             purged.append(calendar)
     return purged
 
-def getCalendarEvents(service, userCalendars, startDate, endDate):
+# remaps a event color id to a calendar color id
-    
-
-    visualCals = []
-    for calendar in userCalendars:
-        if calendar.toggle == 'True':
-            visualCals.append(calendar.calendar_id)
-    
-    calendars = getCalendars(service)
-    calendars = purgeCalendars(calendars, visualCals)
-
-    all_events = []
-
-
-    for calendar in calendars:
-        events_result = service.events().list(calendarId=calendar.calendarId, timeMin=startDate,
-                                            timeMax=endDate,
-                                            maxResults=10, singleEvents=True,
-                                            orderBy='startTime').execute()
-        for event in events_result.get('items', []):
-            
-            # create simple event
-            name = event.get('summary', '(no Title)')
-            start = event['start'].get('dateTime')
-            end = event['end'].get('dateTime')
-            newEvent = Event(name, start, end)
-
-            # handle weird colors from google
-            color = event.get('colorId')
-            if color == None:
-                for userCalendar in userCalendars:
-                    if userCalendar.calendar_id == calendar.calendarId:
-                        newEvent.calendarHex = userCalendar.color
-                newEvent.calendarColorId = calendar.color
-            else:
-                newEvent.eventColorId = color
-
-            
-            all_events.append(newEvent)
-
-    return all_events
-
 def toCalendarColorId(colormap, colorId):
     for remap in colormap['eventRemap']:
         if remap['from'] == colorId:
@@ -192,6 +118,7 @@ def toCalendarColorId(colormap, colorId):
     print(f"failed with {colorId}")
     return colorId
 
+# remaps a calendar color ID to its natural color
 def toNaturalColor(colormap, orgColor):
     for remap in colormap['colors']:
         if remap['api'] == orgColor:
@@ -200,28 +127,27 @@ def toNaturalColor(colormap, orgColor):
     print(f"failed with {orgColor}")
     return orgColor
 
+# use the event color id to convert it to a hex color
 def colorizeEvents(events, colors):
     COLORS_FILE = os.path.join(os.path.dirname(__file__), 'colors.json')
     with open(COLORS_FILE) as f:
         colormap = json.load(f)
         
-    
     for event in events:
-        if event.calendarColorId != None:
+        if event.eventColorId != None:
             event.colorHex = forEventGetColor(event, colormap, colors)
 
-# this function is only used once for calendar generation stuff
+# returns a color for a specific calendar color id
 def fromColorIdGetColor(color, colormap, colors):
     return toNaturalColor(colormap, colors['calendar'][color]['background'])
 
+# generates the natural color for a event color id
 def forEventGetColor(event, colormap, colors):
-    if event.calendarColorId != 0:
-        bg  = colors['calendar'][event.calendarColorId]['background']
-    else:
     calColorId = toCalendarColorId(colormap, event.eventColorId)
     bg = colors['calendar'][calColorId]['background']     
     return toNaturalColor(colormap, bg)
 
+# exports all events into a jsonable format (excluding all day events)
 def toJson(events):
     data = {}
     data['kind'] = 'calendar#events'
@@ -241,13 +167,14 @@ def toJson(events):
 
     return data
 
+# debug functions which prints color names
 def printColors(colors):
     for i in range(1, 25):
         col = colors['event'][str(i)]['background']
         print(f"{i}: {col}")
 
 def main():
-    generateJsonFromCalendarEntries()
+    return
 
 
 def getTimeStamps():