From 0e3f7a5520b5a44d3f5e77f9849e1560b760c836 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Fri, 28 Nov 2014 12:13:57 -0600
Subject: [PATCH] Change all references to github.com/nsf/libtorgo to
 github.com/anacrolix/libtorgo

---
 cmd/scrape/main.go                  |  4 ++--
 cmd/torrent-create/main.go          |  2 +-
 cmd/torrent-metainfo-pprint/main.go |  4 ++--
 cmd/torrent-verify/main.go          | 21 +++++++++------------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/cmd/scrape/main.go b/cmd/scrape/main.go
index f8a35ef1..e2f4cf7c 100644
--- a/cmd/scrape/main.go
+++ b/cmd/scrape/main.go
@@ -8,7 +8,7 @@ import (
 	"bitbucket.org/anacrolix/go.torrent/tracker"
 	_ "bitbucket.org/anacrolix/go.torrent/tracker/udp"
 	"bitbucket.org/anacrolix/go.torrent/util"
-	metainfo "github.com/nsf/libtorgo/torrent"
+	metainfo "github.com/anacrolix/libtorgo/metainfo"
 )
 
 func main() {
@@ -30,7 +30,7 @@ func main() {
 			ar := tracker.AnnounceRequest{
 				NumWant: -1,
 			}
-			util.CopyExact(ar.InfoHash, mi.InfoHash)
+			util.CopyExact(ar.InfoHash, mi.Info.Hash)
 			resp, err := tr.Announce(&ar)
 			if err != nil {
 				log.Fatal(err)
diff --git a/cmd/torrent-create/main.go b/cmd/torrent-create/main.go
index ba372868..b5d3828f 100644
--- a/cmd/torrent-create/main.go
+++ b/cmd/torrent-create/main.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/nsf/libtorgo/torrent"
+	torrent "github.com/anacrolix/libtorgo/metainfo"
 )
 
 var (
diff --git a/cmd/torrent-metainfo-pprint/main.go b/cmd/torrent-metainfo-pprint/main.go
index 291fe0ee..241434e6 100644
--- a/cmd/torrent-metainfo-pprint/main.go
+++ b/cmd/torrent-metainfo-pprint/main.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/nsf/libtorgo/torrent"
+	"github.com/anacrolix/libtorgo/metainfo"
 )
 
 func main() {
 	flag.Parse()
 	for _, filename := range flag.Args() {
-		metainfo, err := torrent.LoadFromFile(filename)
+		metainfo, err := metainfo.LoadFromFile(filename)
 		if err != nil {
 			log.Print(err)
 			continue
diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go
index 8cfc707f..3d56e7d3 100644
--- a/cmd/torrent-verify/main.go
+++ b/cmd/torrent-verify/main.go
@@ -1,18 +1,16 @@
 package main
 
 import (
-	"bitbucket.org/anacrolix/go.torrent/mmap_span"
 	"bytes"
 	"crypto/sha1"
 	"flag"
 	"fmt"
-
-	// "github.com/davecheney/profile"
 	"log"
 	"os"
 	"path/filepath"
 
-	metainfo "github.com/nsf/libtorgo/torrent"
+	"bitbucket.org/anacrolix/go.torrent/mmap_span"
+	"github.com/anacrolix/libtorgo/metainfo"
 	"launchpad.net/gommap"
 )
 
@@ -26,7 +24,6 @@ func init() {
 }
 
 func main() {
-	// defer profile.Start(profile.CPUProfile).Stop()
 	metaInfo, err := metainfo.LoadFromFile(*filePath)
 	if err != nil {
 		log.Fatal(err)
@@ -37,8 +34,8 @@ func main() {
 	}
 	defer devZero.Close()
 	var mMapSpan mmap_span.MMapSpan
-	for _, file := range metaInfo.Files {
-		filename := filepath.Join(append([]string{*dirPath, metaInfo.Name}, file.Path...)...)
+	for _, file := range metaInfo.Info.Files {
+		filename := filepath.Join(append([]string{*dirPath, metaInfo.Info.Name}, file.Path...)...)
 		osFile, err := os.Open(filename)
 		mmapFd := osFile.Fd()
 		if err != nil {
@@ -58,16 +55,16 @@ func main() {
 		osFile.Close()
 		mMapSpan = append(mMapSpan, goMMap)
 	}
-	log.Println(len(metaInfo.Files))
+	log.Println(len(metaInfo.Info.Files))
 	log.Println(mMapSpan.Size())
-	log.Println(len(metaInfo.Pieces))
-	for piece := 0; piece < (len(metaInfo.Pieces)+sha1.Size-1)/sha1.Size; piece++ {
-		expectedHash := metaInfo.Pieces[sha1.Size*piece : sha1.Size*(piece+1)]
+	log.Println(len(metaInfo.Info.Pieces))
+	for piece := 0; piece < (len(metaInfo.Info.Pieces)+sha1.Size-1)/sha1.Size; piece++ {
+		expectedHash := metaInfo.Info.Pieces[sha1.Size*piece : sha1.Size*(piece+1)]
 		if len(expectedHash) == 0 {
 			break
 		}
 		hash := sha1.New()
-		_, err := mMapSpan.WriteSectionTo(hash, int64(piece)*metaInfo.PieceLength, metaInfo.PieceLength)
+		_, err := mMapSpan.WriteSectionTo(hash, int64(piece)*metaInfo.Info.PieceLength, metaInfo.Info.PieceLength)
 		if err != nil {
 			log.Fatal(err)
 		}
-- 
2.48.1