opensource/sub2api
3
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-09-24 16:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use SoraObjectStorage interface for storage router compatibility

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
erio
2026-03-07 19:23:59 +08:00
co-authored by Claude Opus 4.6
parent 2b510b6aed
commit a64dca7c41
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/handler/sora_videos_handler.go
+2 -2
View File
@@ -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 {
backend/internal/service/sora_task_worker.go
+7 -7
View File
@@ -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)