From 526d9d738e9fb4de2dcb0cbf9958debb3758a198 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Mon, 27 Apr 2015 14:55:01 +1000 Subject: [PATCH] Rewrite imports to local bencode and metainfo --- client.go | 4 ++-- client_test.go | 2 +- cmd/magnet-metainfo/main.go | 2 +- cmd/torrent-create/main.go | 2 +- cmd/torrent-infohash/main.go | 2 +- cmd/torrent-magnet/main.go | 2 +- cmd/torrent-metainfo-pprint/main.go | 2 +- cmd/torrent-verify/main.go | 2 +- cmd/torrent/main.go | 2 +- cmd/tracker-announce/main.go | 2 +- connection.go | 2 +- data/blob/blob.go | 2 +- data/blob/store.go | 2 +- data/data.go | 2 +- data/file/file.go | 2 +- data/mmap/mmap.go | 2 +- dht/dht.go | 2 +- file.go | 2 +- fs/torrentfs.go | 2 +- fs/torrentfs_test.go | 2 +- internal/testutil/testutil.go | 2 +- metainfo/builder.go | 2 +- metainfo/metainfo.go | 2 +- metainfo/metainfo_test.go | 2 +- torrent.go | 4 ++-- tracker/http.go | 2 +- util/dirwatch/dirwatch.go | 2 +- util/types.go | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/client.go b/client.go index fbc7a511..578294fb 100644 --- a/client.go +++ b/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" diff --git a/client_test.go b/client_test.go index 05d7c909..ccaf5a10 100644 --- a/client_test.go +++ b/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" diff --git a/cmd/magnet-metainfo/main.go b/cmd/magnet-metainfo/main.go index e7f643fe..079f38b7 100644 --- a/cmd/magnet-metainfo/main.go +++ b/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" ) diff --git a/cmd/torrent-create/main.go b/cmd/torrent-create/main.go index b5d3828f..65978b76 100644 --- a/cmd/torrent-create/main.go +++ b/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 ( diff --git a/cmd/torrent-infohash/main.go b/cmd/torrent-infohash/main.go index d7966203..bcbf08ec 100644 --- a/cmd/torrent-infohash/main.go +++ b/cmd/torrent-infohash/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/anacrolix/libtorgo/metainfo" + "github.com/anacrolix/torrent/metainfo" ) func main() { diff --git a/cmd/torrent-magnet/main.go b/cmd/torrent-magnet/main.go index 2fcd8cd0..292f9571 100644 --- a/cmd/torrent-magnet/main.go +++ b/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" ) diff --git a/cmd/torrent-metainfo-pprint/main.go b/cmd/torrent-metainfo-pprint/main.go index 342bba20..ca8896b7 100644 --- a/cmd/torrent-metainfo-pprint/main.go +++ b/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() { diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go index a3d97b24..d70788cd 100644 --- a/cmd/torrent-verify/main.go +++ b/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" diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go index b973db1c..116b33b9 100644 --- a/cmd/torrent/main.go +++ b/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" diff --git a/cmd/tracker-announce/main.go b/cmd/tracker-announce/main.go index f435521b..c735a12d 100644 --- a/cmd/tracker-announce/main.go +++ b/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" diff --git a/connection.go b/connection.go index 25a83470..f8d104ab 100644 --- a/connection.go +++ b/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" diff --git a/data/blob/blob.go b/data/blob/blob.go index 934bbc48..d0741ed6 100644 --- a/data/blob/blob.go +++ b/data/blob/blob.go @@ -5,7 +5,7 @@ import ( "io" "log" - "github.com/anacrolix/libtorgo/metainfo" + "github.com/anacrolix/torrent/metainfo" ) type data struct { diff --git a/data/blob/store.go b/data/blob/store.go index b1b11393..7ae2af25 100644 --- a/data/blob/store.go +++ b/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" ) diff --git a/data/data.go b/data/data.go index bc61d25b..f783279d 100644 --- a/data/data.go +++ b/data/data.go @@ -3,7 +3,7 @@ package data import ( "io" - "github.com/anacrolix/libtorgo/metainfo" + "github.com/anacrolix/torrent/metainfo" ) type Store interface { diff --git a/data/file/file.go b/data/file/file.go index e9741b06..0c30bc50 100644 --- a/data/file/file.go +++ b/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 { diff --git a/data/mmap/mmap.go b/data/mmap/mmap.go index d2223662..8a29c8a4 100644 --- a/data/mmap/mmap.go +++ b/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" diff --git a/dht/dht.go b/dht/dht.go index b9ea3ee7..f014e7c1 100644 --- a/dht/dht.go +++ b/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" diff --git a/file.go b/file.go index 1ec0d21d..d663a2f6 100644 --- a/file.go +++ b/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 { diff --git a/fs/torrentfs.go b/fs/torrentfs.go index ffb9df68..b7988313 100644 --- a/fs/torrentfs.go +++ b/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" diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go index 0ac72afc..1f39ac07 100644 --- a/fs/torrentfs_test.go +++ b/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" diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go index af1230f6..552f9a8e 100644 --- a/internal/testutil/testutil.go +++ b/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" diff --git a/metainfo/builder.go b/metainfo/builder.go index 98c89f16..76873048 100644 --- a/metainfo/builder.go +++ b/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" diff --git a/metainfo/metainfo.go b/metainfo/metainfo.go index a9a6e009..2f15cacc 100644 --- a/metainfo/metainfo.go +++ b/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. diff --git a/metainfo/metainfo_test.go b/metainfo/metainfo_test.go index 98489656..d346a0b3 100644 --- a/metainfo/metainfo_test.go +++ b/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) { diff --git a/torrent.go b/torrent.go index 72d0b129..88863646 100644 --- a/torrent.go +++ b/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" diff --git a/tracker/http.go b/tracker/http.go index 59e9b9ae..290aa28e 100644 --- a/tracker/http.go +++ b/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" ) diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go index 9669e834..eb952f9c 100644 --- a/util/dirwatch/dirwatch.go +++ b/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" diff --git a/util/types.go b/util/types.go index cbf2872b..1ffff796 100644 --- a/util/types.go +++ b/util/types.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/anacrolix/libtorgo/bencode" + "github.com/anacrolix/torrent/bencode" ) type CompactPeers []CompactPeer -- 2.44.0