aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-07-13 12:31:49 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-07-13 12:31:49 +0200
commit06d15dc65aeac5f24c6b86fe0474760991f18856 (patch)
tree374f4b46c73d90b85ca47a72fa5225387d2954ef
parent80bbf61339bb438e94f7389cc1dfcb5ee3325bc8 (diff)
Move Open back into meta package
-rw-r--r--bt/open.go21
-rw-r--r--cmd/btcheck/main.go4
-rw-r--r--cmd/btshow/main.go4
-rw-r--r--meta/torrent.go16
-rw-r--r--meta/torrent_test.go20
5 files changed, 21 insertions, 44 deletions
diff --git a/bt/open.go b/bt/open.go
deleted file mode 100644
index e4247d8..0000000
--- a/bt/open.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package bt
-
-import (
- "io/ioutil"
-
- "dim13.org/btget/bencode"
- "dim13.org/btget/meta"
-)
-
-func Open(fname string) (meta.Torrent, error) {
- var tor meta.Torrent
- body, err := ioutil.ReadFile(fname)
- if err != nil {
- return meta.Torrent{}, err
- }
- err = bencode.Unmarshal(body, &tor)
- if err != nil {
- return meta.Torrent{}, err
- }
- return tor, nil
-}
diff --git a/cmd/btcheck/main.go b/cmd/btcheck/main.go
index ad0b248..a48123f 100644
--- a/cmd/btcheck/main.go
+++ b/cmd/btcheck/main.go
@@ -5,14 +5,14 @@ import (
"log"
"os"
- "dim13.org/btget/bt"
+ "dim13.org/btget/meta"
)
func main() {
if len(os.Args) != 2 {
log.Fatal("usage: ", os.Args[0], " <torrent>")
}
- tor, err := bt.Open(os.Args[1])
+ tor, err := meta.Open(os.Args[1])
if err != nil {
log.Fatal(err)
}
diff --git a/cmd/btshow/main.go b/cmd/btshow/main.go
index 1004972..cf27ead 100644
--- a/cmd/btshow/main.go
+++ b/cmd/btshow/main.go
@@ -5,14 +5,14 @@ import (
"log"
"os"
- "dim13.org/btget/bt"
+ "dim13.org/btget/meta"
)
func main() {
if len(os.Args) != 2 {
log.Fatal("usage: ", os.Args[0], " <torrent>")
}
- tor, err := bt.Open(os.Args[1])
+ tor, err := meta.Open(os.Args[1])
if err != nil {
log.Fatal(err)
}
diff --git a/meta/torrent.go b/meta/torrent.go
index ecb0c02..12aa26e 100644
--- a/meta/torrent.go
+++ b/meta/torrent.go
@@ -4,7 +4,10 @@ package meta
import (
"fmt"
+ "io/ioutil"
"time"
+
+ "dim13.org/btget/bencode"
)
type Nodes map[string]int // Host:Port
@@ -31,3 +34,16 @@ func (t Torrent) String() string {
s += fmt.Sprintf("info hash: % x", t.InfoHash)
return s
}
+
+func Open(fname string) (Torrent, error) {
+ var tor Torrent
+ body, err := ioutil.ReadFile(fname)
+ if err != nil {
+ return Torrent{}, err
+ }
+ err = bencode.Unmarshal(body, &tor)
+ if err != nil {
+ return Torrent{}, err
+ }
+ return tor, nil
+}
diff --git a/meta/torrent_test.go b/meta/torrent_test.go
index 75cccc9..c7c4ded 100644
--- a/meta/torrent_test.go
+++ b/meta/torrent_test.go
@@ -1,11 +1,6 @@
package meta
-import (
- "io/ioutil"
- "testing"
-
- "dim13.org/btget/bencode"
-)
+import "testing"
var tors = map[string]string{
"bsd": "OpenBSD_5.9_amd64_install59.iso-2016-03-29-0449.torrent",
@@ -14,19 +9,6 @@ var tors = map[string]string{
"mul": "multi.torrent",
}
-func Open(fname string) (Torrent, error) {
- var tor Torrent
- body, err := ioutil.ReadFile(fname)
- if err != nil {
- return Torrent{}, err
- }
- err = bencode.Unmarshal(body, &tor)
- if err != nil {
- return Torrent{}, err
- }
- return tor, nil
-}
-
func TestPieces(t *testing.T) {
tor, err := Open("../examples/" + tors["mul"])
if err != nil {