cwpearson/ytdlp-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Filename to media.MediaFile

Browse Source
This commit is contained in:
Carl Pearson
2024-11-05 05:32:04 -07:00
parent d109ce0dee
commit 41d69c2fa4
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
handlers.go
View File

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

11
media/models.go
View File

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

22
workers.go
View File

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