From 4583d033d5f42daadd3b0aa51395a2d15d0f3e55 Mon Sep 17 00:00:00 2001 From: Madeline Hashcube Date: Mon, 11 May 2026 18:30:14 -0500 Subject: [PATCH] yt-dlp does not want to use the working directory I specified --- cmd/ytpm/sync.go | 53 ++++++++++++++++++++++++++++++++++++++++++++---- default.nix | 2 +- go.mod | 10 ++++++++- go.sum | 12 +++++++++++ 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/cmd/ytpm/sync.go b/cmd/ytpm/sync.go index c9524d5..8a940ef 100644 --- a/cmd/ytpm/sync.go +++ b/cmd/ytpm/sync.go @@ -2,10 +2,42 @@ package main import ( "os" + "context" + "time" + "fmt" "go.yaml.in/yaml/v4" + ytdlp "github.com/lrstanley/go-ytdlp" ) func SyncSources() (int, error) { + + cacheDir, err := os.UserCacheDir() + if err != nil { + return 0, err + } + + downloadsDir := cacheDir + "/ytpm/" + + cmd := ytdlp.New(). + PrintJSON(). + NoProgress(). + FormatSort("res,ext:mp4:m4a"). + RecodeVideo("mp4"). + NoPlaylist(). + NoOverwrites(). + Continue(). + ProgressFunc(100*time.Millisecond, func(prog ytdlp.ProgressUpdate) { + fmt.Printf( + // Gotta figure out how to not clog up the terminal and also clear the line right + "%s @ %s [eta: %s] :: %s \r", + prog.Status, + prog.PercentString(), + prog.ETA(), + prog.Filename, + ) + }). + SetWorkDir(downloadsDir) + cwd, err := os.Getwd() if err != nil { return 0, err @@ -23,11 +55,24 @@ func SyncSources() (int, error) { return 0, err } - var sources []string + srcCount := 0 - for _, source := range manifestData.Sources { - sources = append(sources, source...) + for _, sources := range manifestData.Sources { + for _, source := range sources { + res, err := cmd.Run(context.TODO(), source) + if err != nil { + return 0, err + } + info, err := res.GetExtractedInfo() + if err != nil { + return 0, err + } + fmt.Println() + for _, i := range info { + fmt.Println(*i.Filename) + } + } } - return len(sources), nil + return srcCount, nil } diff --git a/default.nix b/default.nix index 51f9e24..79697b4 100644 --- a/default.nix +++ b/default.nix @@ -10,5 +10,5 @@ in buildGoModule { inherit name src; - vendorHash = "sha256-ZMYgdV0aiehVGHcrte2jRztf5snGKrsSK4xEPeX2ejo="; + vendorHash = "sha256-H7ZcuEw2OAi3LwoIoKnghV/54j6ngfT3XUVjEHCTQm8="; } diff --git a/go.mod b/go.mod index c5ed38e..6e0b9cd 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,12 @@ module github.com/hashcube-dev/ytpm go 1.26.2 -require go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect +require ( + github.com/ProtonMail/go-crypto v1.3.0 // indirect + github.com/cloudflare/circl v1.6.3 // indirect + github.com/lrstanley/go-ytdlp v1.3.5 // indirect + github.com/ulikunitz/xz v0.5.15 // indirect + go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect + golang.org/x/crypto v0.48.0 // indirect + golang.org/x/sys v0.41.0 // indirect +) diff --git a/go.sum b/go.sum index f7acf56..acbba02 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,16 @@ +github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw= +github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= +github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= +github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= +github.com/lrstanley/go-ytdlp v1.3.5 h1:eT+29mK3Lp+XPMQOH25+jVerrrjifYW1o3IkTYJ9SMs= +github.com/lrstanley/go-ytdlp v1.3.5/go.mod h1:VgjnTrvkTf+23JuySjyPq1iQ8ijSovBtTPpXH5XrLtI= +github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= +github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/yaml/go-yaml v2.1.0+incompatible h1:Zbv44MLd20eYMtiHHvsEnw575Z8bfjNotykoUKcxgO0= github.com/yaml/go-yaml v2.1.0+incompatible/go.mod h1:XQjxMnX5ELtnGhPE/q0z8IRHbNlc0Oe8iA6GK4uSRJw= go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U= go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= +golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= +golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -- knotmirror 0.0.1