refactor: pass venv name instead of dir path

dhruvmanila · May 6, 2023 · f071e1d · f071e1d
1 parent b3f7763
commit f071e1d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/cmd/list.go b/cmd/list.go
@@ -71,12 +71,11 @@ func printVenvs() {
 			line += bold.Sprint("  " + venvName)
 		}
 		if verbose {
-			venvDir := filepath.Join(xdg.DataDir, venvName)
-			projectPath, err := venv.ProjectPath(venvDir)
+			projectPath, err := venv.ProjectPath(venvName)
 			if err != nil {
 				log.Fatal(err)
 			}
-			pythonVersion, err := venv.PythonVersion(venvDir)
+			pythonVersion, err := venv.PythonVersion(venvName)
 			if err != nil {
 				log.Fatal(err)
 			}

diff --git a/internal/venv/venv.go b/internal/venv/venv.go
@@ -33,8 +33,8 @@ func Names() ([]string, error) {
 // ProjectPath returns the absolute path to the project this virtual
 // environment belongs to. This information is extracted from the
 // `.project` file present in the virtual environment directory.
-func ProjectPath(venvDir string) (string, error) {
-	content, err := os.ReadFile(filepath.Join(venvDir, ".project"))
+func ProjectPath(venvName string) (string, error) {
+	content, err := os.ReadFile(filepath.Join(xdg.DataDir, venvName, ".project"))
 	if err != nil {
 		return "", err
 	}
@@ -45,8 +45,8 @@ func ProjectPath(venvDir string) (string, error) {
 // PythonVersion returns the Python version this environment was created from.
 // This information is extracted from the config file present in the virtual
 // environment directory.
-func PythonVersion(venvDir string) (string, error) {
-	file, err := os.Open(filepath.Join(venvDir, "pyvenv.cfg"))
+func PythonVersion(venvName string) (string, error) {
+	file, err := os.Open(filepath.Join(xdg.DataDir, venvName, "pyvenv.cfg"))
 	if err != nil {
 		return "", err
 	}

diff --git a/internal/venv/venv_test.go b/internal/venv/venv_test.go
@@ -40,9 +40,13 @@ func TestNames(t *testing.T) {
 }
 
 func TestProjectPath(t *testing.T) {
-	venvDir := filepath.Join(testdataDir, "venv1")
+	originalDataDir := xdg.DataDir
+	xdg.DataDir = testdataDir
+	t.Cleanup(func() {
+		xdg.DataDir = originalDataDir
+	})
 
-	got, err := ProjectPath(venvDir)
+	got, err := ProjectPath("venv1")
 	if err != nil {
 		t.Fatalf("ProjectPath() error = %v, want nil", err)
 	}
@@ -54,9 +58,13 @@ func TestProjectPath(t *testing.T) {
 }
 
 func TestPythonVersion(t *testing.T) {
-	venvDir := filepath.Join(testdataDir, "venv1")
+	originalDataDir := xdg.DataDir
+	xdg.DataDir = testdataDir
+	t.Cleanup(func() {
+		xdg.DataDir = originalDataDir
+	})
 
-	got, err := PythonVersion(venvDir)
+	got, err := PythonVersion("venv1")
 	if err != nil {
 		t.Fatalf("PythonVersion() error = %v, want nil", err)
 	}