sim1222/apple-music-downloader-server
1
0
Fork 0
forked from sim1222-mirror/apple-music-downloader
Code Pull Requests Activity

根据自定义内存上限调整下载方法

Browse Source
This commit is contained in:
itouakirai 2025-01-15 21:25:59 +08:00
parent eb929e3660
commit 8d071f7461
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
utils/runv2/runv2.go
View File

@ -118,14 +118,36 @@ func Run(adamId string, playlistUrl string, outfile string, Config structs.Confi
return err
}
defer do.Body.Close()
body = do.Body
if do.ContentLength < int64(Config.MaxMemoryLimit * 1024 * 1024) {
var buffer bytes.Buffer
bar := progressbar.NewOptions64(
do.ContentLength,
progressbar.OptionClearOnFinish(),
progressbar.OptionSetElapsedTime(false),
progressbar.OptionSetPredictTime(false),
progressbar.OptionShowElapsedTimeOnFinish(),
progressbar.OptionShowCount(),
progressbar.OptionEnableColorCodes(true),
progressbar.OptionShowBytes(true),
progressbar.OptionSetDescription("Downloading..."),
progressbar.OptionSetTheme(progressbar.Theme{
Saucer: "",
SaucerHead: "",
SaucerPadding: "",
BarStart: "",
BarEnd: "",
}),
)
io.Copy(io.MultiWriter(&buffer, bar), do.Body)
body = &buffer
fmt.Print("Downloaded\n")
} else {
body = do.Body
}
}
var totalLen int64
totalLen = do.ContentLength
// connect to decryptor
//addr := fmt.Sprintf("127.0.0.1:10020")
addr := Config.DecryptM3u8Port
@ -133,26 +155,14 @@ func Run(adamId string, playlistUrl string, outfile string, Config structs.Confi
if err != nil {
return err
}
fmt.Print("Downloading...\n")
//fmt.Print("Decrypting...\n")
defer Close(conn)
err = downloadAndDecryptFile(conn, body, outfile, adamId, segments, totalLen, Config)
if err != nil {
return err
}
fmt.Print("Decryption finished\n")
// create output file
// ofh, err := os.Create(outfile)
// if err != nil {
// return err
// }
// defer ofh.Close()
//
// _, err = ofh.Write(buffer.Bytes())
// if err != nil {
// return err
// }
fmt.Print("Decrypted\n")
return nil
}
@ -204,7 +214,7 @@ func downloadAndDecryptFile(conn io.ReadWriter, in io.Reader, outfile string,
progressbar.OptionShowCount(),
progressbar.OptionEnableColorCodes(true),
progressbar.OptionShowBytes(true),
//progressbar.OptionSetDescription("Decrypting..."),
progressbar.OptionSetDescription("Decrypting..."),
progressbar.OptionSetTheme(progressbar.Theme{
Saucer: "",
SaucerHead: "",

7
utils/runv3/runv3.go
View File

@ -223,7 +223,7 @@ func extsong(b string)(bytes.Buffer){
progressbar.OptionShowCount(),
progressbar.OptionEnableColorCodes(true),
progressbar.OptionShowBytes(true),
//progressbar.OptionSetDescription("Downloading..."),
progressbar.OptionSetDescription("Downloading..."),
progressbar.OptionSetTheme(progressbar.Theme{
Saucer: "",
SaucerHead: "",
@ -233,9 +233,6 @@ func extsong(b string)(bytes.Buffer){
}),
)
io.Copy(io.MultiWriter(&buffer, bar), resp.Body)
if err != nil {
fmt.Printf("读取文件失败: %v\n", err)
}
return buffer
}
func Run(adamId string, trackpath string, authtoken string, mutoken string)(error) {
@ -271,8 +268,8 @@ func Run(adamId string, trackpath string, authtoken string, mutoken string)(erro
fmt.Println(err)
return err
}
fmt.Print("Downloading...\n")
body := extsong(fileurl)
fmt.Print("Downloaded\n")
//bodyReader := bytes.NewReader(body)
var buffer bytes.Buffer