Opt: vendor

internal/model/movie.go

@@ -36,9 +36,9 @@ type BaseMovie struct {
 }
 
 type VendorInfo struct {
-	Vendor             StreamingVendor    `json:"vendor"`
+	Vendor   StreamingVendor    `json:"vendor"`
-	Shared             bool               `gorm:"not null;default:false" json:"shared"`
+	Shared   bool               `gorm:"not null;default:false" json:"shared"`
-	BilibiliVendorInfo BilibiliVendorInfo `gorm:"embedded;embeddedPrefix:bilibili_" json:"bilibiliVendorInfo,omitempty"`
+	Bilibili BilibiliVendorInfo `gorm:"embedded;embeddedPrefix:bilibili_" json:"bilibili,omitempty"`
 }
 
 type BilibiliVendorInfo struct {

internal/op/movie.go

@@ -153,7 +153,7 @@ func (m *movie) validateVendorMovie() error {
 	}
 	switch m.Base.VendorInfo.Vendor {
 	case model.StreamingVendorBilibili:
-		info := m.Base.VendorInfo.BilibiliVendorInfo
+		info := m.Base.VendorInfo.Bilibili
 		if info.Bvid == "" && info.Epid == 0 {
 			return fmt.Errorf("bvid and epid are empty")
 		}

server/handlers/movie.go

@@ -499,7 +499,7 @@ func parse2VendorMovie(userID string, movie *dbModel.Movie) (err error) {
 
 	switch movie.Base.VendorInfo.Vendor {
 	case dbModel.StreamingVendorBilibili:
-		info := movie.Base.VendorInfo.BilibiliVendorInfo
+		info := movie.Base.VendorInfo.Bilibili
 
 		vendor, err := db.AssignFirstOrCreateVendorByUserIDAndVendor(userID, dbModel.StreamingVendorBilibili)
 		if err != nil {