sashakoshka/gomp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #33

Browse Source 
Also mentioned at (https://github.com/aditya-K2/gomp/issues/1#issuecomment-1205090265)

`~` is not expanded to home directory, Hence adding an internal check
for the same.
This commit is contained in:
aditya-K2 2022-09-12 23:16:24 +05:30
parent 6830b5379f
commit 29b796a552
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.go
View File

@ -29,15 +29,23 @@ var (
) )
func ReadConfig() { func ReadConfig() {
for k, v := range defaults { for k, v := range defaults {
viper.SetDefault(k, v) viper.SetDefault(k, v)
} }
viper.SetConfigName("config") viper.SetConfigName("config")
viper.AddConfigPath(HOME_DIR + "/.config/gomp") viper.AddConfigPath(HOME_DIR + "/.config/gomp")
err := viper.ReadInConfig() err := viper.ReadInConfig()
if err != nil { if err != nil {
fmt.Println("Could Not Read Config file.") fmt.Println("Could Not Read Config file.")
} }
// Expanding ~ to the User's Home Directory
viper.Set("MUSIC_DIRECTORY", utils.ExpandHomeDir(viper.GetString("MUSIC_DIRECTORY")))
viper.Set("DEFAULT_IMAGE_PATH", utils.ExpandHomeDir(viper.GetString("DEFAULT_IMAGE_PATH")))
viper.Set("CACHE_DIR", utils.ExpandHomeDir(viper.GetString("CACHE_DIR")))
} }
func GenerateKeyMap(funcMap map[string]func()) { func GenerateKeyMap(funcMap map[string]func()) {

13
utils/utils.go
View File

@ -2,6 +2,8 @@ package utils
import ( import (
"io/ioutil" "io/ioutil"
"os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
"syscall" "syscall"
@ -117,6 +119,17 @@ func CheckDirectoryFmt(path string) string {
} }
} }
func ExpandHomeDir(path string) string {
HOME_DIR, _ := os.UserHomeDir()
if strings.HasPrefix(path, "~/") {
return filepath.Join(HOME_DIR, path[1:])
} else if path == "~" {
return HOME_DIR
} else {
return path
}
}
func GetMatchedString(a []int, s, color string) string { func GetMatchedString(a []int, s, color string) string {
// The Matches are sorted so we just have to traverse the Matches and if the two adjacent matches are not consecutive // The Matches are sorted so we just have to traverse the Matches and if the two adjacent matches are not consecutive
// then we append the color string at the start + offset and the nulcol ( reset ) at end + offset + 1 and then reset // then we append the color string at the start + offset and the nulcol ( reset ) at end + offset + 1 and then reset