97 custom arguments broken (#99)

* golang debug

* handle template in playlist download

* code refactoring, dropped goccy go json
This commit is contained in:
Marco
2023-10-22 15:54:08 +02:00
committed by GitHub
parent 8eb2831bc6
commit ba23485b33
13 changed files with 60 additions and 48 deletions

View File

@@ -2,13 +2,12 @@ package internal
import (
"bufio"
"encoding/json"
"fmt"
"regexp"
"sync"
"syscall"
"github.com/goccy/go-json"
"log"
"os"
"os/exec"
@@ -38,7 +37,7 @@ type ProgressTemplate struct {
Percentage string `json:"percentage"`
Speed float32 `json:"speed"`
Size string `json:"size"`
Eta int `json:"eta"`
Eta float32 `json:"eta"`
}
// Process descriptor
@@ -70,6 +69,10 @@ func (p *Process) Start() {
return !match
})
p.Params = slices.Filter(p.Params, func(e string) bool {
return e != ""
})
out := DownloadOutput{
Path: config.Instance().GetConfig().DownloadPath,
Filename: "%(title)s.%(ext)s",
@@ -87,7 +90,8 @@ func (p *Process) Start() {
"--newline",
"--no-colors",
"--no-playlist",
"--progress-template", strings.ReplaceAll(template, "\n", ""),
"--progress-template",
strings.NewReplacer("\n", "", "\t", "", " ", "").Replace(template),
"-o",
fmt.Sprintf("%s/%s", out.Path, out.Filename),
}, p.Params...)