fix: fix video process

GuGoOrg · Aug 21, 2023 · 1cb2714 · 1cb2714
1 parent 098cd3c
commit 1cb2714
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/models/video.go b/src/models/video.go
@@ -7,7 +7,7 @@ import (
 
 // Video 视频表
 type Video struct {
-	ID            uint32 `gorm:"not null;primary_key;auto_increment""`
+	ID            uint32 `gorm:"not null;primary_key;auto_increment"`
 	UserId        uint32 `json:"user_id" gorm:"not null;"`
 	Title         string `json:"title" gorm:"not null;"`
 	FileName      string `json:"play_name" gorm:"not null;"`

diff --git a/src/services/publish/handler.go b/src/services/publish/handler.go
@@ -156,7 +156,7 @@ func (a PublishServiceImpl) CreateVideo(ctx context.Context, request *publish.Cr
 		CoverName: coverName,
 	}
 
-	bytes, err := json.Marshal(raw)
+	marshal, err := json.Marshal(raw)
 	if err != nil {
 		resp = &publish.CreateVideoResponse{
 			StatusCode: strings.VideoServiceInnerErrorCode,
@@ -172,7 +172,7 @@ func (a PublishServiceImpl) CreateVideo(ctx context.Context, request *publish.Cr
 		amqp.Publishing{
 			DeliveryMode: amqp.Persistent,
 			ContentType:  "text/plain",
-			Body:         bytes,
+			Body:         marshal,
 			Headers:      headers,
 		})
 

diff --git a/src/services/videoprocessor/main.go b/src/services/videoprocessor/main.go
@@ -15,6 +15,7 @@ import (
 	"encoding/json"
 	"github.com/sirupsen/logrus"
 	"github.com/streadway/amqp"
+	"gorm.io/gorm/clause"
 	"os/exec"
 	"sync"
 )
@@ -159,16 +160,30 @@ func Consume(channel *amqp.Channel) {
 		}
 
 		// 保存到数据库
-		err = database.Client.WithContext(ctx).Create(&raw).Error
-		if err != nil {
+		video := &models.Video{
+			ID:        raw.VideoId,
+			UserId:    raw.ActorId,
+			Title:     raw.Title,
+			FileName:  raw.FileName,
+			CoverName: raw.CoverName,
+		}
+		result := database.Client.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "id"}},
+			DoUpdates: clause.AssignmentColumns([]string{"user_id", "title", "file_name", "cover_name"}),
+		}).Create(&video)
+		if result.Error != nil {
 			logger.WithFields(logrus.Fields{
 				"file_name":  raw.FileName,
 				"cover_name": raw.CoverName,
 				"err":        err,
-			}).Debug("failed to create db entry")
+			}).Errorf("Error when updating file information to database")
+			logging.SetSpanError(span, result.Error)
+			errorHandler(d, true, logger, &span)
+			span.End()
+			continue
 		}
 		logger.WithFields(logrus.Fields{
-			"entry": raw,
+			"entry": video,
 		}).Debug("saved db entry")
 
 		span.End()