Buffer metainfo loads from files

[btrtrc.git] / metainfo / metainfo.go

diff --git a/metainfo/metainfo.go b/metainfo/metainfo.go
index ea09cce517f9cfc86956bddf933be56c4ed5a706..93f9103b968b09f661cb3aa9a9a6618a8102cdb6 100644 (file)
--- a/metainfo/metainfo.go
+++ b/metainfo/metainfo.go
@@ -1,7 +1,9 @@
 package metainfo
 
 import (
+       "bufio"
        "io"
+       "net/url"
        "os"
        "time"
 
@@ -9,15 +11,18 @@ import (
 )
 
 type MetaInfo struct {
-       InfoBytes    bencode.Bytes `bencode:"info"`
-       Announce     string        `bencode:"announce,omitempty"`
-       AnnounceList [][]string    `bencode:"announce-list,omitempty"`
-       Nodes        []Node        `bencode:"nodes,omitempty"`
-       CreationDate int64         `bencode:"creation date,omitempty"`
-       Comment      string        `bencode:"comment,omitempty"`
-       CreatedBy    string        `bencode:"created by,omitempty"`
-       Encoding     string        `bencode:"encoding,omitempty"`
-       URLList      interface{}   `bencode:"url-list,omitempty"`
+       InfoBytes    bencode.Bytes `bencode:"info,omitempty"`                              // BEP 3
+       Announce     string        `bencode:"announce,omitempty"`                          // BEP 3
+       AnnounceList AnnounceList  `bencode:"announce-list,omitempty"`                     // BEP 12
+       Nodes        []Node        `bencode:"nodes,omitempty,ignore_unmarshal_type_error"` // BEP 5
+       // Where's this specified? Mentioned at
+       // https://wiki.theory.org/index.php/BitTorrentSpecification: (optional) the creation time of
+       // the torrent, in standard UNIX epoch format (integer, seconds since 1-Jan-1970 00:00:00 UTC)
+       CreationDate int64   `bencode:"creation date,omitempty,ignore_unmarshal_type_error"`
+       Comment      string  `bencode:"comment,omitempty"`
+       CreatedBy    string  `bencode:"created by,omitempty"`
+       Encoding     string  `bencode:"encoding,omitempty"`
+       UrlList      UrlList `bencode:"url-list,omitempty"` // BEP 19 WebSeeds
 }
 
 // Load a MetaInfo from an io.Reader. Returns a non-nil error in case of
@@ -39,7 +44,9 @@ func LoadFromFile(filename string) (*MetaInfo, error) {
                return nil, err
        }
        defer f.Close()
-       return Load(f)
+       var buf bufio.Reader
+       buf.Reset(f)
+       return Load(&buf)
 }
 
 func (mi MetaInfo) UnmarshalInfo() (info Info, err error) {
@@ -58,23 +65,34 @@ func (mi MetaInfo) Write(w io.Writer) error {
 
 // Set good default values in preparation for creating a new MetaInfo file.
 func (mi *MetaInfo) SetDefaults() {
-       mi.Comment = "yoloham"
        mi.CreatedBy = "github.com/anacrolix/torrent"
        mi.CreationDate = time.Now().Unix()
-       // mi.Info.PieceLength = 256 * 1024
 }
 
-// Creates a Magnet from a MetaInfo.
-func (mi *MetaInfo) Magnet(displayName string, infoHash Hash) (m Magnet) {
-       for _, tier := range mi.AnnounceList {
-               for _, tracker := range tier {
-                       m.Trackers = append(m.Trackers, tracker)
-               }
+// Creates a Magnet from a MetaInfo. Optional infohash and parsed info can be provided.
+func (mi MetaInfo) Magnet(infoHash *Hash, info *Info) (m Magnet) {
+       m.Trackers = append(m.Trackers, mi.UpvertedAnnounceList().DistinctValues()...)
+       if info != nil {
+               m.DisplayName = info.BestName()
        }
-       if m.Trackers == nil && mi.Announce != "" {
-               m.Trackers = []string{mi.Announce}
+       if infoHash != nil {
+               m.InfoHash = *infoHash
+       } else {
+               m.InfoHash = mi.HashInfoBytes()
        }
-       m.DisplayName = displayName
-       m.InfoHash = infoHash
+       m.Params = make(url.Values)
+       m.Params["ws"] = mi.UrlList
        return
 }
+
+// Returns the announce list converted from the old single announce field if
+// necessary.
+func (mi *MetaInfo) UpvertedAnnounceList() AnnounceList {
+       if mi.AnnounceList.OverridesAnnounce(mi.Announce) {
+               return mi.AnnounceList
+       }
+       if mi.Announce != "" {
+               return [][]string{{mi.Announce}}
+       }
+       return nil
+}