hotfix formats
This commit is contained in:
@@ -193,7 +193,7 @@ func (p *Process) Kill() error {
|
|||||||
// Returns the available format for this URL
|
// Returns the available format for this URL
|
||||||
func (p *Process) GetFormatsSync() (DownloadFormats, error) {
|
func (p *Process) GetFormatsSync() (DownloadFormats, error) {
|
||||||
cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.Url, "-J")
|
cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.Url, "-J")
|
||||||
stdout, err := cmd.StdoutPipe()
|
stdout, err := cmd.Output()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return DownloadFormats{}, err
|
return DownloadFormats{}, err
|
||||||
@@ -209,29 +209,27 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) {
|
|||||||
|
|
||||||
wg.Add(2)
|
wg.Add(2)
|
||||||
|
|
||||||
err = cmd.Start()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return DownloadFormats{}, err
|
return DownloadFormats{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Println(
|
log.Println(
|
||||||
cli.BgRed, "Metadata", cli.Reset,
|
cli.BgRed, "Metadata", cli.Reset,
|
||||||
cli.BgBlue, p.getShortId(), cli.Reset,
|
cli.BgBlue, "Formats", cli.Reset,
|
||||||
p.Url,
|
p.Url,
|
||||||
)
|
)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
decodingError = json.NewDecoder(stdout).Decode(&info)
|
decodingError = json.Unmarshal(stdout, &info)
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
decodingError = json.NewDecoder(stdout).Decode(&best)
|
decodingError = json.Unmarshal(stdout, &best)
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
cmd.Wait()
|
|
||||||
|
|
||||||
if decodingError != nil {
|
if decodingError != nil {
|
||||||
return DownloadFormats{}, err
|
return DownloadFormats{}, err
|
||||||
|
|||||||
@@ -67,10 +67,10 @@ func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Progess retrieves available format for a given resource
|
// 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
|
var err error
|
||||||
p := internal.Process{Url: args.URL}
|
p := internal.Process{Url: args.URL}
|
||||||
*progress, err = p.GetFormatsSync()
|
*meta, err = p.GetFormatsSync()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user