|
|
|
@ -978,16 +978,15 @@ 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(false), |
|
|
|
progressbar.OptionSetElapsedTime(true), |
|
|
|
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: "", |
|
|
|
@ -2332,7 +2331,6 @@ 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 |
|
|
|
@ -2344,13 +2342,12 @@ 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(false), |
|
|
|
progressbar.OptionSetElapsedTime(true), |
|
|
|
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: "", |
|
|
|
|
