Skip to content

fix(aistudio): ignore 404 on temporary Drive cleanup and deduplicate inline media bindings #90

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
Mag1cFall merged 1 commit into from
Oct 29, 2026
Merged

fix(aistudio): ignore 404 on temporary Drive cleanup and deduplicate inline media bindings #90

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
12 changes: 12 additions & 0 deletions internal/aistudio/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,15 @@ func (copies *TemporaryFileCopies) Cleanup() error {
deleteErr := copies.client.deleteDriveFile(
cleanupCtx, copies.lease.Account().ID, copy.token, copy.id,
)
if driveFileNotFound(deleteErr, "DriveDelete") {
deleteErr = nil
}
bindErr := error(nil)
if deleteErr == nil && copy.bound {
bindErr = copies.lease.pool.unbindResourceContext(cleanupCtx, copy.id)
if errors.Is(bindErr, ErrResourceNotFound) {
bindErr = nil
}
}
if deleteErr != nil && copy.media != nil {
bindErr = copies.lease.bindInlineMedia(context.Background(), copy.media.file, copy.media.key, copy.media.size)
Expand Down Expand Up @@ -891,6 +897,12 @@ func (l *AccountLease) bindInlineMedia(ctx context.Context, file FileRef, key in
if owner, exists := l.pool.resources[file.ID]; exists && owner != accountID {
return false, nil, fmt.Errorf("资源 %s 已绑定账户 %s", file.ID, owner)
}
for existingID, binding := range runtimeState.Resources {
if existingID != file.ID && binding.Kind == "inline-media" &&
binding.MIME == key.mime && binding.SHA256 == key.sha256 && binding.DisplayName == key.name {
delete(runtimeState.Resources, existingID)
}
}
now := time.Now().UTC()
runtimeState.Resources[file.ID] = ResourceBinding{
Kind: "inline-media", Name: file.Name, MIME: file.MIME, Size: size, SHA256: key.sha256, CreatedAt: now, UsedAt: now, DisplayName: key.name,
Expand Down
Loading