rename RootDirectory to Dir

cenkalti · Sep 18, 2024 · 76968c9 · 76968c9
1 parent 77f2e4f
commit 76968c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/torrent/session_cmd.go b/torrent/session_cmd.go
@@ -21,7 +21,7 @@ func (s *Session) runOnCompleteCmd(torrent *torrent) {
 
 	cmd.Env = append(os.Environ(),
 		"RAIN_TORRENT_ADDED="+fmt.Sprint(torrent.addedAt.Unix()),
-		"RAIN_TORRENT_DIR="+torrent.storage.RootDir(),
+		"RAIN_TORRENT_DIR="+torrent.Dir(),
 		"RAIN_TORRENT_HASH="+hex.EncodeToString(torrent.infoHash[:]),
 		"RAIN_TORRENT_ID="+torrent.id,
 		"RAIN_TORRENT_NAME="+torrent.name)

diff --git a/torrent/session_torrent.go b/torrent/session_torrent.go
@@ -42,10 +42,9 @@ func (t *Torrent) Name() string {
 	return t.torrent.Name()
 }
 
-// RootDirectory of the torrent.
-// The directory that contains the files in the torrent.
-func (t *Torrent) RootDirectory() string {
-	return t.torrent.RootDirectory()
+// Dir returns the directory that contains the files in the torrent.
+func (t *Torrent) Dir() string {
+	return t.torrent.Dir()
 }
 
 // Files in the torrent. An error is returned when metainfo isn't ready.

diff --git a/torrent/torrent.go b/torrent/torrent.go
@@ -414,7 +414,7 @@ func (t *torrent) InfoHash() []byte {
 	return b
 }
 
-func (t *torrent) RootDirectory() string {
+func (t *torrent) Dir() string {
 	return t.storage.RootDir()
 }
 

diff --git a/torrent/torrent_test.go b/torrent/torrent_test.go
@@ -151,7 +151,7 @@ func TestDownloadTorrent(t *testing.T) {
 	assertCompleted(t, tor)
 }
 
-func TestTorrentRootDirectory(t *testing.T) {
+func TestTorrentDir(t *testing.T) {
 	defer leaktest.Check(t)()
 	addr, cl := seeder(t, true)
 	defer cl()
@@ -162,7 +162,7 @@ func TestTorrentRootDirectory(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	assert.Equal(t, filepath.Join(s.config.DataDir, tor.ID()), tor.RootDirectory())
+	assert.Equal(t, filepath.Join(s.config.DataDir, tor.ID()), tor.Dir())
 	assertCompleted(t, tor)
 }