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

Merge pull request #32 from itouakirai/main

Browse Source 
减少进度条信息显示，适配窄窗口
This commit is contained in:
ZHAAREY 2024-09-10 15:05:26 +08:00 committed by GitHub
commit d19e9ba0ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -978,15 +978,16 @@ func decryptSong(info *SongInfo, keys []string, manifest *AutoGenerated, filenam
defer conn.Close() defer conn.Close()
var decrypted []byte var decrypted []byte
var lastIndex uint32 = math.MaxUint8 var lastIndex uint32 = math.MaxUint8
fmt.Println("Decrypting...")
bar := progressbar.NewOptions64(info.totalDataSize, bar := progressbar.NewOptions64(info.totalDataSize,
progressbar.OptionClearOnFinish(), progressbar.OptionClearOnFinish(),
progressbar.OptionSetElapsedTime(true), progressbar.OptionSetElapsedTime(false),
progressbar.OptionSetPredictTime(false),
progressbar.OptionShowElapsedTimeOnFinish(), progressbar.OptionShowElapsedTimeOnFinish(),
progressbar.OptionShowCount(), progressbar.OptionShowCount(),
progressbar.OptionEnableColorCodes(true), progressbar.OptionEnableColorCodes(true),
progressbar.OptionShowBytes(true), progressbar.OptionShowBytes(true),
progressbar.OptionSetDescription("Decrypting..."), //progressbar.OptionSetDescription("Decrypting..."),
progressbar.OptionSetTheme(progressbar.Theme{ progressbar.OptionSetTheme(progressbar.Theme{
Saucer: "", Saucer: "",
SaucerHead: "", SaucerHead: "",
@ -2331,6 +2332,7 @@ func extractVideo(c string) (string, error) {
return streamUrl.String(), nil return streamUrl.String(), nil
} }
func extractSong(url string) (*SongInfo, error) { func extractSong(url string) (*SongInfo, error) {
fmt.Println("Downloading...")
track, err := http.Get(url) track, err := http.Get(url)
if err != nil { if err != nil {
return nil, err return nil, err
@ -2342,12 +2344,13 @@ func extractSong(url string) (*SongInfo, error) {
contentLength := track.ContentLength contentLength := track.ContentLength
bar := progressbar.NewOptions64(contentLength, bar := progressbar.NewOptions64(contentLength,
progressbar.OptionClearOnFinish(), progressbar.OptionClearOnFinish(),
progressbar.OptionSetElapsedTime(true), progressbar.OptionSetElapsedTime(false),
progressbar.OptionSetPredictTime(false),
progressbar.OptionShowElapsedTimeOnFinish(), progressbar.OptionShowElapsedTimeOnFinish(),
progressbar.OptionShowCount(), progressbar.OptionShowCount(),
progressbar.OptionEnableColorCodes(true), progressbar.OptionEnableColorCodes(true),
progressbar.OptionShowBytes(true), progressbar.OptionShowBytes(true),
progressbar.OptionSetDescription("Downloading..."), //progressbar.OptionSetDescription("Downloading..."),
progressbar.OptionSetTheme(progressbar.Theme{ progressbar.OptionSetTheme(progressbar.Theme{
Saucer: "", Saucer: "",
SaucerHead: "", SaucerHead: "",