feat: Change expression name

Author: tyzerrr

.gitignore

@@ -2,3 +2,4 @@ tmux-sessionizer
 *.mov
 # Added by goreleaser init:
 dist/
+my-tmux-sessionizer

handler/handler.go

@@ -116,32 +116,45 @@ func (sh *SessionHandler) expandPath(path string) (string, error) {
 	return path, nil
 }
 
+func (sh *SessionHandler) replaceHomeDir(fullpath string) (string, error) {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+	return strings.Replace(fullpath, home, "~", 1), nil
+}
+
 func (sh *SessionHandler) NewSession() error {
 	config := sh.readConfig()
 	if config == nil {
 		return errors.New("failed to create new project from projects")
 	}
 	/*build fzf input and build hashmap to retrieve filepath from entry's name.*/
 	var input bytes.Buffer
-	projectHashMap := make(map[string]string, 0)
+	projectNameFullPathMap, projectExpressionNameMap := make(map[string]string, 0), make(map[string]string, 0)
 	for _, project := range config.projects {
-		input.WriteString(project.name + "\n")
-		projectHashMap[project.name] = project.filepath
+		replaced, err := sh.replaceHomeDir(project.filepath)
+		if err != nil {
+			return errors.New("failed to replace home directory to ~")
+		}
+		input.WriteString(replaced + "\n")
+		projectNameFullPathMap[project.name] = project.filepath
+		projectExpressionNameMap[replaced] = project.name
 	}
 	fzfOut, err := sh.toFzf(input)
 	if err != nil {
 		return fmt.Errorf("failed to create new project from projects: %w", err)
 	}
-	sessionName := strings.Trim(fzfOut.String(), "\n")
+	sessionName := projectExpressionNameMap[strings.Trim(fzfOut.String(), "\n")]
 	if sh.isInSession() {
-		return sh.switchToNewClient(sessionName, projectHashMap[sessionName])
+		return sh.switchToNewClient(sessionName, projectNameFullPathMap[sessionName])
 	}
 	if sh.sessionExists(sessionName) {
 		return sh.attach(sessionName)
 	}
 	if err := sh.newTmuxCmd(
 		"tmux", "new-session", "-s",
-		sessionName, "-c", projectHashMap[sessionName]).Run(); err != nil {
+		sessionName, "-c", projectNameFullPathMap[sessionName]).Run(); err != nil {
 		return fmt.Errorf("failed to create new session %w: ", err)
 	}
 	return nil

handler/handler_test.go

@@ -81,7 +81,7 @@ func TestExpandPath(t *testing.T) {
 			sh := SessionHandler{}
 			got, err := sh.expandPath(tt.args.relative)
 			if err != nil && !errors.Is(err, tt.wantErr) {
-				t.Errorf("failed to expand path: %v.", err)
+				t.Errorf("failed to expand path: %v", err)
 				return
 			}
 			if got != tt.want {
@@ -90,3 +90,40 @@ func TestExpandPath(t *testing.T) {
 		})
 	}
 }
+
+func TestReplaceHomeDir(t *testing.T) {
+	t.Parallel()
+	homeDir, _ := os.UserHomeDir()
+	type args struct {
+		fullpath string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		wantErr error
+	}{
+		{
+			name: "Normal test case1",
+			args: args{
+				fullpath: filepath.Join(homeDir, "a/b/c"),
+			},
+			want:    "~/a/b/c",
+			wantErr: nil,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			sh := SessionHandler{}
+			got, err := sh.replaceHomeDir(tt.args.fullpath)
+			if err != nil && !errors.Is(err, tt.wantErr) {
+				t.Errorf("failed to replace home directory: %v", err)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("failed to replace home directory, expected: %v, but got %v", tt.want, got)
+			}
+		})
+	}
+}