From 38a0cedc9c7ac1b9eb8c07444dd9eacdf5d3bc6e Mon Sep 17 00:00:00 2001 From: marcobaobao Date: Sun, 14 Jul 2024 15:52:36 +0200 Subject: [PATCH] fixed empty url in format selection Closes #163 --- frontend/src/components/DownloadDialog.tsx | 1 - server/internal/process.go | 3 +-- server/rpc/service.go | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/DownloadDialog.tsx b/frontend/src/components/DownloadDialog.tsx index 3a9b033..6e402f2 100644 --- a/frontend/src/components/DownloadDialog.tsx +++ b/frontend/src/components/DownloadDialog.tsx @@ -125,7 +125,6 @@ const DownloadDialog: FC = ({ open, onClose, onDownloadStart }) => { * Retrive url from input and display the formats selection view */ const sendUrlFormatSelection = () => { - setUrl('') setPickedAudioFormat('') setPickedVideoFormat('') setPickedBestFormat('') diff --git a/server/internal/process.go b/server/internal/process.go index 933f9c4..326c4af 100644 --- a/server/internal/process.go +++ b/server/internal/process.go @@ -222,7 +222,7 @@ func (p *Process) Kill() error { // Returns the available format for this URL // TODO: Move out from process.go -func (p *Process) GetFormatsSync() (DownloadFormats, error) { +func (p *Process) GetFormats() (DownloadFormats, error) { cmd := exec.Command(config.Instance().DownloaderPath, p.Url, "-J") stdout, err := cmd.Output() @@ -257,7 +257,6 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) { decodingError = json.Unmarshal(stdout, &info) wg.Done() }() - go func() { decodingError = json.Unmarshal(stdout, &best) wg.Done() diff --git a/server/rpc/service.go b/server/rpc/service.go index b786c7a..cd710a4 100644 --- a/server/rpc/service.go +++ b/server/rpc/service.go @@ -75,7 +75,7 @@ func (s *Service) Formats(args Args, meta *internal.DownloadFormats) error { err error p = internal.Process{Url: args.URL, Logger: s.logger} ) - *meta, err = p.GetFormatsSync() + *meta, err = p.GetFormats() return err }