Move Filename to media.MediaFile

handlers.go

@@ -634,9 +634,9 @@ func startDownload(originalID uint, videoURL string, audioOnly bool) {
 			MediaFile: media.MediaFile{
 				Length:   mediaMeta.length,
 				Size:     mediaMeta.size,
+				Filename: dlFilename,
 			},
 			OriginalID: originalID,
-			Filename:   dlFilename,
 			Source:     "original",
 		}
 		fmt.Println("create Audio", audio)
@@ -657,9 +657,9 @@ func startDownload(originalID uint, videoURL string, audioOnly bool) {
 			MediaFile: media.MediaFile{
 				Length:   mediaMeta.length,
 				Size:     mediaMeta.size,
+				Filename: dlFilename,
 			},
 			OriginalID: originalID,
-			Filename:   dlFilename,
 			Source:     "original",
 			FPS:        mediaMeta.fps,
 			Width:      mediaMeta.width,

media/models.go

@@ -16,6 +16,7 @@ type MediaFile struct {
 	Length   float64
 	Type     string
 	Codec    string
+	Filename string
 }
 
 type Audio struct {
@@ -24,7 +25,6 @@ type Audio struct {
 	OriginalID uint   // Original.ID
 	Source     string // "original", "transcode"
 	Bps        uint
-	Filename   string
 	Status     Status
 }
 
@@ -33,7 +33,6 @@ type Video struct {
 	MediaFile
 	OriginalID uint   // Original.ID
 	Source     string // "original", "transcode"
-	Filename   string
 	Width      uint
 	Height     uint
 	FPS        float64

workers.go

@@ -80,7 +80,12 @@ func videoToVideo(sem chan struct{}, transID uint, srcFilepath string) {
 	db.First(&orig, "id = ?", trans.OriginalID)
 
 	// create video record
-	video := media.Video{OriginalID: orig.ID, Source: "transcode", Filename: dstFilename}
+	video := media.Video{
+		MediaFile: media.MediaFile{
+			Filename: dstFilename,
+		},
+		OriginalID: orig.ID, Source: "transcode",
+	}
 
 	fileSize, err := getSize(dstFilepath)
 	if err == nil {
@@ -144,8 +149,11 @@ func videoToAudio(sem chan struct{}, transID uint, videoFilepath string) {
 	db.First(&orig, "id = ?", trans.OriginalID)
 
 	// create audio record
-	audio := media.Audio{OriginalID: orig.ID,
+	audio := media.Audio{
+		MediaFile: media.MediaFile{
 			Filename: audioFilename,
+		},
+		OriginalID: orig.ID,
 		Bps:        trans.Kbps * 1000,
 		Source:     "transcode",
 	}
@@ -205,8 +213,10 @@ func audioToAudio(sem chan struct{}, transID uint, srcFilepath string) {
 
 	// create audio record
 	audio := media.Audio{
-		OriginalID: orig.ID,
+		MediaFile: media.MediaFile{
 			Filename: dstFilename,
+		},
+		OriginalID: orig.ID,
 		Bps:        trans.Kbps * 1000,
 		Source:     "transcode",
 	}