From 41d69c2fa4420b34bfdb61a90161147bf251421d Mon Sep 17 00:00:00 2001
From: Carl Pearson <srht@carlpearson.net>
Date: Tue, 5 Nov 2024 05:32:04 -0700
Subject: [PATCH] Move Filename to media.MediaFile

---
 handlers.go     | 12 ++++++------
 media/models.go | 11 +++++------
 workers.go      | 22 ++++++++++++++++------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/handlers.go b/handlers.go
index 2eb3107..d2c4519 100644
--- a/handlers.go
+++ b/handlers.go
@@ -632,11 +632,11 @@ func startDownload(originalID uint, videoURL string, audioOnly bool) {
 
 		audio := media.Audio{
 			MediaFile: media.MediaFile{
-				Length: mediaMeta.length,
-				Size:   mediaMeta.size,
+				Length:   mediaMeta.length,
+				Size:     mediaMeta.size,
+				Filename: dlFilename,
 			},
 			OriginalID: originalID,
-			Filename:   dlFilename,
 			Source:     "original",
 		}
 		fmt.Println("create Audio", audio)
@@ -655,11 +655,11 @@ func startDownload(originalID uint, videoURL string, audioOnly bool) {
 
 		video := media.Video{
 			MediaFile: media.MediaFile{
-				Length: mediaMeta.length,
-				Size:   mediaMeta.size,
+				Length:   mediaMeta.length,
+				Size:     mediaMeta.size,
+				Filename: dlFilename,
 			},
 			OriginalID: originalID,
-			Filename:   dlFilename,
 			Source:     "original",
 			FPS:        mediaMeta.fps,
 			Width:      mediaMeta.width,
diff --git a/media/models.go b/media/models.go
index c8995ee..7d3e015 100644
--- a/media/models.go
+++ b/media/models.go
@@ -12,10 +12,11 @@ const (
 )
 
 type MediaFile struct {
-	Size   int64
-	Length float64
-	Type   string
-	Codec  string
+	Size     int64
+	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
diff --git a/workers.go b/workers.go
index 6b94320..641be59 100644
--- a/workers.go
+++ b/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,10 +149,13 @@ func videoToAudio(sem chan struct{}, transID uint, videoFilepath string) {
 	db.First(&orig, "id = ?", trans.OriginalID)
 
 	// create audio record
-	audio := media.Audio{OriginalID: orig.ID,
-		Filename: audioFilename,
-		Bps:      trans.Kbps * 1000,
-		Source:   "transcode",
+	audio := media.Audio{
+		MediaFile: media.MediaFile{
+			Filename: audioFilename,
+		},
+		OriginalID: orig.ID,
+		Bps:        trans.Kbps * 1000,
+		Source:     "transcode",
 	}
 
 	fileSize, err := getSize(audioFilepath)
@@ -205,8 +213,10 @@ func audioToAudio(sem chan struct{}, transID uint, srcFilepath string) {
 
 	// create audio record
 	audio := media.Audio{
+		MediaFile: media.MediaFile{
+			Filename: dstFilename,
+		},
 		OriginalID: orig.ID,
-		Filename:   dstFilename,
 		Bps:        trans.Kbps * 1000,
 		Source:     "transcode",
 	}