Merge pull request #356 from k1LoW/correct-shared

fix: to work properly with Shared Drive

Author: Songmu

deck.go

@@ -220,7 +220,7 @@ func Delete(ctx context.Context, id string, opts ...Option) (err error) {
 	if err := d.initialize(ctx); err != nil {
 		return err
 	}
-	if err := d.driveSrv.Files.Delete(id).Context(ctx).Do(); err != nil {
+	if err := d.deleteOrTrashFile(ctx, id); err != nil {
 		return fmt.Errorf("failed to delete presentation: %w", err)
 	}
 	return nil
@@ -420,7 +420,7 @@ func (d *Deck) AllowReadingByAnyone(ctx context.Context) (err error) {
 		Type: "anyone",
 		Role: "reader",
 	}
-	if _, err := d.driveSrv.Permissions.Create(d.id, permission).Context(ctx).Do(); err != nil {
+	if _, err := d.driveSrv.Permissions.Create(d.id, permission).SupportsAllDrives(true).Context(ctx).Do(); err != nil {
 		return fmt.Errorf("failed to set permission: %w", err)
 	}
 	return nil
@@ -629,3 +629,24 @@ func (d *Deck) refresh(ctx context.Context) (err error) {
 
 	return nil
 }
+
+// deleteOrTrashFile attempts to delete a file, or move it to trash if deletion is not allowed.
+func (d *Deck) deleteOrTrashFile(ctx context.Context, id string) error {
+	file, err := d.driveSrv.Files.Get(id).SupportsAllDrives(true).Fields("capabilities").Context(ctx).Do()
+	if err != nil {
+		return fmt.Errorf("file not found or not accessible before deletion (file ID: %s): %w", id, err)
+	}
+
+	if file.Capabilities == nil || file.Capabilities.CanDelete {
+		return d.driveSrv.Files.Delete(id).SupportsAllDrives(true).Context(ctx).Do()
+	}
+	if file.Capabilities.CanTrash {
+		updateRequest := &drive.File{Trashed: true}
+		_, err := d.driveSrv.Files.Update(id, updateRequest).SupportsAllDrives(true).Context(ctx).Do()
+		if err != nil {
+			return fmt.Errorf("failed to trash presentation: %w", err)
+		}
+		return nil
+	}
+	return fmt.Errorf("file cannot be deleted or trashed (file ID: %s)", id)
+}

preload.go

@@ -223,9 +223,9 @@ func (d *Deck) startUploadingImages(
 				if _, err := d.driveSrv.Permissions.Create(uploaded.Id, &drive.Permission{
 					Type: "anyone",
 					Role: "reader",
-				}).Do(); err != nil {
+				}).SupportsAllDrives(true).Do(); err != nil {
 					// Clean up uploaded file on permission error
-					if deleteErr := d.driveSrv.Files.Delete(uploaded.Id).SupportsAllDrives(true).Do(); deleteErr != nil {
+					if deleteErr := d.deleteOrTrashFile(ctx, uploaded.Id); deleteErr != nil {
 						d.logger.Error("failed to delete uploaded file after permission error",
 							slog.String("id", uploaded.Id),
 							slog.Any("error", deleteErr))
@@ -235,10 +235,10 @@ func (d *Deck) startUploadingImages(
 				}
 
 				// Get webContentLink
-				f, err := d.driveSrv.Files.Get(uploaded.Id).Fields("webContentLink").Do()
+				f, err := d.driveSrv.Files.Get(uploaded.Id).Fields("webContentLink").SupportsAllDrives(true).Do()
 				if err != nil {
 					// Clean up uploaded file on error
-					if deleteErr := d.driveSrv.Files.Delete(uploaded.Id).SupportsAllDrives(true).Do(); deleteErr != nil {
+					if deleteErr := d.deleteOrTrashFile(ctx, uploaded.Id); deleteErr != nil {
 						d.logger.Error("failed to delete uploaded file after webContentLink fetch error",
 							slog.String("id", uploaded.Id),
 							slog.Any("error", deleteErr))
@@ -249,7 +249,7 @@ func (d *Deck) startUploadingImages(
 
 				if f.WebContentLink == "" {
 					// Clean up uploaded file on error
-					if deleteErr := d.driveSrv.Files.Delete(uploaded.Id).SupportsAllDrives(true).Do(); deleteErr != nil {
+					if deleteErr := d.deleteOrTrashFile(ctx, uploaded.Id); deleteErr != nil {
 						d.logger.Error("failed to delete uploaded file after empty webContentLink",
 							slog.String("id", uploaded.Id),
 							slog.Any("error", deleteErr))
@@ -306,7 +306,7 @@ func (d *Deck) cleanupUploadedImages(ctx context.Context, uploadedCh <-chan uplo
 				// Note: We only log errors here instead of returning them to ensure
 				// all images are attempted to be deleted. A single deletion failure
 				// should not prevent cleanup of other successfully uploaded images.
-				if err := d.driveSrv.Files.Delete(info.uploadedID).SupportsAllDrives(true).Do(); err != nil {
+				if err := d.deleteOrTrashFile(ctx, info.uploadedID); err != nil {
 					d.logger.Error("failed to delete uploaded image",
 						slog.String("id", info.uploadedID),
 						slog.Any("error", err))