Revert "omitempty is not handled yet in the bencode marshalling"

This reverts commit 8bdd749035.
This commit is contained in:
Vincent Batts 2014-08-14 21:07:13 -04:00
parent dd6ecf2eac
commit fe3de5af65

View file

@ -14,16 +14,16 @@ type File struct {
AnnounceList []string `bencode:"announce-list"` AnnounceList []string `bencode:"announce-list"`
// Epoch of the creation of this torrent // Epoch of the creation of this torrent
CreationDate int64 `bencode:"creation date"` CreationDate int64 `bencode:"creation date,omitempty"`
// Dictionary about this torrent, including files to be tracked // Dictionary about this torrent, including files to be tracked
Info InfoSection `bencode:"info"` Info InfoSection `bencode:"info,omitempty"`
// free-form textual comments of the author // free-form textual comments of the author
Comment string `bencode:"comment"` Comment string `bencode:"comment,omitempty"`
// name and version of the program used to create the .torrent // name and version of the program used to create the .torrent
CreatedBy string `bencode:"created by"` CreatedBy string `bencode:"created by,omitempty"`
// string encoding used to generate the `pieces` and `info` fields // string encoding used to generate the `pieces` and `info` fields
Encoding string `bencode:"encoding"` Encoding string `bencode:"encoding"`
@ -35,7 +35,7 @@ func (f File) CreationDateTime() time.Time {
type InfoSection struct { type InfoSection struct {
// suggested file/directory name where the file(s) are to be saved // suggested file/directory name where the file(s) are to be saved
Name string `bencode:"name"` Name string `bencode:"name,omitempty"`
// hash list of joined SHA1 sums (160-bit length) // hash list of joined SHA1 sums (160-bit length)
Pieces string `bencode:"pieces"` Pieces string `bencode:"pieces"`
@ -44,10 +44,10 @@ type InfoSection struct {
PieceLength int64 `bencode:"piece length"` PieceLength int64 `bencode:"piece length"`
// size of the file in bytes (only if this torrent is for a single file) // size of the file in bytes (only if this torrent is for a single file)
Length int64 `bencode:"length"` Length int64 `bencode:"length,omitempty"`
// 32-char hexadecimal string corresponding to the MD5 sum of the file (only if this torrent is for a single file) // 32-char hexadecimal string corresponding to the MD5 sum of the file (only if this torrent is for a single file)
MD5 string `bencode:"md5sum"` MD5 string `bencode:"md5sum,omitempty"`
// list of information about the files // list of information about the files
Files []FileInfo `bencode:"files"` Files []FileInfo `bencode:"files"`
@ -69,7 +69,7 @@ type FileInfo struct {
Path []string `bencode:"path"` Path []string `bencode:"path"`
// 32-char hexadecimal string corresponding to the MD5 sum of the file (only if this torrent is for a single file) // 32-char hexadecimal string corresponding to the MD5 sum of the file (only if this torrent is for a single file)
MD5 string `bencode:"md5sum"` MD5 string `bencode:"md5sum,omitempty"`
} }
type torrentError struct { type torrentError struct {