From 435535f7bec7115875380a27477eefe918968e2b Mon Sep 17 00:00:00 2001 From: Tim Meneely Date: Tue, 2 Jun 2026 00:44:38 +0000 Subject: [PATCH] Fixing all day events --- gcal.py | 17 +++++-- gcal_quickstart.py | 124 --------------------------------------------- imagegen.py | 6 ++- token.json | 2 +- 4 files changed, 19 insertions(+), 130 deletions(-) delete mode 100644 gcal_quickstart.py diff --git a/gcal.py b/gcal.py index 22af919..3c7abd9 100644 --- a/gcal.py +++ b/gcal.py @@ -1,4 +1,5 @@ import datetime +import pytz import os.path from google.auth.transport.requests import Request @@ -121,12 +122,15 @@ def main(): #print(start, event["summary"],"(from "+calendarsummaries[i]+")") #print("type events",type(events),"type event",type(event)) #allevents.append(events) + useastern_timezone = pytz.timezone("US/Eastern") + today = datetime.datetime.now(tz=useastern_timezone).date() # #.strftime("%Y-%m-%d") for event in events: if event.get("summary","Private") not in ["Middle","Private"]: event["calendarname"]=calendarsummaries[i] if "dateTime" in event["start"]: #startdate = event["start"].get("dateTime") eventdate = datetime.datetime.strptime(event["start"]["dateTime"],"%Y-%m-%dT%H:%M:%S%z") + #print("uses dateTime",event["summary"],eventdate) elif "date" in event["start"]: #startdate = event["start"].get("date") eventdate = datetime.datetime.strptime(event["start"]["date"],"%Y-%m-%d") @@ -137,13 +141,18 @@ def main(): #print("startdate",startdate,type(startdate)) #eventdate = datetime.datetime.strptime(event["start"]["dateTime"],"%Y-%m-%dT%H:%M:%S%z") - prettytime = (" "+eventdate.strftime("%I:%M %p")).replace(" 0"," ") - if datetime.datetime.now().date() == eventdate.date(): + if "dateTime" in event["start"]: + prettytime = (" "+eventdate.strftime("%I:%M %p")).replace(" 0"," ") + else: + prettytime = "" #All day" + #if datetime.datetime.now().date() == eventdate.date(): + if today == eventdate.date(): pass # This is today, print as is else: prettytime = eventdate.strftime("%a")+prettytime - event["prettytime"] = prettytime #(" "+eventdate.strftime("%I:%M %p")).replace(" 0"," ") - #print("event",event) + event["prettytime"] = prettytime.strip() #(" "+eventdate.strftime("%I:%M %p")).replace(" 0"," ") + #if event["summary"] == "Girls": + # print("event",event) allevents.append(event) #print("allevents",allevents) allevents2 = sorted(allevents, key=lambda event: event["start"].get("dateTime", event["start"].get("date"))) diff --git a/gcal_quickstart.py b/gcal_quickstart.py deleted file mode 100644 index 2eba524..0000000 --- a/gcal_quickstart.py +++ /dev/null @@ -1,124 +0,0 @@ -import datetime -import os.path - -from google.auth.transport.requests import Request -from google.oauth2.credentials import Credentials -from google_auth_oauthlib.flow import InstalledAppFlow -from googleapiclient.discovery import build -from googleapiclient.errors import HttpError - -# If modifying these scopes, delete the file token.json. -SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"] - - -def main(): - """Shows basic usage of the Google Calendar API. - Prints the start and name of the next 10 events on the user's calendar. - """ - creds = None - # The file token.json stores the user's access and refresh tokens, and is - # created automatically when the authorization flow completes for the first - # time. - if os.path.exists("token.json"): - creds = Credentials.from_authorized_user_file("token.json", SCOPES) - # 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=0) - # Save the credentials for the next run - with open("token.json", "w") as token: - token.write(creds.to_json()) - - try: - service = build("calendar", "v3", credentials=creds) - - - calendars_to_use = [\ -# "meneelyl@gmail.com",\ - "Family",\ -# "Tim Meneely2",\ -# "meneelyt@gmail.com",\ - "1532 Ingomar Heights Road",\ - "Vivienne",\ - "Benjamin",\ - "Madeline"\ - ] - - - calendarids = [] - calendarsummaries = [] - calendar_list = (service.calendarList().list()).execute().get("items", []) - for result in calendar_list: - if result.get("summary",[]) in calendars_to_use: - calendarids.append(result.get("id",[])) - calendarsummaries.append(result.get("summary",[])) - #print("result",result.get("summary",[]),result.get("id",[])) -# print("summaries",calendarsummaries) - #print("first result",calendar_list[0]) - #print("first result",calendar_list[len(calendar_list)-1]) -#result meneelyl@gmail.com meneelyl@gmail.com -#result Family family14345103599446093558@group.calendar.google.com -#result Meneely Birthdays fjlvq3dnhfvn76ihljocbrhrdc@group.calendar.google.com -#result Tim Meneely2 k7iohvqfspej540e37bqr1hkso@group.calendar.google.com -#result meneelyt@gmail.com meneelyt@gmail.com -#result 1532 Ingomar Heights Road 3a0104e2f97668033b30227726b79f48b9f341a84cd9fa57aa4e23851aee1750@group.calendar.google.com -#result Vivienne fb53f1ba30abe33a395cb3483aaba416675e2ac829e9e74ca25c10d4fae593c5@group.calendar.google.com -#result Benjamin ed47cdac4f626432af8c0d1956499d258d0365cf3fe6ee70ce73d7d478b0f1dd@group.calendar.google.com -#result Madeline c6eed2e9ec829d835357032a344d2f6894677a6e652d04345c73249cd9bff8fb@group.calendar.google.com - - - - # Call the Calendar API - now = datetime.datetime.now(tz=datetime.timezone.utc).isoformat() - tomorrow = (datetime.datetime.now(tz=datetime.timezone.utc)+datetime.timedelta(days=3)).isoformat() - #print("Getting the upcoming 10 events") - allevents = [] - for i in range(0,len(calendarids)): - events_result = ( - service.events() - .list( - calendarId=calendarids[i], - timeMin=now, - timeMax=tomorrow, - maxResults=10, - singleEvents=True, - orderBy="startTime", - ) - .execute() - ) - events = events_result.get("items", []) - - #if not events: - # print("No upcoming events found.") - # return - - # Prints the start and name of the next 10 events - #for event in events: - # start = event["start"].get("dateTime", event["start"].get("date")) - #print(start, event["summary"],"(from "+calendarsummaries[i]+")") - #print("type events",type(events),"type event",type(event)) - #allevents.append(events) - for event in events: - event["calendarname"]=calendarsummaries[i] - allevents.append(event) - #print("allevents",allevents) - allevents2 = sorted(allevents, key=lambda event: event["start"].get("dateTime", event["start"].get("date"))) - #for event in allevents2: - # start = event["start"].get("dateTime", event["start"].get("date")) - # print(start, event["summary"],"(from "+calendarsummaries[event["mycalendarkey"]]+")") - except HttpError as error: - print(f"An error occurred: {error}") - allevents2 = [] - return allevents2 - - -if __name__ == "__main__": - allevents = (main()) - for event in allevents: - start = event["start"].get("dateTime", event["start"].get("date")) - print(start, event["summary"],"(from "+event["calendarname"]+")") diff --git a/imagegen.py b/imagegen.py index 468d2ef..7f0f744 100644 --- a/imagegen.py +++ b/imagegen.py @@ -57,7 +57,11 @@ apptxt = "" for event in appointments: #start = event["start"].get("dateTime", event["start"].get("date")) #apptxt+= start+": "+event["summary"]+" (from "+event["calendarname"]+")\n" - apptxt+= event["prettytime"]+": "+event["summary"]+" (from "+event["calendarname"]+")\n" + if event["prettytime"]: + apptxt+= event["prettytime"]+": "+event["summary"]+" (from "+event["calendarname"]+")\n" + else: + apptxt+= event["summary"]+" (from "+event["calendarname"]+")\n" + row = WriteTextBlock("Appointments",d,fntBold,MarginLeft,row,"la") row = WriteTextBlock(apptxt,d,fnt,MarginIndent,row,"la") diff --git a/token.json b/token.json index d819583..6688338 100644 --- a/token.json +++ b/token.json @@ -1 +1 @@ -{"token": "ya29.a0AQvPyIMHrSNFN1lrBE6dNgfjH8KLw2fF-TL3Ep1kdDd4sX_uGk7MZfhrC79LtWgAlcTPyo-C4ic6YJsixNmwpR4hIRbvEJDI_3jNYRftbJTEz88cQl0hBFBctSWxJyunkbOxoQFQyrR7ydAzjSmLPNVtYVzRXre89w17DWOsQQYYhNKeaWxsFw_AbOFftdbI20Dk8bxRaCgYKAe8SARMSFQHGX2Miuq7-KXA_kb5n3OPmhaJB2g0207", "refresh_token": "1//05gtSbVRZIG0QCgYIARAAGAUSNwF-L9Irsu_pTbTjO_hMIFTJier0k5qwNj703kl1Uzw6bSK9GN9uK8taw1rNofOxQBXJPZJg6_Y", "token_uri": "https://oauth2.googleapis.com/token", "client_id": "639649814827-rt3k1lvdki8ijtf82lqo7v2e9lp2ekl5.apps.googleusercontent.com", "client_secret": "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", "scopes": ["https://www.googleapis.com/auth/calendar.readonly"], "universe_domain": "googleapis.com", "account": "", "expiry": "2026-05-31T00:00:01.956109Z"} \ No newline at end of file +{"token": "ya29.a0AQvPyIMP600wh7gMW2d7H3QUZJASVBf5iAK2K-hT59qwZ5C24Q6kW9jElF1vXW-AQOQu0xabV6clQfbvxlXhuHbqlQXZ9eV06IS1lBmQ_NTSG6SOgp2j8V3JV0gHbLYcCsibeD4_hwrXslXEOLSQYmlJkQYD0N8D7PxCnOuJX1JubffTlCQ57z9k2NjJ4KgD9M6D281saCgYKAUMSARMSFQHGX2MiBC1fCe8w0mGVcsXLgtRZQA0207", "refresh_token": "1//05gtSbVRZIG0QCgYIARAAGAUSNwF-L9Irsu_pTbTjO_hMIFTJier0k5qwNj703kl1Uzw6bSK9GN9uK8taw1rNofOxQBXJPZJg6_Y", "token_uri": "https://oauth2.googleapis.com/token", "client_id": "639649814827-rt3k1lvdki8ijtf82lqo7v2e9lp2ekl5.apps.googleusercontent.com", "client_secret": "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", "scopes": ["https://www.googleapis.com/auth/calendar.readonly"], "universe_domain": "googleapis.com", "account": "", "expiry": "2026-06-02T01:00:01.538193Z"} \ No newline at end of file