Make to work with windows, remove unnecessary config keys

DanWlker · Jun 29, 2024 · 382f083 · 382f083
1 parent e66a9e2
commit 382f083
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/internal/app/edit/edit.go b/internal/app/edit/edit.go
@@ -44,7 +44,7 @@ func editTodoAssociatedWith(directory string) error {
 	}
 
 	var todoList []data.TodoEntity
-	for _, item := range strings.Split(string(result), "\n") {
+	for _, item := range strings.Split(strings.ReplaceAll(string(result), "\r\n", "\n"), "\n") {
 		if item != "" {
 			todoList = append(todoList, data.TodoEntity{Text: item})
 		}

diff --git a/internal/config/config_keys.go b/internal/config/config_keys.go
@@ -1,5 +1,6 @@
 package config
 
-const DATA_FOLDER_KEY = "DATA_FOLDER_KEY"
+const USER_DEFINED_DATA_FOLDER = "USER_DEFINED_DATA_FOLDER"
 const LIST_AFTER_ADDING_TODO = "LIST_AFTER_ADDING_TODO"
-const USER_DEFINED_HOME_PATH = "USER_DEFINED_HOME_PATH"
+const LIST_AFTER_EDITING_TODO = "LIST_AFTER_EDITING_TODO"
+const LIST_AFTER_REMOVING_TODO = "LIST_AFTER_REMOVING_TODO"
diff --git a/internal/pkg/data/data.go b/internal/pkg/data/data.go
@@ -40,7 +40,7 @@ func WriteTodoToFile(dataFileFullPath string, todoList []TodoEntity) error {
 }
 
 func GetDataFolder() (string, error) {
-	dataFolder := strings.TrimSpace(viper.GetString(config.DATA_FOLDER_KEY))
+	dataFolder := strings.TrimSpace(viper.GetString(config.USER_DEFINED_DATA_FOLDER))
 	if dataFolder == "" {
 		home, errHomeDir := os.UserHomeDir()
 		if errHomeDir != nil {