fixed cal downloads
This commit is contained in:
@@ -182,6 +182,9 @@ async def fetch_calendar_async(headers, progress, task_id, dry_run, vdir_path, i
|
|||||||
async def _sync_outlook_data(dry_run, vdir, icsfile, org, days_back, days_forward, continue_iteration, download_attachments):
|
async def _sync_outlook_data(dry_run, vdir, icsfile, org, days_back, days_forward, continue_iteration, download_attachments):
|
||||||
"""Synchronize data from external sources."""
|
"""Synchronize data from external sources."""
|
||||||
|
|
||||||
|
# Expand the user home directory in vdir path
|
||||||
|
vdir = os.path.expanduser(vdir)
|
||||||
|
|
||||||
# Save emails to Maildir
|
# Save emails to Maildir
|
||||||
maildir_path = (
|
maildir_path = (
|
||||||
os.getenv("MAILDIR_PATH", os.path.expanduser(
|
os.getenv("MAILDIR_PATH", os.path.expanduser(
|
||||||
@@ -265,7 +268,7 @@ async def _sync_outlook_data(dry_run, vdir, icsfile, org, days_back, days_forwar
|
|||||||
"--days-forward",
|
"--days-forward",
|
||||||
type=int,
|
type=int,
|
||||||
help="Number of days to look forward for calendar events",
|
help="Number of days to look forward for calendar events",
|
||||||
default=6,
|
default=30,
|
||||||
)
|
)
|
||||||
@click.option(
|
@click.option(
|
||||||
"--continue-iteration",
|
"--continue-iteration",
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ async def fetch_calendar_events(
|
|||||||
calendar_url = (
|
calendar_url = (
|
||||||
f"https://graph.microsoft.com/v1.0/me/calendarView?"
|
f"https://graph.microsoft.com/v1.0/me/calendarView?"
|
||||||
f"startDateTime={start_date_str}&endDateTime={end_date_str}&"
|
f"startDateTime={start_date_str}&endDateTime={end_date_str}&"
|
||||||
f"$select=id,subject,organizer,start,end,location,isAllDay,showAs,sensitivity"
|
f"$select=id,subject,organizer,start,end,location,isAllDay,showAs,sensitivity&$count=true"
|
||||||
)
|
)
|
||||||
|
|
||||||
events = []
|
events = []
|
||||||
@@ -57,4 +57,5 @@ async def fetch_calendar_events(
|
|||||||
next_link = response_data.get("@odata.nextLink")
|
next_link = response_data.get("@odata.nextLink")
|
||||||
|
|
||||||
# Return events and total count
|
# Return events and total count
|
||||||
return events, len(events)
|
total_count = response_data.get("@odata.count", len(events))
|
||||||
|
return events, total_count
|
||||||
|
|||||||
Reference in New Issue
Block a user