diff --git a/util.go b/util.go index 0db18ba..e148995 100644 --- a/util.go +++ b/util.go @@ -16,11 +16,12 @@ import ( var Debug = false var Tor = false +var Socks5Address = "127.0.0.1:9050" var DownThreads = 8 func getHttpClient() (*http.Client, error) { if Tor { - dialer, err := proxy.SOCKS5("tcp", "127.0.0.1:9050", nil, proxy.Direct) + dialer, err := proxy.SOCKS5("tcp", Socks5Address, nil, proxy.Direct) if err != nil { return nil, err } @@ -120,8 +121,8 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro if err != nil { return nil, err } - remContent = content - downloaded += len(content) + remContent = *content + downloaded += len(*content) if Debug { // save remainder to file in the fragments/ directory, prefix with gap @@ -159,10 +160,10 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro return } mu.Lock() - downloaded += len(content) * len(fragment.Offsets) + downloaded += len(*content) * len(fragment.Offsets) for _, offset := range fragment.Offsets { - trackFrag = append(trackFrag, Frag{Offset: offset, Size: len(content)}) - copy(ret[offset:offset+len(content)], content) + trackFrag = append(trackFrag, Frag{Offset: offset, Size: len(*content)}) + copy(ret[offset:offset+len(*content)], *content) } percent := float32(downloaded) / float32(manifest.Size) * 100.0 downedMB := float32(downloaded) / 1024.0 / 1024.0 @@ -221,7 +222,7 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro return ret, nil } -func getContent(url string) ([]byte, error) { +func getContent(url string) (*[]byte, error) { client, err := getHttpClient() if err != nil { return nil, err @@ -241,7 +242,7 @@ func getContent(url string) ([]byte, error) { return nil, err } - return body, nil + return &body, nil } func transformShaToURL(sha512s string, size int) string {