From 80bbf61339bb438e94f7389cc1dfcb5ee3325bc8 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 13 Jul 2016 12:25:34 +0200 Subject: Split --- bt/open.go | 21 +++++++++++++++++++++ cmd/btcheck/main.go | 19 ++----------------- cmd/btshow/main.go | 19 ++----------------- 3 files changed, 25 insertions(+), 34 deletions(-) create mode 100644 bt/open.go diff --git a/bt/open.go b/bt/open.go new file mode 100644 index 0000000..e4247d8 --- /dev/null +++ b/bt/open.go @@ -0,0 +1,21 @@ +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 7586ba9..ad0b248 100644 --- a/cmd/btcheck/main.go +++ b/cmd/btcheck/main.go @@ -2,32 +2,17 @@ package main import ( "fmt" - "io/ioutil" "log" "os" - "dim13.org/btget/bencode" - "dim13.org/btget/meta" + "dim13.org/btget/bt" ) -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 -} - func main() { if len(os.Args) != 2 { log.Fatal("usage: ", os.Args[0], " ") } - tor, err := Open(os.Args[1]) + tor, err := bt.Open(os.Args[1]) if err != nil { log.Fatal(err) } diff --git a/cmd/btshow/main.go b/cmd/btshow/main.go index 51b6c9d..1004972 100644 --- a/cmd/btshow/main.go +++ b/cmd/btshow/main.go @@ -2,32 +2,17 @@ package main import ( "fmt" - "io/ioutil" "log" "os" - "dim13.org/btget/bencode" - "dim13.org/btget/meta" + "dim13.org/btget/bt" ) -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 -} - func main() { if len(os.Args) != 2 { log.Fatal("usage: ", os.Args[0], " ") } - tor, err := Open(os.Args[1]) + tor, err := bt.Open(os.Args[1]) if err != nil { log.Fatal(err) } -- cgit v1.2.3