Rewrite imports to local bencode and metainfo

client.go

@@ -38,8 +38,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/bencode"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/sync"
 	"github.com/anacrolix/utp"
 	"github.com/bradfitz/iter"

client_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 	"github.com/anacrolix/utp"
 	"github.com/bradfitz/iter"
 	"gopkg.in/check.v1"

cmd/magnet-metainfo/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 
 	"github.com/anacrolix/torrent"
 )

cmd/torrent-create/main.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	torrent "github.com/anacrolix/libtorgo/metainfo"
+	torrent "github.com/anacrolix/torrent/metainfo"
 )
 
 var (

cmd/torrent-infohash/main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 func main() {

cmd/torrent-magnet/main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 
 	"github.com/anacrolix/torrent"
 )

cmd/torrent-metainfo-pprint/main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 func main() {

cmd/torrent-verify/main.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"launchpad.net/gommap"
 
 	"github.com/anacrolix/torrent/mmap_span"

cmd/torrent/main.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	_ "github.com/anacrolix/envpprof"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/dustin/go-humanize"
 	"github.com/jessevdk/go-flags"
 

cmd/tracker-announce/main.go

@@ -6,7 +6,7 @@ import (
 	"math"
 	"strings"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/tracker"

connection.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 
 	"github.com/anacrolix/torrent/internal/pieceordering"
 	pp "github.com/anacrolix/torrent/peer_protocol"

data/blob/blob.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"log"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 type data struct {

data/blob/store.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 
 	dataPkg "github.com/anacrolix/torrent/data"
 )

data/data.go

@@ -3,7 +3,7 @@ package data
 import (
 	"io"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 type Store interface {

data/file/file.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 type data struct {

data/mmap/mmap.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"launchpad.net/gommap"
 
 	"github.com/anacrolix/torrent/mmap_span"

dht/dht.go

@@ -19,7 +19,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 	"github.com/anacrolix/sync"
 
 	"github.com/anacrolix/torrent/iplist"

file.go

@@ -1,6 +1,6 @@
 package torrent
 
-import "github.com/anacrolix/libtorgo/metainfo"
+import "github.com/anacrolix/torrent/metainfo"
 
 // Provides access to regions of torrent data that correspond to its files.
 type File struct {

fs/torrentfs.go

@@ -10,7 +10,7 @@ import (
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"

fs/torrentfs_test.go

@@ -17,7 +17,7 @@ import (
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"

internal/testutil/testutil.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 )
 
 const GreetingFileContents = "hello, world\n"

metainfo/builder.go

@@ -3,7 +3,7 @@ package metainfo
 import (
 	"crypto/sha1"
 	"errors"
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 	"hash"
 	"io"
 	"os"

metainfo/metainfo.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 )
 
 // Information specific to a single file inside the MetaInfo structure.

metainfo/metainfo_test.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 )
 
 func test_file(t *testing.T, filename string) {

torrent.go

@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/anacrolix/libtorgo/bencode"
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/bencode"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/bradfitz/iter"
 
 	"github.com/anacrolix/torrent/data"

tracker/http.go

@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 
 	"github.com/anacrolix/torrent/util"
 )

util/dirwatch/dirwatch.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/anacrolix/torrent/metainfo"
 	"github.com/go-fsnotify/fsnotify"
 
 	"github.com/anacrolix/torrent"

util/types.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/torrent/bencode"
 )
 
 type CompactPeers []CompactPeer