fix event list: configure all page queries, not just the first one

When a large list of events was obtained, only the first query was correct. Subsequent queries used default parameters, so the resulting list always had the earliest events of the calendar, etc.
insanum · Aug 17, 2023 · 048f6ec · 048f6ec
1 parent 30148bc
commit 048f6ec
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/gcalcli/gcal.py b/gcalcli/gcal.py
@@ -1026,8 +1026,18 @@ def _iterate_events(self, start_datetime, event_list, year_date=False,
 
         return selected
 
-    def _GetAllEvents(self, cal, events, end):
-
+    def _GetAllEvents(self, cal, start, end, search_text):
+        events = self._retry_with_backoff(
+                     self.get_events()
+                         .list(
+                             calendarId=cal['id'],
+                             timeMin=start.isoformat() if start else None,
+                             timeMax=end.isoformat() if end else None,
+                             q=search_text if search_text else None,
+                             singleEvents=True
+                         )
+                )
+
         event_list = []
 
         while 1:
@@ -1079,6 +1089,10 @@ def _GetAllEvents(self, cal, events, end):
                              self.get_events()
                                  .list(
                                      calendarId=cal['id'],
+                                     timeMin=start.isoformat() if start else None,
+                                     timeMax=end.isoformat() if end else None,
+                                     q=search_text if search_text else None,
+                                     singleEvents=True,
                                      pageToken=pageToken
                                  )
                          )
@@ -1091,17 +1105,7 @@ def _search_for_events(self, start, end, search_text):
 
         event_list = []
         for cal in self.cals:
-            events = self._retry_with_backoff(
-                         self.get_events()
-                             .list(
-                                 calendarId=cal['id'],
-                                 timeMin=start.isoformat() if start else None,
-                                 timeMax=end.isoformat() if end else None,
-                                 q=search_text if search_text else None,
-                                 singleEvents=True
-                             )
-                    )
-            event_list.extend(self._GetAllEvents(cal, events, end))
+            event_list.extend(self._GetAllEvents(cal, start, end, search_text))
 
         event_list.sort(key=lambda x: x['s'])