Skip to content

Minor update to Google Drive source: generate deletion for trashed. #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
badmonster0 merged 1 commit into from
Apr 3, 2025
Merged

Minor update to Google Drive source: generate deletion for trashed. #258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/ops/sources/google_drive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,16 @@ impl Executor {
if modified_time <= *cutoff_time {
break 'paginate;
}
if self.is_file_covered(&file).await? {
let file_id = file.id.ok_or_else(|| anyhow!("File has no id"))?;
if self.is_file_covered(&file_id).await? {
changes.push(SourceChange {
ordinal: Some(modified_time.try_into()?),
key: KeyValue::Str(Arc::from(
file.id.ok_or_else(|| anyhow!("File has no id"))?,
)),
value: SourceValueChange::Upsert(None),
key: KeyValue::Str(Arc::from(file_id)),
value: if file.trashed == Some(true) {
SourceValueChange::Delete
} else {
SourceValueChange::Upsert(None)
},
});
}
}
Expand All @@ -239,15 +242,10 @@ impl Executor {
Ok(changes)
}

async fn is_file_covered(&self, file: &File) -> Result<bool> {
if file.trashed == Some(true) {
return Ok(false);
}
let mut next_file_id = Some(Cow::Borrowed(
file.id.as_ref().ok_or_else(|| anyhow!("File has no id"))?,
));
async fn is_file_covered(&self, file_id: &str) -> Result<bool> {
let mut next_file_id = Some(Cow::Borrowed(file_id));
while let Some(file_id) = next_file_id {
if self.root_folder_ids.contains(file_id.as_str()) {
if self.root_folder_ids.contains(file_id.as_ref()) {
return Ok(true);
}
let (_, file) = self
Expand Down