From db5097c88960bbf775938b474bee5ad12dac791e Mon Sep 17 00:00:00 2001 From: marcobaobao Date: Tue, 1 Aug 2023 14:43:52 +0200 Subject: [PATCH] hotfix formats --- server/internal/process.go | 10 ++++------ server/rpc/service.go | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/server/internal/process.go b/server/internal/process.go index 1be9019..ea866bc 100644 --- a/server/internal/process.go +++ b/server/internal/process.go @@ -193,7 +193,7 @@ func (p *Process) Kill() error { // Returns the available format for this URL func (p *Process) GetFormatsSync() (DownloadFormats, error) { cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.Url, "-J") - stdout, err := cmd.StdoutPipe() + stdout, err := cmd.Output() if err != nil { return DownloadFormats{}, err @@ -209,29 +209,27 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) { wg.Add(2) - err = cmd.Start() if err != nil { return DownloadFormats{}, err } log.Println( cli.BgRed, "Metadata", cli.Reset, - cli.BgBlue, p.getShortId(), cli.Reset, + cli.BgBlue, "Formats", cli.Reset, p.Url, ) go func() { - decodingError = json.NewDecoder(stdout).Decode(&info) + decodingError = json.Unmarshal(stdout, &info) wg.Done() }() go func() { - decodingError = json.NewDecoder(stdout).Decode(&best) + decodingError = json.Unmarshal(stdout, &best) wg.Done() }() wg.Wait() - cmd.Wait() if decodingError != nil { return DownloadFormats{}, err diff --git a/server/rpc/service.go b/server/rpc/service.go index 6bb5b23..bd7f2d8 100644 --- a/server/rpc/service.go +++ b/server/rpc/service.go @@ -67,10 +67,10 @@ func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error } // Progess retrieves available format for a given resource -func (s *Service) Formats(args Args, progress *internal.DownloadFormats) error { +func (s *Service) Formats(args Args, meta *internal.DownloadFormats) error { var err error p := internal.Process{Url: args.URL} - *progress, err = p.GetFormatsSync() + *meta, err = p.GetFormatsSync() return err }