Simplify download interface

main.go

@@ -11,27 +11,12 @@ func main() {
 	inPath := os.Args[1]
 	outPath := os.Args[2]
 
-	inFile, err := os.Open(inPath)
+	tf, err := torrentfile.Open(inPath)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer inFile.Close()
-
-	t, err := torrentfile.Open(inFile)
-	if err != nil {
-		log.Fatal(err)
-	}
-	buf, err := t.Download()
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	outFile, err := os.Create(outPath)
+	err = tf.DownloadToFile(outPath)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer outFile.Close()
-	_, err = outFile.Write(buf)
 	if err != nil {
 		log.Fatal(err)
 	}

torrentfile/torrentfile.go

@@ -5,7 +5,7 @@ import (
 	"crypto/rand"
 	"crypto/sha1"
 	"fmt"
-	"io"
+	"os"
 
 	"github.com/jackpal/bencode-go"
 	"github.com/veggiedefender/torrent-client/p2p"
@@ -36,17 +36,17 @@ type bencodeTorrent struct {
 	Info     bencodeInfo `bencode:"info"`
 }
 
-// Download downloads a torrent
+// DownloadToFile downloads a torrent and writes it to a file
-func (t *TorrentFile) Download() ([]byte, error) {
+func (t *TorrentFile) DownloadToFile(path string) error {
 	var peerID [20]byte
 	_, err := rand.Read(peerID[:])
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	peers, err := t.requestPeers(peerID, Port)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	torrent := p2p.Torrent{
@@ -60,15 +60,31 @@ func (t *TorrentFile) Download() ([]byte, error) {
 	}
 	buf, err := torrent.Download()
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return buf, nil
+
+	outFile, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer outFile.Close()
+	_, err = outFile.Write(buf)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 // Open parses a torrent file
-func Open(r io.Reader) (TorrentFile, error) {
+func Open(path string) (TorrentFile, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return TorrentFile{}, err
+	}
+	defer file.Close()
+
 	bto := bencodeTorrent{}
-	err := bencode.Unmarshal(r, &bto)
+	err = bencode.Unmarshal(file, &bto)
 	if err != nil {
 		return TorrentFile{}, err
 	}