fix linter warnings

Author: cenkalti

internal/console/console.go

@@ -582,9 +582,9 @@ func (c *Console) drawDetails(g *gocui.Gui) error {
 				if t.NextAnnounce.IsZero() {
 					nextAnnounce = "Unknown"
 				} else {
-					nextAnnounce = t.NextAnnounce.Time.Format(time.RFC3339)
+					nextAnnounce = t.NextAnnounce.Format(time.RFC3339)
 				}
-				fmt.Fprintf(v, "    Last announce: %s, Next announce: %s\n", t.LastAnnounce.Time.Format(time.RFC3339), nextAnnounce)
+				fmt.Fprintf(v, "    Last announce: %s, Next announce: %s\n", t.LastAnnounce.Format(time.RFC3339), nextAnnounce)
 			}
 		case peers:
 			format := "%2s %21s %7s %8s %6s %s\n"
@@ -664,7 +664,7 @@ func (c *Console) updateTorrents(g *gocui.Gui) {
 		if a.AddedAt.Equal(b.AddedAt.Time) {
 			return a.ID < b.ID
 		}
-		return a.AddedAt.Time.Before(b.AddedAt.Time)
+		return a.AddedAt.Before(b.AddedAt.Time)
 	})
 
 	torrents := make([]Torrent, 0, len(rpcTorrents))
@@ -753,7 +753,7 @@ func (c *Console) updateDetails(g *gocui.Gui) {
 			if a.ConnectedAt.Equal(b.ConnectedAt.Time) {
 				return a.Addr < b.Addr
 			}
-			return a.ConnectedAt.Time.Before(b.ConnectedAt.Time)
+			return a.ConnectedAt.Before(b.ConnectedAt.Time)
 		})
 		c.m.Lock()
 		c.peers = peers

internal/metainfo/info.go

@@ -221,7 +221,7 @@ func parsePrivateField(s bencode.RawMessage) bool {
 	if err != nil {
 		return true
 	}
-	return !(stringVal == "" || stringVal == "0")
+	return stringVal != "" && stringVal != "0"
 }
 
 // NewInfoBytes creates a new Info dictionary by reading and hashing the files on the disk.

rainrpc/client.go

@@ -73,10 +73,10 @@ func (c *Client) AddTorrent(f io.Reader, options *AddTorrentOptions) (*rpctypes.
 	}
 	args := rpctypes.AddTorrentRequest{Torrent: base64.StdEncoding.EncodeToString(b)}
 	if options != nil {
-		args.AddTorrentOptions.ID = options.ID
-		args.AddTorrentOptions.Stopped = options.Stopped
-		args.AddTorrentOptions.StopAfterDownload = options.StopAfterDownload
-		args.AddTorrentOptions.StopAfterMetadata = options.StopAfterMetadata
+		args.ID = options.ID
+		args.Stopped = options.Stopped
+		args.StopAfterDownload = options.StopAfterDownload
+		args.StopAfterMetadata = options.StopAfterMetadata
 	}
 	var reply rpctypes.AddTorrentResponse
 	return &reply.Torrent, c.client.Call("Session.AddTorrent", args, &reply)
@@ -86,10 +86,10 @@ func (c *Client) AddTorrent(f io.Reader, options *AddTorrentOptions) (*rpctypes.
 func (c *Client) AddURI(uri string, options *AddTorrentOptions) (*rpctypes.Torrent, error) {
 	args := rpctypes.AddURIRequest{URI: uri}
 	if options != nil {
-		args.AddTorrentOptions.ID = options.ID
-		args.AddTorrentOptions.Stopped = options.Stopped
-		args.AddTorrentOptions.StopAfterDownload = options.StopAfterDownload
-		args.AddTorrentOptions.StopAfterMetadata = options.StopAfterMetadata
+		args.ID = options.ID
+		args.Stopped = options.Stopped
+		args.StopAfterDownload = options.StopAfterDownload
+		args.StopAfterMetadata = options.StopAfterMetadata
 	}
 	var reply rpctypes.AddURIResponse
 	return &reply.Torrent, c.client.Call("Session.AddURI", args, &reply)

torrent/session_rpc_handler.go

@@ -42,8 +42,8 @@ func (h *rpcHandler) ListTorrents(args *rpctypes.ListTorrentsRequest, reply *rpc
 func (h *rpcHandler) AddTorrent(args *rpctypes.AddTorrentRequest, reply *rpctypes.AddTorrentResponse) error {
 	r := base64.NewDecoder(base64.StdEncoding, strings.NewReader(args.Torrent))
 	opt := &AddTorrentOptions{
-		Stopped:           args.AddTorrentOptions.Stopped,
-		ID:                args.AddTorrentOptions.ID,
+		Stopped:           args.Stopped,
+		ID:                args.ID,
 		StopAfterDownload: args.StopAfterDownload,
 		StopAfterMetadata: args.StopAfterMetadata,
 	}
@@ -61,8 +61,8 @@ func (h *rpcHandler) AddTorrent(args *rpctypes.AddTorrentRequest, reply *rpctype
 
 func (h *rpcHandler) AddURI(args *rpctypes.AddURIRequest, reply *rpctypes.AddURIResponse) error {
 	opt := &AddTorrentOptions{
-		Stopped:           args.AddTorrentOptions.Stopped,
-		ID:                args.AddTorrentOptions.ID,
+		Stopped:           args.Stopped,
+		ID:                args.ID,
 		StopAfterDownload: args.StopAfterDownload,
 		StopAfterMetadata: args.StopAfterMetadata,
 	}
@@ -398,8 +398,8 @@ func (h *rpcHandler) GetTorrentFileStats(args *rpctypes.GetTorrentFileStatsReque
 	for i, s := range stats {
 		reply.FileStats[i] = rpctypes.FileStats{
 			File: rpctypes.File{
-				Path:   s.File.Path(),
-				Length: s.File.Length(),
+				Path:   s.Path(),
+				Length: s.Length(),
 			},
 			BytesCompleted: s.BytesCompleted,
 		}

torrent/torrent_close.go

@@ -40,7 +40,7 @@ func (t *torrent) closePeer(pe *peer.Peer) {
 	delete(t.incomingPeers, pe)
 	delete(t.outgoingPeers, pe)
 	delete(t.peerIDs, pe.ID)
-	delete(t.connectedPeerIPs, pe.Conn.IP())
+	delete(t.connectedPeerIPs, pe.IP())
 	if t.piecePicker != nil {
 		t.piecePicker.HandleDisconnect(pe)
 	}

torrent/torrent_test.go

@@ -204,7 +204,7 @@ func TestTorrentFiles(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 6, len(fileStats))
 	assert.Equal(t, "sample_torrent/data/file1.bin", fileStats[0].Path())
-	assert.Equal(t, int64(10240), fileStats[0].File.Length())
+	assert.Equal(t, int64(10240), fileStats[0].Length())
 	assert.Equal(t, int64(10240), fileStats[0].BytesCompleted)
 	assert.Equal(t, int64(10485760), fileStats[2].BytesCompleted)
 	assertCompleted(t, tor)