diff --git a/gcal.py b/gcal.py index 2eba524..f4fad3d 100644 --- a/gcal.py +++ b/gcal.py @@ -19,19 +19,19 @@ def main(): # 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 os.path.exists("/home/tim/venv/ha_imagegen/token.json"): + creds = Credentials.from_authorized_user_file("/home/tim/venv/ha_imagegen/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 + "/home/tim/venv/ha_imagegen/credentials.json", SCOPES ) creds = flow.run_local_server(port=0) # Save the credentials for the next run - with open("token.json", "w") as token: + with open("/home/tim/venv/ha_imagegen/token.json", "w") as token: token.write(creds.to_json()) try: @@ -105,6 +105,13 @@ def main(): #allevents.append(events) for event in events: event["calendarname"]=calendarsummaries[i] + 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(): + pass # This is today, print as is + else: + prettytime = eventdate.strftime("%a")+prettytime + event["prettytime"] = prettytime #(" "+eventdate.strftime("%I:%M %p")).replace(" 0"," ") allevents.append(event) #print("allevents",allevents) allevents2 = sorted(allevents, key=lambda event: event["start"].get("dateTime", event["start"].get("date"))) @@ -120,5 +127,13 @@ def main(): 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"]+")") + #start = event["start"].get("dateTime", event["start"].get("date")) + #print(start, event["summary"],"(from "+event["calendarname"]+")") + print(event["prettytime"], event["summary"],"(from "+event["calendarname"]+")") + #print(event["start"],type(event["start"])) + #eventdate = datetime.datetime.strptime(event["start"]["dateTime"],"%Y-%m-%dT%H:%M:%S%z") + #print((" "+eventdate.strftime("%I:%M %p")).replace(" 0"," ")) + #print(eventdate,type(eventdate)) + #s=datetime.datetime.strptime(,"%Y-%m-%dT%H:%M:%S%z") + #print((event["start"]["dateTime"])) #.datetime.datetime.strftime("%I:%M %p")) + #print("event",allevents[0]) diff --git a/google_weather.py b/google_weather.py index 4ec5a72..dbbd4fb 100644 --- a/google_weather.py +++ b/google_weather.py @@ -23,7 +23,7 @@ def get_current_weather(api_key, lat, lng, units="IMPERIAL"): return response.json() except requests.exceptions.RequestException as e: - #print(f"An error occurred: {e}") + print(f"Current weather: An error occurred: {e}") return None def get_daily_forecast(api_key, lat, lng, days=2): @@ -51,7 +51,7 @@ def get_daily_forecast(api_key, lat, lng, days=2): return data except requests.exceptions.RequestException as e: - #print(f"An error occurred: {e}") + print(f"Forecast: An error occurred: {e}") return None def get_google_weather(): diff --git a/imagegen.py b/imagegen.py index 4f8824d..a0018cd 100644 --- a/imagegen.py +++ b/imagegen.py @@ -52,8 +52,9 @@ row = WriteTextBlock(mlb.get_pirates(),d,fnt,MarginIndent,row,"la") appointments = gcal.main() apptxt = "" for event in appointments: - start = event["start"].get("dateTime", event["start"].get("date")) - apptxt+= start+": "+event["summary"]+" (from "+event["calendarname"]+")\n" + #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" 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 0b0c75b..70ddcd0 100644 --- a/token.json +++ b/token.json @@ -1 +1 @@ -{"token": "ya29.a0AQvPyIP2dRMfAfP_EU_3KqGhRz17yQlLbKXqoAN-x5e7MubbW_aQip2xustRFH6YQDJ73tLVLXb-o6_3UuyB0CKnUhaBnL4xIas4VVBzL-IsvTbtizNiqzH_w-1v3Dm2aS4XdLAQe0dallDjAa2hyLAynZFMQShV_FPmcT8pFhbheq9H0I93OB4vjt_aOLZ0AYUz8CNVaCgYKAc8SARMSFQHGX2MineGZ2lxdkNN6so2g1A0E-w0207", "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-27T03:33:55.003981Z"} \ No newline at end of file +{"token": "ya29.a0AQvPyIOB7XKkNoKaOn-XaVOFDr36NLz5hKxudOk-yuEtdzBwCEdsHau-07O-7hPYMEegmOoYacRjE6KtJD5Usu97deDePaeQ3ekK-fyWWjrnHnBhwgGTb3HRM1jefnds1gHw_cPsFDHoMjtVD-u0K9f_Oz3wEtuxUDSi6lrCUwILHj7BAOf9OciPq6Ozqf1V0q1xLWpsaCgYKASYSARMSFQHGX2MizTezFUvdHgAW383sZqJGow0207", "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-27T12:35:55.702209Z"} \ No newline at end of file