refactor storage constructor

Author: cenkalti

internal/storage/storage.go

@@ -5,7 +5,9 @@ import "io"
 
 // Storage is an interface for reading/writing torrent files.
 type Storage interface {
+	// Open a file. If the file does not exist, it will be created.
 	Open(name string, size int64) (f File, exists bool, err error)
+	// RootDir is the absolute path of the storage root.
 	RootDir() string
 }
 

torrent/session.go

@@ -22,6 +22,8 @@ import (
 	"github.com/cenkalti/rain/internal/resourcemanager"
 	"github.com/cenkalti/rain/internal/resumer/boltdbresumer"
 	"github.com/cenkalti/rain/internal/semaphore"
+	"github.com/cenkalti/rain/internal/storage"
+	"github.com/cenkalti/rain/internal/storage/filestorage"
 	"github.com/cenkalti/rain/internal/tracker"
 	"github.com/cenkalti/rain/internal/trackermanager"
 	"github.com/juju/ratelimit"
@@ -443,6 +445,10 @@ func (s *Session) StopAll() error {
 	return nil
 }
 
+func (s *Session) newStorage(id string) (storage.Storage, error) {
+	return filestorage.New(s.getDataDir(id), s.config.FilePermissions)
+}
+
 func (s *Session) getDataDir(torrentID string) string {
 	if s.config.DataDirIncludesTorrentID {
 		return filepath.Join(s.config.DataDir, torrentID)

torrent/session_add.go

@@ -14,7 +14,7 @@ import (
 	"github.com/cenkalti/rain/internal/metainfo"
 	"github.com/cenkalti/rain/internal/resumer"
 	"github.com/cenkalti/rain/internal/resumer/boltdbresumer"
-	"github.com/cenkalti/rain/internal/storage/filestorage"
+	"github.com/cenkalti/rain/internal/storage"
 	"github.com/cenkalti/rain/internal/webseedsource"
 	"github.com/gofrs/uuid"
 	"github.com/nictuku/dht"
@@ -236,7 +236,7 @@ func (s *Session) addMagnet(link string, opt *AddTorrentOptions) (*Torrent, erro
 	return t2, err
 }
 
-func (s *Session) add(opt *AddTorrentOptions) (id string, port int, sto *filestorage.FileStorage, err error) {
+func (s *Session) add(opt *AddTorrentOptions) (id string, port int, sto storage.Storage, err error) {
 	port, err = s.getPort()
 	if err != nil {
 		return
@@ -266,7 +266,7 @@ func (s *Session) add(opt *AddTorrentOptions) (id string, port int, sto *filesto
 		}
 		id = base64.RawURLEncoding.EncodeToString(u1[:])
 	}
-	sto, err = filestorage.New(s.getDataDir(id), s.config.FilePermissions)
+	sto, err = s.newStorage(id)
 	if err != nil {
 		return
 	}

torrent/session_load.go

@@ -8,7 +8,6 @@ import (
 	"github.com/cenkalti/rain/internal/metainfo"
 	"github.com/cenkalti/rain/internal/resumer"
 	"github.com/cenkalti/rain/internal/resumer/boltdbresumer"
-	"github.com/cenkalti/rain/internal/storage/filestorage"
 	"github.com/cenkalti/rain/internal/webseedsource"
 	"go.etcd.io/bbolt"
 )
@@ -84,7 +83,7 @@ func (s *Session) loadExistingTorrent(id string) (tt *Torrent, hasStarted bool,
 			bf = bf3
 		}
 	}
-	sto, err := filestorage.New(s.getDataDir(id), s.config.FilePermissions)
+	sto, err := s.newStorage(id)
 	if err != nil {
 		return
 	}