From 35d77e5837cc00ca2601b31aa549f7b7f6779ccb Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 6 Jul 2016 11:26:17 +0200 Subject: wip --- meta/file.go | 9 ++++++++- meta/info.go | 13 ++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'meta') diff --git a/meta/file.go b/meta/file.go index 2ec14cb..8a5a382 100644 --- a/meta/file.go +++ b/meta/file.go @@ -1,6 +1,9 @@ package meta -import "path" +import ( + "fmt" + "path" +) type File struct { Length int `bencode:"length"` @@ -11,3 +14,7 @@ type File struct { func (f File) Name() string { return path.Join(f.Path...) } + +func (f File) String() string { + return fmt.Sprintf("%v (%d)", f.Name(), f.Length) +} diff --git a/meta/info.go b/meta/info.go index 03a9a21..aa5a414 100644 --- a/meta/info.go +++ b/meta/info.go @@ -141,15 +141,10 @@ func (i Info) Full() int { } func (i Info) String() string { - var s string - for n, f := range i.Files { - p, err := i.FullPath(n) - if err != nil { - panic(err) - } - s += fmt.Sprintf(" %s (%d)\n", p, f.Length) - } - s += fmt.Sprintf("%s (%d) ", i.Name, i.TotalLength()) + s := fmt.Sprintf("%s (%d) ", i.Name, i.TotalLength()) s += fmt.Sprintf("%d × %d + %d\n", i.Full(), i.PieceLength, i.Last()) + for _, f := range i.Files { + s += fmt.Sprintf(" %v\n", f) + } return s } -- cgit v1.2.3