Merge pull request #1198 from supersational/main

Fix computer.calendar dates issue

Author: KillianLucas

interpreter/core/computer/calendar/calendar.py

@@ -5,6 +5,21 @@
 from ..utils.run_applescript import run_applescript, run_applescript_capture
 
 
+makeDateFunction = """
+on makeDate(yr, mon, day, hour, min, sec)
+	set theDate to current date
+	tell theDate
+		set its year to yr
+		set its month to mon
+		set its day to day
+		set its hours to hour
+		set its minutes to min
+		set its seconds to sec
+	end tell
+	return theDate
+end makeDate
+"""
+
 class Calendar:
     def __init__(self, computer):
         self.computer = computer
@@ -18,23 +33,13 @@ def get_events(self, start_date=datetime.date.today(), end_date=None):
         if platform.system() != "Darwin":
             return "This method is only supported on MacOS"
 
-        # Format dates for AppleScript
-        applescript_start_date = (
-            start_date.strftime("%A, %B %d, %Y") + " at 12:00:00 AM"
-        )
-        if end_date:
-            applescript_end_date = (
-                end_date.strftime("%A, %B %d, %Y") + " at 11:59:59 PM"
-            )
-        else:
-            applescript_end_date = (
-                start_date.strftime("%A, %B %d, %Y") + " at 11:59:59 PM"
-            )
-
+        if not end_date:
+            end_date = start_date
         # AppleScript command
         script = f"""
-        set theDate to date "{applescript_start_date}"
-        set endDate to date "{applescript_end_date}"
+        {makeDateFunction}
+        set theDate to makeDate({start_date.strftime("%Y, %m, %d, 0, 0, 0")})
+        set endDate to makeDate({end_date.strftime("%Y, %m, %d, 23, 59, 59")})
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
             if calendarIsRunning then
@@ -179,6 +184,9 @@ def create_event(
                 return "Can't find a default calendar. Please try again and specify a calendar name."
 
         script = f"""
+        {makeDateFunction}
+        set startDate to makeDate({start_date.strftime("%Y, %m, %d, %H, %M, %S")})
+        set endDate to makeDate({end_date.strftime("%Y, %m, %d, %H, %M, %S")})
         -- Open and activate calendar first
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
@@ -192,8 +200,6 @@ def create_event(
         end tell
         tell application "{self.calendar_app}"
             tell calendar "{calendar}"
-                set startDate to date "{applescript_start_date}"
-                set endDate to date "{applescript_end_date}"
                 make new event at end with properties {{summary:"{title}", start date:startDate, end date:endDate, location:"{location}", description:"{notes}"}}
             end tell
             -- tell the Calendar app to refresh if it's running, so the new event shows up immediately
@@ -223,9 +229,9 @@ def delete_event(
             if not calendar:
                 return "Can't find a default calendar. Please try again and specify a calendar name."
 
-        # Format datetime for AppleScript
-        applescript_start_date = start_date.strftime("%B %d, %Y %I:%M:%S %p")
         script = f"""
+        {makeDateFunction}
+        set eventStartDate to makeDate({start_date.strftime("%Y, %m, %d, %H, %M, %S")})
         -- Open and activate calendar first
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
@@ -242,7 +248,6 @@ def delete_event(
             set myCalendar to calendar "{calendar}"
             
             -- Define the exact start date and name of the event to find and delete
-            set eventStartDate to date "{applescript_start_date}"
             set eventSummary to "{event_title}"
             
             -- Find the event by start date and summary

interpreter/core/default_system_message.py

@@ -18,7 +18,7 @@
 ```python
 computer.browser.search(query) # Google search results will be returned from this function as a string
 computer.files.edit(path_to_file, original_text, replacement_text) # Edit a file
-computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
+computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end_date=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
 computer.calendar.get_events(start_date=datetime.date.today(), end_date=None) # Get events between dates. If end_date is None, only gets events for start_date
 computer.calendar.delete_event(event_title="Meeting", start_date=datetime.datetime) # Delete a specific event with a matching title and start date, you may need to get use get_events() to find the specific event object first
 computer.contacts.get_phone_number("John Doe")

interpreter/terminal_interface/profiles/defaults/01.py

@@ -69,7 +69,7 @@
 ```python
 result_string = computer.browser.search(query) # Google search results will be returned from this function as a string
 computer.files.edit(path_to_file, original_text, replacement_text) # Edit a file
-computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
+computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end_date=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
 events_string = computer.calendar.get_events(start_date=datetime.date.today(), end_date=None) # Get events between dates. If end_date is None, only gets events for start_date
 computer.calendar.delete_event(event_title="Meeting", start_date=datetime.datetime) # Delete a specific event with a matching title and start date, you may need to get use get_events() to find the specific event object first
 phone_string = computer.contacts.get_phone_number("John Doe")

interpreter/terminal_interface/profiles/defaults/os.py

@@ -62,7 +62,7 @@
         print('''
 computer.browser.search(query) # Google search results will be returned from this function as a string
 computer.files.edit(path_to_file, original_text, replacement_text) # Edit a file
-computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
+computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end_date=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
 computer.calendar.get_events(start_date=datetime.date.today(), end_date=None) # Get events between dates. If end_date is None, only gets events for start_date
 computer.calendar.delete_event(event_title="Meeting", start_date=datetime.datetime) # Delete a specific event with a matching title and start date, you may need to get use get_events() to find the specific event object first
 computer.contacts.get_phone_number("John Doe")