rogee/qvyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: issues

Browse Source
This commit is contained in:
Rogee
2025-01-17 19:26:32 +08:00
parent 5b511a5ea1
commit 4f47b5f090
5 changed files with 161 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
backend/app/jobs/post_delete_assets.go
View File

@@ -7,14 +7,10 @@ import (
"backend/app/http/medias"
"backend/app/http/posts"
"backend/app/http/storages"
"backend/database/fields"
"backend/database/models/qvyun_v2/public/model"
_ "git.ipao.vip/rogeecn/atom"
_ "git.ipao.vip/rogeecn/atom/contracts"
"github.com/pkg/errors"
. "github.com/riverqueue/river"
"github.com/samber/lo"
"github.com/sirupsen/logrus"
)
@@ -65,43 +61,5 @@ func (w *PostDeleteAssetsJobWorker) NextRetry(job *Job[PostDeleteAssetsJob]) tim
}
func (w *PostDeleteAssetsJobWorker) Work(ctx context.Context, job *Job[PostDeleteAssetsJob]) error {
post, err := w.postSvc.ForceGetPostByID(ctx, job.Args.PostID)
if err != nil {
return errors.Wrapf(err, "failed to get post(%d) by id", job.Args.PostID)
}
mediaIDs := lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) int64 {
return asset.Media
})
medias, err := w.mediaSvc.GetMediasByIDs(ctx, post.TenantID, post.UserID, mediaIDs)
if err != nil {
return errors.Wrapf(err, "failed to get medias by ids(%v)", mediaIDs)
}
storageIds := lo.Map(medias, func(media *model.Medias, _ int) int64 { return media.StorageID })
storageMap, err := w.storageSvc.GetFSMapByIDs(ctx, storageIds...)
if err != nil {
return err
}
// remove assets
for _, media := range medias {
st, ok := storageMap[media.StorageID]
if !ok {
continue
}
if err := st.Remove(media.Path); err != nil {
return errors.Wrapf(err, "failed to remove media(%d)", media.ID)
}
}
// delete all assets
ids := lo.Map(medias, func(media *model.Medias, _ int) int64 { return media.ID })
if err := w.mediaSvc.DeleteByID(ctx, ids...); err != nil {
return errors.Wrapf(err, "failed to delete media(%d)", ids)
}
return nil
}

26
backend/app/jobs/post_video_cut.go
View File

@@ -88,9 +88,8 @@ func (w *PostVideoCutJobWorker) Work(ctx context.Context, job *Job[PostVideoCutJ
videoPath := media.Path
// 获取全长度的音频
_, ok := lo.Find(post.Assets.Data, func(asset fields.MediaAsset) bool {
return asset.Type == fields.MediaAssetTypeAudio && asset.Mark != nil && *asset.Mark == "audio-preview"
return asset.Type == fields.MediaAssetTypeAudio && asset.Mark != nil && *asset.Mark == "video-preview"
})
if ok {
return nil
@@ -142,9 +141,26 @@ func (w *PostVideoCutJobWorker) Work(ctx context.Context, job *Job[PostVideoCutJ
return errors.Wrapf(err, "attach video(%s) to post(%d) failed", videoPath, post.ID)
}
post.Meta.WorkerMark = post.Meta.WorkerMark & 1 << 0
if err := w.postSvc.UpdateMeta(ctx, job.Args.TenantID, job.Args.UserID, post.ID, post.Meta); err != nil {
return errors.Wrapf(err, "update post(%d) meta failed", post.ID)
post, err = w.postSvc.GetPostByID(ctx, job.Args.PostID)
if err != nil {
return errors.Wrapf(err, "get post(%d) failed", job.Args.PostID)
}
marks := lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) string {
if asset.Mark != nil {
return *asset.Mark
}
return ""
})
if items := lo.Intersect([]string{"audio-preview", "video-preview", "video", "audio"}, marks); len(items) == 4 {
if err := w.postSvc.UpdateStatus(ctx, job.Args.TenantID, job.Args.UserID, post.ID, fields.PostStatusVerified); err != nil {
return errors.Wrapf(err, "update post(%d) status failed", post.ID)
}
if err := w.postSvc.UpdateStage(ctx, job.Args.TenantID, job.Args.UserID, post.ID, fields.PostStageCompleted); err != nil {
return errors.Wrapf(err, "update post(%d) state failed", post.ID)
}
}
return nil

24
backend/app/jobs/post_video_extract_audio.go
View File

@@ -145,14 +145,26 @@ func (w *PostVideoExtractAudioJobWorker) Work(ctx context.Context, job *Job[Post
return errors.Wrapf(err, "attach audio(%s) to post(%d) failed", audioPath, post.ID)
}
if job.Args.Mark == "audio-preview" {
post.Meta.WorkerMark = post.Meta.WorkerMark & 1 << 1
} else if job.Args.Mark == "audio" {
post.Meta.WorkerMark = post.Meta.WorkerMark & 1 << 2
// 检查是否可发布
post, err = w.postSvc.GetPostByID(ctx, job.Args.PostID)
if err != nil {
return errors.Wrapf(err, "get post(%d) failed", job.Args.PostID)
}
if err := w.postSvc.UpdateMeta(ctx, job.Args.TenantID, job.Args.UserID, post.ID, post.Meta); err != nil {
return errors.Wrapf(err, "update post(%d) meta failed", post.ID)
marks := lo.Map(post.Assets.Data, func(asset fields.MediaAsset, _ int) string {
if asset.Mark != nil {
return *asset.Mark
}
return ""
})
if items := lo.Intersect([]string{"audio-preview", "video-preview", "video", "audio"}, marks); len(items) == 4 {
if err := w.postSvc.UpdateStatus(ctx, job.Args.TenantID, job.Args.UserID, post.ID, fields.PostStatusVerified); err != nil {
return errors.Wrapf(err, "update post(%d) status failed", post.ID)
}
if err := w.postSvc.UpdateStage(ctx, job.Args.TenantID, job.Args.UserID, post.ID, fields.PostStageCompleted); err != nil {
return errors.Wrapf(err, "update post(%d) state failed", post.ID)
}
}
return nil