code refactoring

This commit is contained in:
2024-06-07 11:19:17 +02:00
parent 00ca9156fb
commit f4c4d6928b

View File

@@ -82,6 +82,9 @@ func (p *Process) Start() {
buildFilename(&p.Output) buildFilename(&p.Output)
//TODO: it spawn another one yt-dlp process, too slow.
go p.GetFileName(&out)
baseParams := []string{ baseParams := []string{
strings.Split(p.Url, "?list")[0], //no playlist strings.Split(p.Url, "?list")[0], //no playlist
"--newline", "--newline",
@@ -122,8 +125,6 @@ func (p *Process) Start() {
p.proc = cmd.Process p.proc = cmd.Process
go p.SetMetadata()
// --------------- progress block --------------- // // --------------- progress block --------------- //
var ( var (
sourceChan = make(chan []byte) sourceChan = make(chan []byte)
@@ -272,7 +273,6 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) {
return info, nil return info, nil
} }
// TODO: remove, potentially unused
func (p *Process) GetFileName(o *DownloadOutput) error { func (p *Process) GetFileName(o *DownloadOutput) error {
cmd := exec.Command( cmd := exec.Command(
config.Instance().DownloaderPath, config.Instance().DownloaderPath,
@@ -302,12 +302,7 @@ func (p *Process) SetPending() {
} }
func (p *Process) SetMetadata() error { func (p *Process) SetMetadata() error {
cmd := exec.Command( cmd := exec.Command(config.Instance().DownloaderPath, p.Url, "-J")
config.Instance().DownloaderPath,
p.Url,
"-J",
"-o", fmt.Sprintf("%s/%s", p.Output.Path, p.Output.Filename),
)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
@@ -354,14 +349,13 @@ func (p *Process) SetMetadata() error {
return err return err
} }
p.Info = info
p.Progress.Status = StatusPending
if err := cmd.Wait(); err != nil { if err := cmd.Wait(); err != nil {
return errors.New(bufferedStderr.String()) return errors.New(bufferedStderr.String())
} }
p.Info = info
p.Progress.Status = StatusPending
p.Output.SavedFilePath = info.FileName
return nil return nil
} }