Clip and Video share VideoFile

handlers.go

@@ -654,16 +654,18 @@ func startDownload(originalID uint, videoURL string, audioOnly bool) {
 		}
 
 		video := media.Video{
-			MediaFile: media.MediaFile{
+			VideoFile: media.VideoFile{
-				Length:   mediaMeta.length,
+				MediaFile: media.MediaFile{
-				Size:     mediaMeta.size,
+					Length:   mediaMeta.length,
-				Filename: dlFilename,
+					Size:     mediaMeta.size,
+					Filename: dlFilename,
+				},
+				FPS:    mediaMeta.fps,
+				Width:  mediaMeta.width,
+				Height: mediaMeta.height,
 			},
 			OriginalID: originalID,
 			Source:     "original",
-			FPS:        mediaMeta.fps,
-			Width:      mediaMeta.width,
-			Height:     mediaMeta.height,
 		}
 		log.Debugln("create Video", video)
 		if db.Create(&video).Error != nil {

media/models.go

@@ -19,6 +19,13 @@ type MediaFile struct {
 	Filename string
 }
 
+type VideoFile struct {
+	MediaFile
+	Width  uint
+	Height uint
+	FPS    float64
+}
+
 type Audio struct {
 	gorm.Model
 	MediaFile
@@ -30,11 +37,14 @@ type Audio struct {
 
 type Video struct {
 	gorm.Model
-	MediaFile
+	VideoFile
 	OriginalID uint   // Original.ID
 	Source     string // "original", "transcode"
-	Width      uint
-	Height     uint
-	FPS        float64
 	Status     Status
 }
+
+type Clip struct {
+	gorm.Model
+	VideoFile
+	OriginalID uint // Original.ID
+}

workers.go

@@ -81,8 +81,10 @@ func videoToVideo(sem chan struct{}, transID uint, srcFilepath string) {
 
 	// create video record
 	video := media.Video{
-		MediaFile: media.MediaFile{
+		VideoFile: media.VideoFile{
-			Filename: dstFilename,
+			MediaFile: media.MediaFile{
+				Filename: dstFilename,
+			},
 		},
 		OriginalID: orig.ID, Source: "transcode",
 	}