From a64dca7c41c4dba70e4d87ce2ce38ac4723eefc4 Mon Sep 17 00:00:00 2001 From: erio Date: Sat, 7 Mar 2026 19:23:59 +0800 Subject: [PATCH] fix: use SoraObjectStorage interface for storage router compatibility Co-Authored-By: Claude Opus 4.6 --- backend/internal/handler/sora_videos_handler.go | 4 ++-- backend/internal/service/sora_task_worker.go | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/internal/handler/sora_videos_handler.go b/backend/internal/handler/sora_videos_handler.go index c75b1ce91f..56fc10937e 100644 --- a/backend/internal/handler/sora_videos_handler.go +++ b/backend/internal/handler/sora_videos_handler.go @@ -15,7 +15,7 @@ import ( type SoraVideosHandler struct { taskService *service.SoraTaskService gatewayService *service.GatewayService - objectStorage *service.SoraS3Storage + objectStorage service.SoraObjectStorage mediaStorage *service.SoraMediaStorage soraGatewayService *service.SoraGatewayService } @@ -23,7 +23,7 @@ type SoraVideosHandler struct { func NewSoraVideosHandler( taskService *service.SoraTaskService, gatewayService *service.GatewayService, - objectStorage *service.SoraS3Storage, + objectStorage service.SoraObjectStorage, mediaStorage *service.SoraMediaStorage, soraGatewayService *service.SoraGatewayService, ) *SoraVideosHandler { diff --git a/backend/internal/service/sora_task_worker.go b/backend/internal/service/sora_task_worker.go index eff12f149a..8bbc19032f 100644 --- a/backend/internal/service/sora_task_worker.go +++ b/backend/internal/service/sora_task_worker.go @@ -13,7 +13,7 @@ import ( type SoraTaskWorker struct { taskService *SoraTaskService accountRepo AccountRepository - s3Storage *SoraS3Storage + objectStorage SoraObjectStorage mediaStorage *SoraMediaStorage interval time.Duration pollTimeout time.Duration @@ -25,7 +25,7 @@ type SoraTaskWorker struct { func NewSoraTaskWorker( taskService *SoraTaskService, accountRepo AccountRepository, - s3Storage *SoraS3Storage, + objectStorage SoraObjectStorage, mediaStorage *SoraMediaStorage, interval time.Duration, ) *SoraTaskWorker { @@ -35,7 +35,7 @@ func NewSoraTaskWorker( return &SoraTaskWorker{ taskService: taskService, accountRepo: accountRepo, - s3Storage: s3Storage, + objectStorage: objectStorage, mediaStorage: mediaStorage, interval: interval, pollTimeout: 30 * time.Second, @@ -136,14 +136,14 @@ func (w *SoraTaskWorker) tryStoreMedia(ctx context.Context, task *SoraTask) { mediaType = "image" } - if w.s3Storage != nil && w.s3Storage.Enabled(ctx) { - key, _, err := w.s3Storage.UploadFromURL(ctx, 0, task.VideoURL) + if w.objectStorage != nil && w.objectStorage.Enabled(ctx) { + key, _, err := w.objectStorage.UploadFromURL(ctx, 0, task.VideoURL) if err != nil { logger.LegacyPrintf("service.sora_task_worker", - "[StoreMedia] task=%s S3 upload error: %v", task.ID, err) + "[StoreMedia] task=%s object storage upload error: %v", task.ID, err) } else { task.StoredKey = key - task.StorageType = "s3" + task.StorageType = w.objectStorage.StorageType() if updateErr := w.taskService.repo.Update(ctx, task); updateErr != nil { logger.LegacyPrintf("service.sora_task_worker", "[StoreMedia] task=%s update stored_key error: %v", task.ID, updateErr)